aboutsummaryrefslogtreecommitdiff
path: root/src/evdev_axes.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/evdev_axes.c')
-rw-r--r--src/evdev_axes.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/evdev_axes.c b/src/evdev_axes.c
index 6879ab1..9d2ef20 100644
--- a/src/evdev_axes.c
+++ b/src/evdev_axes.c
@@ -672,8 +672,14 @@ EvdevAxesInit (DeviceIntPtr device)
return Success;
if (!InitValuatorClassDeviceStruct(device, axes,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 1
+ GetMotionHistory,
+ GetMotionHistorySize(),
+#else
miPointerGetMotionEvents,
- miPointerGetMotionBufferSize(), 0))
+ miPointerGetMotionBufferSize(),
+#endif
+ 0))
return !Success;
for (i = 0; i < axes; i++) {
@@ -684,7 +690,9 @@ EvdevAxesInit (DeviceIntPtr device)
if (!InitPtrFeedbackClassDeviceStruct(device, EvdevPtrCtrlProc))
return !Success;
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
xf86MotionHistoryAllocate (pInfo);
+#endif
return Success;
}