diff options
author | Henrik Rydberg <rydberg@euromail.se> | 2009-08-23 21:48:47 +0200 |
---|---|---|
committer | Henrik Rydberg <rydberg@euromail.se> | 2009-08-23 21:48:47 +0200 |
commit | ed48e39ea7f945e13b787ccc25937661de134b6a (patch) | |
tree | 06a444245800513302550d6c9248ac96deb9e2a4 | |
parent | ca85f84aedb3b4cfd78dfe1874239421de8807d6 (diff) | |
download | xorg-input-kobomultitouch-ed48e39ea7f945e13b787ccc25937661de134b6a.tar.gz xorg-input-kobomultitouch-ed48e39ea7f945e13b787ccc25937661de134b6a.tar.bz2 xorg-input-kobomultitouch-ed48e39ea7f945e13b787ccc25937661de134b6a.zip |
Support ABI_XINPUT version between 1 and 7
Compiles on ubuntu versions Intrepid, Jaunty, Karmic.
-rw-r--r-- | src/multitouch.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/multitouch.c b/src/multitouch.c index 11f1e19..4fb1e4b 100644 --- a/src/multitouch.c +++ b/src/multitouch.c @@ -57,12 +57,22 @@ static int device_init(DeviceIntPtr dev, LocalDevicePtr local) } xf86CloseSerial(local->fd); +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 InitPointerDeviceStruct((DevicePtr)dev, btmap, DIM_BUTTON, GetMotionHistory, pointer_control, GetMotionHistorySize(), 2); +#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 7 + InitPointerDeviceStruct((DevicePtr)dev, + btmap, DIM_BUTTON, + pointer_control, + GetMotionHistorySize(), + 2); +#else +#error "Unsupported ABI_XINPUT_VERSION" +#endif xf86InitValuatorAxisStruct(dev, 0, mt->caps.abs_position_x.minimum, |