File xf86-input-calcomp.diff of Package xorg-x11-driver-input

Overview Repositories Revisions Requests Users Attributes Meta

File xf86-input-calcomp.diff of Package xorg-x11-driver-input (Revision 63290e8403a186328f1dc5b6a9d2dbf9)

Currently displaying revision 63290e8403a186328f1dc5b6a9d2dbf9 , Show latest

commit c21a961bc71f6c92ce48208e4642a20b09b23149
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date:   Mon May 26 22:02:54 2008 +0930

Check for XINPUT ABI 3.

diff --git a/src/xf86Calcomp.c b/src/xf86Calcomp.c
index f834eea..46de9be 100644
--- a/src/xf86Calcomp.c
+++ b/src/xf86Calcomp.c
@@ -132,7 +132,9 @@ static const char *reqSymbols[] = {
         "xf86CollectInputOptions",
         "xf86ErrorFVerb",
         "xf86FindOptionValue",
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
         "xf86GetMotionEvents",
+#endif
         "xf86GetVerbosity",
         "xf86MotionHistoryAllocate",
         "xf86NameCmp",
@@ -308,7 +310,10 @@ DeviceInit (DeviceIntPtr dev)
 	 * this example device reports motions on 2 axes in absolute coordinates.
 	 * Device may reports touch pressure on the 3rd axis.
 	 */
-	if (InitValuatorClassDeviceStruct (dev, 3, xf86GetMotionEvents,
+	if (InitValuatorClassDeviceStruct (dev, 3,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
+                    xf86GetMotionEvents,
+#endif
 									local->history_size, Absolute) == FALSE)
 	{
 		ErrorF ("Unable to allocate CALCOMP ValuatorClassDeviceStruct\n");

Places

File xf86-input-calcomp.diff of Package xorg-x11-driver-input (Revision 63290e8403a186328f1dc5b6a9d2dbf9)

Places