From a18238e2f994d4d8fa568420bf8f507715ed05f4 Mon Sep 17 00:00:00 2001 From: liyuan Date: Fri, 27 Apr 2007 08:30:28 +0000 Subject: [PATCH] 2007-04-27 Li Yuan Patch from Peter. * registry.py: Bug #433627. Adds default handling, fixes docs. git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@909 e2bd861d-eb25-0410-b326-f6ed22b6b98c --- pyatspi/ChangeLog | 9 ++++++++- pyatspi/registry.py | 14 ++++++++++---- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/pyatspi/ChangeLog b/pyatspi/ChangeLog index 0f87d5d..ccdacd8 100644 --- a/pyatspi/ChangeLog +++ b/pyatspi/ChangeLog @@ -1,7 +1,14 @@ 2007-04-27 Li Yuan + Patch from Peter. + * registry.py: + Bug #433627. Adds default handling, fixes docs. + +2007-04-27 Li Yuan + + Patch from Peter. * constants.py: - Bug 431057. Adds messing event. + Bug #431057. Adds messing event. 2007-04-18 Li Yuan diff --git a/pyatspi/registry.py b/pyatspi/registry.py index 0ff0eb0..0aebbed 100644 --- a/pyatspi/registry.py +++ b/pyatspi/registry.py @@ -146,7 +146,7 @@ class _DeviceObserver(_Observer, Accessibility__POA.DeviceEventListener): @type key_set: list of integer @param mask: Integer modifier mask or an iterable over multiple masks to unapply all at once - @type mask: integer or iterable + @type mask: integer, iterable, or None @param kind: Kind of events to monitor @type kind: integer ''' @@ -171,7 +171,7 @@ class _DeviceObserver(_Observer, Accessibility__POA.DeviceEventListener): @type key_set: list of integer @param mask: Integer modifier mask or an iterable over multiple masks to unapply all at once - @type mask: integer or iterable + @type mask: integer, iterable, or None @param kind: Kind of events to monitor @type kind: integer ''' @@ -453,7 +453,7 @@ class Registry(object): the mask are held. When the mask is an iterable over more than one integer, keys in the key_set will be monitored when any of the modifier combinations in the set are held. - @type mask: integer + @type mask: integer, iterable, None @param kind: Kind of events to watch, KEY_PRESSED_EVENT or KEY_RELEASED_EVENT. @type kind: list @@ -476,6 +476,9 @@ class Registry(object): # store the observer to client mapping, and the inverse self.clients[ob] = client self.clients[client] = ob + if mask is None: + # None means all modifier combinations + mask = utils.allModifiers() # register for new keystrokes on the observer ob.register(self.dev, key_set, mask, kind) @@ -496,7 +499,7 @@ class Registry(object): the mask are held. When the mask is an iterable over more than one integer, keys in the key_set will be monitored when any of the modifier combinations in the set are held. - @type mask: integer + @type mask: integer, iterable, None @param kind: Kind of events to stop watching, KEY_PRESSED_EVENT or KEY_RELEASED_EVENT. @type kind: list @@ -504,6 +507,9 @@ class Registry(object): ''' # see if we already have an observer for this client ob = self.clients[client] + if mask is None: + # None means all modifier combinations + mask = utils.allModifiers() # register for new keystrokes on the observer ob.unregister(self.dev, key_set, mask, kind) -- 2.7.4