summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-03-13 16:23:50 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-03-16 13:29:07 +1000
commit3f801ba62ac493d4aeb664a5ae638e3fb0c9a262 (patch)
treee41b3923bf2563adbff2dda5624b7fada20e996a
parentxkb: Fix a mis-use of inputInfo.keyboard. (diff)
downloadxserver-3f801ba62ac493d4aeb664a5ae638e3fb0c9a262.tar.gz
xserver-3f801ba62ac493d4aeb664a5ae638e3fb0c9a262.tar.bz2
xserver-3f801ba62ac493d4aeb664a5ae638e3fb0c9a262.zip
xkb: the VCP can post device events, don't stop xkb filtering on it.
-rw-r--r--xkb/xkbActions.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c
index 7d17ad4f7..f3fcef05e 100644
--- a/xkb/xkbActions.c
+++ b/xkb/xkbActions.c
@@ -964,7 +964,7 @@ int button;
if (filter->keycode==0) { /* initial press */
_XkbLookupButtonDevice(&dev, pAction->devbtn.device, serverClient,
DixUnknownAccess, &button);
- if (!dev || !dev->public.on || dev == inputInfo.pointer)
+ if (!dev || !dev->public.on)
return 1;
button= pAction->devbtn.button;
@@ -1005,7 +1005,7 @@ int button;
filter->active= 0;
_XkbLookupButtonDevice(&dev, filter->upAction.devbtn.device,
serverClient, DixUnknownAccess, &button);
- if (!dev || !dev->public.on || dev == inputInfo.pointer)
+ if (!dev || !dev->public.on)
return 1;
button= filter->upAction.btn.button;