summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-03-13 16:20:56 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-03-16 13:29:07 +1000
commit23686e5680d565c36e0b6320ce62c38c7830d06b (patch)
tree9eef99af74bb530ecd131af1fbbd1a3a5a5f6249
parentxkb: fix a couple of device checks when looping through all devices. (diff)
downloadxserver-23686e5680d565c36e0b6320ce62c38c7830d06b.tar.gz
xserver-23686e5680d565c36e0b6320ce62c38c7830d06b.tar.bz2
xserver-23686e5680d565c36e0b6320ce62c38c7830d06b.zip
xkb: Fix a mis-use of inputInfo.keyboard.
-rw-r--r--xkb/xkbEvents.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/xkb/xkbEvents.c b/xkb/xkbEvents.c
index a2b99a269..9293c60be 100644
--- a/xkb/xkbEvents.c
+++ b/xkb/xkbEvents.c
@@ -918,15 +918,14 @@ Bool
XkbFilterEvents(ClientPtr pClient,int nEvents,xEvent *xE)
{
int i, button_mask;
-DeviceIntPtr pXDev = inputInfo.keyboard;
+DeviceIntPtr pXDev = NULL;
XkbSrvInfoPtr xkbi;
if (xE->u.u.type & EXTENSION_EVENT_BASE)
- {
pXDev = XIGetDevice(xE);
- if (!pXDev)
- pXDev = inputInfo.keyboard;
- }
+
+ if (!pXDev)
+ pXDev = PickKeyboard(pClient);
xkbi= (pXDev->key) ? pXDev->key->xkbInfo : NULL;