diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2006-11-02 03:42:14 +0200 |
|---|---|---|
| committer | Daniel Stone <daniels@endtroducing.fooishbar.org> | 2006-11-02 03:42:14 +0200 |
| commit | 3fc70342aaba5f95d01b6e51164ae207532fa8f4 (patch) | |
| tree | ebf1b6ac7725ecf7e2d2c616d53a92abda2660e5 /src/evdev_axes.c | |
| parent | Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-i... (diff) | |
| parent | key: use os bell-ringing function (diff) | |
| download | xf86-input-evdev-3fc70342aaba5f95d01b6e51164ae207532fa8f4.tar.gz xf86-input-evdev-3fc70342aaba5f95d01b6e51164ae207532fa8f4.tar.bz2 xf86-input-evdev-3fc70342aaba5f95d01b6e51164ae207532fa8f4.zip | |
Merge branch 'input-hotplug'
Diffstat (limited to 'src/evdev_axes.c')
| -rw-r--r-- | src/evdev_axes.c | 10 |
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; } |