From 1f61d6647f25add487c5cae9739643a6e33ef9f7 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 27 May 2009 11:15:23 +1000 Subject: [PATCH] Xi: use GetMaster(MASTER_KEYBOARD) to get the modifier device for XI2 pgrabs Signed-off-by: Peter Hutterer --- Xi/xipassivegrab.c | 8 ++++---- 1 file 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;