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

Overview Repositories Revisions Requests Users Attributes Meta

File xf86-input-citron.diff of Package xorg-x11-driver-input (Revision fd9096a5a92d691bfcd04662e5870386)

Currently displaying revision fd9096a5a92d691bfcd04662e5870386 , Show latest

commit a59ffb3cdc9d68a0ad21f04831e4255ad0e985d8
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com>
Date:   Mon Feb 4 01:10:27 2008 -0200

Don't call xf86SoundKbdBell and xf86XInputSetSendCoreEvents
    
    Only call those functions if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0.
    
    Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>

diff --git a/src/citron.c b/src/citron.c
index 42152b5..38e5067 100644
--- a/src/citron.c
+++ b/src/citron.c
@@ -2058,12 +2058,14 @@ SwitchMode (ClientPtr client, DeviceIntPtr dev, int mode)
 		DBG(6, ErrorF("%s\treporting mode = %s\n", CI_INFO, mode==TS_Raw?"raw":"scaled"));
 		return (Success);
 	}
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
 	else if ((mode == SendCoreEvents) || (mode == DontSendCoreEvents))
 	{
 		xf86XInputSetSendCoreEvents (local, (mode == SendCoreEvents));
 		DBG(6, ErrorF("%s\tmode = %sSend Core Events\n", CI_INFO, mode==DontSendCoreEvents?"Don\'t ":""));
 		return (Success);
 	}
+#endif
 #ifdef CIT_MODE_EXT
 	else if (mode == ClickMode_Enter)
 	{
@@ -2466,6 +2468,7 @@ cit_Beep(cit_PrivatePtr priv, int press)
 	if(priv->beep == 0)
 		return;
 
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
 	/* ring release bell */
 	if(press == 0)
 
@@ -2492,6 +2495,7 @@ cit_Beep(cit_PrivatePtr priv, int press)
 	else
 	/* ring press bell */
 		xf86SoundKbdBell(priv->press_vol,priv->press_pitch, priv->press_dur);
+#endif
 
 	DBG(7, ErrorF("%scit_Beep called - %s\n", CI_INFO, (press == 0) ? "release" : "press"));
 #endif
@@ -2508,6 +2512,7 @@ cit_BeepKey(cit_PrivatePtr priv, int press)
 	if(priv->beepkey == 0)
 		return;
 
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
 	/* ring release bell */
 	if(press <= 0)
 
@@ -2532,6 +2537,7 @@ cit_BeepKey(cit_PrivatePtr priv, int press)
 	else
 	/* ring press bell */
 		xf86SoundKbdBell(priv->presskey_vol,priv->presskey_pitch, priv->presskey_dur);
+#endif
 
 	DBG(7, ErrorF("%scit_BeepKey called - %s\n", CI_INFO, (press == 0) ? "release" : "press"));
 #endif
commit 591674bee43061f1169ebeede653fb6d98147724
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date:   Mon May 26 22:03:52 2008 +0930

Check for XINPUT ABI 3.

diff --git a/src/citron.c b/src/citron.c
index 38e5067..c7f6c3c 100644
--- a/src/citron.c
+++ b/src/citron.c
@@ -1368,7 +1368,10 @@ DeviceInit (DeviceIntPtr dev)
 	 * screen to fit one meter.
 	 * Device may reports touch pressure on the 3rd axis.
 	 */
-	if (InitValuatorClassDeviceStruct (dev, 2, xf86GetMotionEvents,
+	if (InitValuatorClassDeviceStruct (dev, 2,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
+                    xf86GetMotionEvents,
+#endif
 									local->history_size, Absolute) == FALSE)
 	{
 		ErrorF ("%sUnable to allocate Citron touchscreen ValuatorClassDeviceStruct\n", CI_ERROR);
commit 0297c49fd3743e15900a05169ba36e6a0fb438c0
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date:   Thu Aug 14 14:55:59 2008 +0930

Fix build, XF86_VERSION_CURRENT doesn't exist anymore.

diff --git a/src/citron.c b/src/citron.c
index c7f6c3c..eb83cf8 100644
--- a/src/citron.c
+++ b/src/citron.c
@@ -305,7 +305,7 @@ static XF86ModuleVersionInfo VersionRec =
 	MODULEVENDORSTRING,			/* vendor specific string */
 	MODINFOSTRING1,				
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,		/* Current XFree version */
+	XORG_VERSION_CURRENT,		/* Current Xorg version */
 	CITOUCH_VERSION_MAJOR,		/* Module-specific major version */
 	CITOUCH_VERSION_MINOR,		/* Module-specific minor version */
 	CITOUCH_VERSION_PATCH,		/* Module-specific patch level */

Places

File xf86-input-citron.diff of Package xorg-x11-driver-input (Revision fd9096a5a92d691bfcd04662e5870386)

Places