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 <[email protected]>
---
 src/list.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

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);
-- 
1.6.5.2

_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Reply via email to