frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Michael Thayer 2016-08-24 08:48:13 +10:00 committed by Adam Jackson
parent 25e4f9ee68
commit d8c288ec37
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dix/events.c
View File

@ -2892,7 +2892,7 @@ ActivateFocusInGrab(DeviceIntPtr dev, WindowPtr old, WindowPtr win)
if (dev->deviceGrab.grab) { if (dev->deviceGrab.grab) {
if (!dev->deviceGrab.fromPassiveGrab || if (!dev->deviceGrab.fromPassiveGrab ||
dev->deviceGrab.grab->type != XI_Enter || dev->deviceGrab.grab->type != XI_FocusIn ||
dev->deviceGrab.grab->window == win || dev->deviceGrab.grab->window == win ||
IsParent(dev->deviceGrab.grab->window, win)) IsParent(dev->deviceGrab.grab->window, win))
return FALSE; return FALSE;
@ -2915,7 +2915,7 @@ ActivateFocusInGrab(DeviceIntPtr dev, WindowPtr old, WindowPtr win)
rc = (CheckPassiveGrabsOnWindow(win, dev, (InternalEvent *) &event, FALSE, rc = (CheckPassiveGrabsOnWindow(win, dev, (InternalEvent *) &event, FALSE,
TRUE) != NULL); TRUE) != NULL);
if (rc) if (rc)
DoEnterLeaveEvents(dev, dev->id, old, win, XINotifyPassiveUngrab); DoEnterLeaveEvents(dev, dev->id, old, win, XINotifyPassiveGrab);
return rc; return rc;
} }