diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2013-02-13 11:26:11 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2013-05-10 14:26:15 +1000 |
| commit | 363b6387da6e669099a2da3861c73a29808295a6 (patch) | |
| tree | 70daedb993633072e55e8cde637d058186a301f6 /dix | |
| parent | 9cc45c18ad1511adf3fb163dd4cefbef106edb23 (diff) | |
dix: don't prepend an activated passive grab to the listeners
If the device is currently grabbed as the result of a passive grab
activating, do not prepend that grab to the listeners (unlike active grabs).
Otherwise, a client with a passive pointer grab will prevent touch grabs
from activating higher up in the window stack.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'dix')
| -rw-r--r-- | dix/touch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dix/touch.c b/dix/touch.c index 3027bbbf2..5d6e2a796 100644 --- a/dix/touch.c +++ b/dix/touch.c @@ -874,7 +874,7 @@ TouchSetupListeners(DeviceIntPtr dev, TouchPointInfoPtr ti, InternalEvent *ev) SpritePtr sprite = &ti->sprite; WindowPtr win; - if (dev->deviceGrab.grab) + if (dev->deviceGrab.grab && !dev->deviceGrab.fromPassiveGrab) TouchAddActiveGrabListener(dev, ti, ev, dev->deviceGrab.grab); /* We set up an active touch listener for existing touches, but not any |