diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-05-27 11:15:23 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-05-27 13:54:19 +1000 |
| commit | 1f61d6647f25add487c5cae9739643a6e33ef9f7 (patch) | |
| tree | 2dbe13ba5e8d9af1c301afb690cb6299393a8271 /Xi/xipassivegrab.c | |
| parent | bedfd561fa534b65baea45c4a05b1752ef172c45 (diff) | |
Xi: use GetMaster(MASTER_KEYBOARD) to get the modifier device for XI2 pgrabs
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
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; |