diff options
Diffstat (limited to 'Xi/xipassivegrab.c')
| -rw-r--r-- | Xi/xipassivegrab.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Xi/xipassivegrab.c b/Xi/xipassivegrab.c index 3f46e6766..95acdf03b 100644 --- a/Xi/xipassivegrab.c +++ b/Xi/xipassivegrab.c @@ -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; |