From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed, 9 Jun 2010 05:52:31 +0000 (+1000)
Subject: list: only check the last bit in the device mode.
X-Git-Url: https://diplodocus.org/git/xorg-xinput/commitdiff_plain/a5c9b0ffb969f71ec73a6c65f5135f5aa7805a38?hp=3778f707cca0b9f023a8a5fc86e26776ef6e1b6c

list: only check the last bit in the device mode.

This works around a bug in X servers 1.7.x, 1.8.0 and 1.8.1 where the device
mode could sometimes be binary OR'd with the OutOfProximity flag. The result
was a value of 0b10 for relative and 0b11 for Absolute, both of which were
interpreted as relative by this code.

Affected is only the XIQueryDevice call, not the XListInputDevices call.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---

diff --git a/src/list.c b/src/list.c
index ecf1f4b..8633c62 100644
--- a/src/list.c
+++ b/src/list.c
@@ -163,6 +163,10 @@ print_classes_xi2(Display* display, XIAnyClassInfo **classes,
                     XIValuatorClassInfo *v = (XIValuatorClassInfo*)classes[i];
                     char *name = v->label ?  XGetAtomName(display, v->label) : NULL;
 
+                    /* XXX: Bug in X servers 1.7..1.8.1, mode was |
+                       OutOfProximity. Remove this once 1.9 is out. */
+                    v->mode &= DeviceMode;
+
                     printf("\t\tDetail for Valuator %d:\n", v->number);
                     printf("\t\t  Label: %s\n",  (name) ? name : "None");
                     printf("\t\t  Range: %f - %f\n", v->min, v->max);