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

Overview Repositories Revisions Requests Users Attributes Meta

File xf86-input-tek4957.diff of Package xorg-x11-driver-input (Revision 7e143a0b0c1fe1211b13e8f5cef27c53)

Currently displaying revision 7e143a0b0c1fe1211b13e8f5cef27c53 , Show latest

commit 2cffb15678a8c7ef3709fa9e343d5961ae3919eb
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date:   Mon May 26 22:21:39 2008 +0930

Check for XINPUT ABI 3.

diff --git a/src/xf86Tek4957.c b/src/xf86Tek4957.c
index 5877269..de9ee83 100644
--- a/src/xf86Tek4957.c
+++ b/src/xf86Tek4957.c
@@ -446,7 +446,10 @@ TekProc(DeviceIntPtr pDev, int what)
 		return !Success;
 	    }
 
-	    if (InitValuatorClassDeviceStruct(pDev,2,xf86GetMotionEvents,
+	    if (InitValuatorClassDeviceStruct(pDev,2,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
+			xf86GetMotionEvents,
+#endif
 		   local->history_size,Absolute)== FALSE) {
 		xf86Msg(X_ERROR,"Tek4957:Unable to allocate Valuator class device\n");
 		return !Success;
commit 033361925bf0f4257271e45cab528a2506ba09fb
Author: Julien Cristau <jcristau@debian.org>
Date:   Sun Jun 1 00:59:11 2008 +0200

Fix compiler warning: don't use deprecated calls for newer XInput ABIS.

diff --git a/src/xf86Tek4957.c b/src/xf86Tek4957.c
index de9ee83..110de77 100644
--- a/src/xf86Tek4957.c
+++ b/src/xf86Tek4957.c
@@ -152,7 +152,11 @@ TekConvert(LocalDevicePtr	local,
 
     /* Gets current screen size. It can change dynamically in the case of
     a multi-head configuration with different screen sizes ... */
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
     SP=miPointerCurrentScreen();
+#else
+    SP=miPointerGetScreen(local->dev);
+#endif
     W=SP->width;
     H=SP->height;

Places

File xf86-input-tek4957.diff of Package xorg-x11-driver-input (Revision 7e143a0b0c1fe1211b13e8f5cef27c53)

Places