xserver: Branch 'master'
Adam Jackson
ajax at kemper.freedesktop.org
Fri Sep 2 16:58:49 UTC 2016
dix/events.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit d8c288ec371a853bcd023217f34893a0efae65ea
Author: Michael Thayer <michael.thayer at oracle.com>
Date: Wed Aug 24 08:48:13 2016 +1000
xi2: fix FocusIn grabs
Fix a couple of copy-and-paste errors preventing FocusIn grabs from working.
Perhaps the extension version should be bumped though to distinguish between
working and non-working extension versions.
Signed-off-by: Michael Thayer <michael.thayer at oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/dix/events.c b/dix/events.c
index 8efdf18..6610b91 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -2892,7 +2892,7 @@ ActivateFocusInGrab(DeviceIntPtr dev, WindowPtr old, WindowPtr win)
if (dev->deviceGrab.grab) {
if (!dev->deviceGrab.fromPassiveGrab ||
- dev->deviceGrab.grab->type != XI_Enter ||
+ dev->deviceGrab.grab->type != XI_FocusIn ||
dev->deviceGrab.grab->window == win ||
IsParent(dev->deviceGrab.grab->window, win))
return FALSE;
@@ -2915,7 +2915,7 @@ ActivateFocusInGrab(DeviceIntPtr dev, WindowPtr old, WindowPtr win)
rc = (CheckPassiveGrabsOnWindow(win, dev, (InternalEvent *) &event, FALSE,
TRUE) != NULL);
if (rc)
- DoEnterLeaveEvents(dev, dev->id, old, win, XINotifyPassiveUngrab);
+ DoEnterLeaveEvents(dev, dev->id, old, win, XINotifyPassiveGrab);
return rc;
}
More information about the xorg-commit
mailing list