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:
parent
bedfd561fa
commit
1f61d6647f
|
@ -157,8 +157,8 @@ ProcXIPassiveGrabDevice(ClientPtr client)
|
|||
if (!modifiers_failed)
|
||||
return BadAlloc;
|
||||
|
||||
if (IsPointerDevice(dev) && IsMaster(dev))
|
||||
mod_dev = GetPairedDevice(dev);
|
||||
if (!IsMaster(dev) && dev->u.master)
|
||||
mod_dev = GetMaster(dev, MASTER_KEYBOARD);
|
||||
else
|
||||
mod_dev = dev;
|
||||
|
||||
|
@ -261,8 +261,8 @@ ProcXIPassiveUngrabDevice(ClientPtr client)
|
|||
if (rc != Success)
|
||||
return rc;
|
||||
|
||||
if (IsMaster(dev))
|
||||
mod_dev = GetPairedDevice(dev);
|
||||
if (!IsMaster(dev) && dev->u.master)
|
||||
mod_dev = GetMaster(dev, MASTER_KEYBOARD);
|
||||
else
|
||||
mod_dev = dev;
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user