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

Xi: use GetMaster(MASTER_KEYBOARD) to get the modifier device for XI2 pgrabs 

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2009-05-27 11:15:23 +10:00
parent bedfd561fa
commit 1f61d6647f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Xi/xipassivegrab.c
View File

@ -157,8 +157,8 @@ ProcXIPassiveGrabDevice(ClientPtr client)
if (!modifiers_failed) if (!modifiers_failed)
return BadAlloc; return BadAlloc;
if (IsPointerDevice(dev) && IsMaster(dev)) if (!IsMaster(dev) && dev->u.master)
mod_dev = GetPairedDevice(dev); mod_dev = GetMaster(dev, MASTER_KEYBOARD);
else else
mod_dev = dev; mod_dev = dev;
@ -261,8 +261,8 @@ ProcXIPassiveUngrabDevice(ClientPtr client)
if (rc != Success) if (rc != Success)
return rc; return rc;
if (IsMaster(dev)) if (!IsMaster(dev) && dev->u.master)
mod_dev = GetPairedDevice(dev); mod_dev = GetMaster(dev, MASTER_KEYBOARD);
else else
mod_dev = dev; mod_dev = dev;