summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2012-01-03 15:57:51 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2012-01-09 11:07:38 +1000
commit2e62d1a24448e89d168f76f4db9d04b9f14a5863 (patch)
treeeb972a1f4b61c0765af9e2921427196a02670e9e
parent9134a9068f3046d2b31c95aeec8c66049cb79317 (diff)
lib/Xinput: check for the new device usage types
IsXExtensionPointer/Keyboard were introduced with XI 1.4, check for those too before claiming there aren't any devices. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
-rw-r--r--xts5/src/lib/XInput.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/xts5/src/lib/XInput.c b/xts5/src/lib/XInput.c
index 4a992c92..77209586 100644
--- a/xts5/src/lib/XInput.c
+++ b/xts5/src/lib/XInput.c
@@ -189,7 +189,9 @@ Setup_Extension_DeviceInfo(dmask)
SavID = list->id;
if (list->use == IsXPointer)
SavPID = list->id;
- if (list->use != IsXExtensionDevice)
+ if (list->use != IsXExtensionDevice &&
+ list->use != IsXExtensionPointer &&
+ list->use != IsXExtensionKeyboard)
continue;
dev = XOpenDevice (dpy2, list->id);
nokeys = True;