diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2010-12-02 15:34:12 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2010-12-02 15:34:12 +1000 |
| commit | 40920147a87d7f069cf4406f1f50aed58a7ce7e0 (patch) | |
| tree | df979dfd1bb738a3b71cedf4c83b243112f22854 | |
| parent | 7ad420be74fec993f98fdfe746f037d803a6b927 (diff) | |
Require server 1.9, drop earlier ABI support
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Cyril Brulebois <kibi@debian.org>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/xf86MuTouch.c | 26 |
2 files changed, 5 insertions, 23 deletions
diff --git a/configure.ac b/configure.ac index bc67666..4b0e04d 100644 --- a/configure.ac +++ b/configure.ac @@ -57,7 +57,7 @@ XORG_DRIVER_CHECK_EXT(RANDR, randrproto) XORG_DRIVER_CHECK_EXT(XINPUT, inputproto) # Checks for pkg-config packages -PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto $REQUIRED_MODULES) +PKG_CHECK_MODULES(XORG, [xorg-server >= 1.9.0] xproto $REQUIRED_MODULES) sdkdir=$(pkg-config --variable=sdkdir xorg-server) CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src' diff --git a/src/xf86MuTouch.c b/src/xf86MuTouch.c index f2a7564..a44702f 100644 --- a/src/xf86MuTouch.c +++ b/src/xf86MuTouch.c @@ -741,10 +741,8 @@ xf86MuTControl(DeviceIntPtr dev, unsigned char req[MuT_PACKET_SIZE]; unsigned char reply[MuT_BUFFER_SIZE]; char *id_string = DEVICE_ID(local->private_flags) == FINGER_ID ? "finger" : "stylus"; -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 Atom btn_label; Atom axis_labels[2] = { 0, 0 }; -#endif switch(mode) { @@ -762,11 +760,7 @@ xf86MuTControl(DeviceIntPtr dev, /* * Device reports button press for up to 1 button. */ - if (InitButtonClassDeviceStruct(dev, 1, -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 - &btn_label, -#endif - map) == FALSE) { + if (InitButtonClassDeviceStruct(dev, 1, &btn_label, map) == FALSE) { ErrorF("Unable to allocate ButtonClassDeviceStruct\n"); return !Success; } @@ -778,30 +772,18 @@ xf86MuTControl(DeviceIntPtr dev, * max and min values scaled from the approximate size of the * screen to fit one meter. */ - if (InitValuatorClassDeviceStruct(dev, 2, -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 - axis_labels, -#endif -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 - xf86GetMotionEvents, -#endif + if (InitValuatorClassDeviceStruct(dev, 2, axis_labels, local->history_size, Absolute) == FALSE) { ErrorF("Unable to allocate ValuatorClassDeviceStruct\n"); return !Success; } else { - InitValuatorAxisStruct(dev, 0, -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 - axis_labels[0], -#endif + InitValuatorAxisStruct(dev, 0, axis_labels[0], priv->min_x, priv->max_x, 9500, 0 /* min_res */, 9500 /* max_res */); - InitValuatorAxisStruct(dev, 1, -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 - axis_labels[1], -#endif + InitValuatorAxisStruct(dev, 1, axis_labels[1], priv->min_y, priv->max_y, 10500, 0 /* min_res */, |