summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter@cs.unisa.edu.au>2007-10-16 17:47:06 +0930
committerPeter Hutterer <peter@cs.unisa.edu.au>2007-10-16 17:47:06 +0930
commitb697c4ed145968d3c3281bb85e628f1b068b09fc (patch)
tree5ea4a6451043d56c7d865de85dd0740c6e1be5bb
parentcaa69d8f7b92b80669df02e1001409d7c653e7e4 (diff)
dix: CheckPassiveGrabOnWindow: only get paired device for non-keyboards.
-rw-r--r--dix/events.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/dix/events.c b/dix/events.c
index 50d06c465..d342d3628 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -3243,7 +3243,12 @@ CheckPassiveGrabsOnWindow(
gdev= grab->modifierDevice;
if (grab->coreGrab)
- gdev = GetPairedDevice(device);
+ {
+ if (IsPointerDevice(device))
+ gdev = GetPairedDevice(device);
+ else
+ gdev = device;
+ }
xkbi= gdev->key->xkbInfo;
#endif
tempGrab.modifierDevice = grab->modifierDevice;