aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter@cs.unisa.edu.au>2008-05-26 19:17:19 +0930
committerPeter Hutterer <peter@cs.unisa.edu.au>2008-05-26 19:29:32 +0930
commit42422d8f69e6806e1adfd93017cac064a75041c7 (patch)
tree36a77841f762278befa935ab39b644c3ff096141
parentFail if the device cannot be grabbed during the probe. (diff)
downloadxf86-input-evdev-42422d8f69e6806e1adfd93017cac064a75041c7.tar.gz
xf86-input-evdev-42422d8f69e6806e1adfd93017cac064a75041c7.tar.bz2
xf86-input-evdev-42422d8f69e6806e1adfd93017cac064a75041c7.zip
Check for XINPUT ABI, parameters of InitValuatorClassRec have changed.
-rw-r--r--src/evdev.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/evdev.c b/src/evdev.c
index 13f03d3..3fe0708 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -726,7 +726,10 @@ EvdevAddAbsClass(DeviceIntPtr device)
pEvdev->min_y = absinfo_y.minimum;
pEvdev->max_y = absinfo_y.maximum;
- if (!InitValuatorClassDeviceStruct(device, 2, GetMotionHistory,
+ if (!InitValuatorClassDeviceStruct(device, 2,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
+ GetMotionEvents(),
+#endif
GetMotionHistorySize(), Absolute))
return !Success;
@@ -756,7 +759,10 @@ EvdevAddRelClass(DeviceIntPtr device)
pInfo = device->public.devicePrivate;
- if (!InitValuatorClassDeviceStruct(device, 2, GetMotionHistory,
+ if (!InitValuatorClassDeviceStruct(device, 2,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
+ GetMotionEvents(),
+#endif
GetMotionHistorySize(), Relative))
return !Success;