summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-03-20 16:09:20 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-03-31 16:50:17 +1000
commit51bde94a20f7e60908c468ba4a6f7b0a8f3013ca (patch)
treeeb6c6acffd494b751c9ec3f33c6a428febe7b567
parent858e60073ddb071bbf22dc2d469d0cc3f402685d (diff)
Fix IsKeyboardDevice checksingle-master-device
-rw-r--r--dix/events.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/dix/events.c b/dix/events.c
index aa917375b..daaa535df 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -337,7 +337,7 @@ IsPointerDevice(DeviceIntPtr dev)
Bool
IsKeyboardDevice(DeviceIntPtr dev)
{
- return (dev->key && dev->kbdfeed) && !IsPointerDevice(dev);
+ return (dev->isMaster || ((dev->key && dev->kbdfeed) && !IsPointerDevice(dev)));
}
static WindowPtr XYToWindow(