diff options
Diffstat (limited to 'driver/xf86-input-microtouch/src/microtouch.c')
| -rw-r--r-- | driver/xf86-input-microtouch/src/microtouch.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/driver/xf86-input-microtouch/src/microtouch.c b/driver/xf86-input-microtouch/src/microtouch.c index 32578f02b..b18a22f8b 100644 --- a/driver/xf86-input-microtouch/src/microtouch.c +++ b/driver/xf86-input-microtouch/src/microtouch.c @@ -105,7 +105,7 @@ static XF86ModuleVersionInfo VersionRec = MODINFOSTRING1, MODINFOSTRING2, XORG_VERSION_CURRENT, - 1, 1, 0, + PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL, ABI_CLASS_XINPUT, ABI_XINPUT_VERSION, MOD_CLASS_XINPUT, @@ -157,7 +157,9 @@ static const char *reqSymbols[] = { "xf86SetSerial", "xf86SetStrOption", "xf86XInputSetScreen", +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 "xf86XInputSetSendCoreEvents", +#endif "xf86memset", "xf86sscanf", "xf86strcmp", @@ -275,8 +277,6 @@ MuTouchPreInit(InputDriverPtr drv, IDevPtr dev, int flags) priv->proximity = FALSE; priv->button_down = FALSE; - DBG (9, XisbTrace (priv->buffer, 1)); - MuTNewPacket (priv); if (QueryHardware(local) != Success) { @@ -538,7 +538,7 @@ ReadInput (LocalDevicePtr local) static int ControlProc (LocalDevicePtr local, xDeviceCtl * control) { - xDeviceTSCalibrationCtl *c = (xDeviceTSCalibrationCtl *) control; + xDeviceAbsCalibCtl *c = (xDeviceAbsCalibCtl *) control; MuTPrivatePtr priv = (MuTPrivatePtr) (local->private); priv->min_x = c->min_x; @@ -563,11 +563,13 @@ SwitchMode (ClientPtr client, DeviceIntPtr dev, int mode) priv->reporting_mode = mode; return (Success); } +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 else if ((mode == SendCoreEvents) || (mode == DontSendCoreEvents)) { xf86XInputSetSendCoreEvents (local, (mode == SendCoreEvents)); return (Success); } +#endif else return (!Success); } |