From 3cce7fa38a152ba66d379591e6e3ece60bd73fdd Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 26 Jun 2009 09:37:29 +1000 Subject: If a device fails to initialize relative axes, init the abs. axes instead. Some devices have relative axes that don't count (scroll wheels). In this case, don't claim we've initialized relative axes, continue with the absolute axes instead. Signed-off-by: Peter Hutterer (cherry picked from commit b07ab6ea97b779b26e7ae8326528c262cc9907a1) --- src/evdev.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'src/evdev.c') diff --git a/src/evdev.c b/src/evdev.c index 490fa44..acf2943 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -1061,6 +1061,9 @@ EvdevAddRelClass(DeviceIntPtr device) if (TestBit(REL_DIAL, pEvdev->rel_bitmask)) num_axes--; + if (num_axes <= 0) + return !Success; + pEvdev->num_vals = num_axes; memset(pEvdev->vals, 0, num_axes * sizeof(int)); @@ -1188,12 +1191,17 @@ EvdevInit(DeviceIntPtr device) FIXME: somebody volunteer to fix this. */ if (pEvdev->flags & EVDEV_RELATIVE_EVENTS) { - EvdevAddRelClass(device); - if (pEvdev->flags & EVDEV_ABSOLUTE_EVENTS) - xf86Msg(X_INFO,"%s: relative axes found, ignoring absolute " - "axes.\n", device->name); - pEvdev->flags &= ~EVDEV_ABSOLUTE_EVENTS; - } else if (pEvdev->flags & EVDEV_ABSOLUTE_EVENTS) + if (EvdevAddRelClass(device) == Success) + { + if (pEvdev->flags & EVDEV_ABSOLUTE_EVENTS) + xf86Msg(X_INFO,"%s: relative axes found, ignoring absolute " + "axes.\n", device->name); + pEvdev->flags &= ~EVDEV_ABSOLUTE_EVENTS; + } else + pEvdev->flags &= ~EVDEV_RELATIVE_EVENTS; + } + + if (pEvdev->flags & EVDEV_ABSOLUTE_EVENTS) EvdevAddAbsClass(device); #ifdef HAVE_PROPERTIES -- cgit v1.2.3