summaryrefslogtreecommitdiffstats
path: root/xorg/xorg-xf86-input-elographics/elographics-1.2.3-abi.patch
diff options
context:
space:
mode:
authortnut <thierryn1 at hispeed dot ch>2009-12-27 21:43:29 +0100
committertnut <thierryn1 at hispeed dot ch>2009-12-27 21:43:29 +0100
commita6d6c742d4489fdf24a4465a69dabd8d8e92a9d6 (patch)
treed5de37c92429a5e0dd834ae517dfba6a4cd4fb18 /xorg/xorg-xf86-input-elographics/elographics-1.2.3-abi.patch
parent910462beb03d253980cd6a22da14fd4f3ee77045 (diff)
downloadnutyx-extra-a6d6c742d4489fdf24a4465a69dabd8d8e92a9d6.tar.gz
nutyx-extra-a6d6c742d4489fdf24a4465a69dabd8d8e92a9d6.tar.bz2
nutyx-extra-a6d6c742d4489fdf24a4465a69dabd8d8e92a9d6.tar.xz
nutyx-extra-a6d6c742d4489fdf24a4465a69dabd8d8e92a9d6.zip
xorg-xf86-input-elographics, ajout patchs
Diffstat (limited to 'xorg/xorg-xf86-input-elographics/elographics-1.2.3-abi.patch')
-rw-r--r--xorg/xorg-xf86-input-elographics/elographics-1.2.3-abi.patch73
1 files changed, 73 insertions, 0 deletions
diff --git a/xorg/xorg-xf86-input-elographics/elographics-1.2.3-abi.patch b/xorg/xorg-xf86-input-elographics/elographics-1.2.3-abi.patch
new file mode 100644
index 000000000..b90fe99d8
--- /dev/null
+++ b/xorg/xorg-xf86-input-elographics/elographics-1.2.3-abi.patch
@@ -0,0 +1,73 @@
+From a18af14b1df5271fbe3100df3fcb3a8811981ddf Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri, 17 Jul 2009 14:44:55 +1000
+Subject: [PATCH] Cope with XINPUT ABI 7.
+
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+ src/xf86Elo.c | 25 ++++++++++++++++++++++---
+ 1 files changed, 22 insertions(+), 3 deletions(-)
+
+diff --git a/src/xf86Elo.c b/src/xf86Elo.c
+index 4ca60f1..495a43c 100644
+--- a/src/xf86Elo.c
++++ b/src/xf86Elo.c
+@@ -780,6 +780,10 @@ xf86EloControl(DeviceIntPtr dev,
+ unsigned char map[] = { 0, 1 };
+ unsigned char req[ELO_PACKET_SIZE];
+ unsigned char reply[ELO_PACKET_SIZE];
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++ Atom btn_label;
++ Atom axis_labels[2] = { 0, 0 };
++#endif
+
+ switch(mode) {
+
+@@ -797,7 +801,11 @@ xf86EloControl(DeviceIntPtr dev,
+ /*
+ * Device reports button press for up to 1 button.
+ */
+- if (InitButtonClassDeviceStruct(dev, 1, map) == FALSE) {
++ if (InitButtonClassDeviceStruct(dev, 1,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++ &btn_label,
++#endif
++ map) == FALSE) {
+ ErrorF("Unable to allocate Elographics touchscreen ButtonClassDeviceStruct\n");
+ return !Success;
+ }
+@@ -818,6 +826,9 @@ xf86EloControl(DeviceIntPtr dev,
+ * 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
+@@ -827,11 +838,19 @@ xf86EloControl(DeviceIntPtr dev,
+ }
+ else {
+ /* I will map coordinates myself */
+- InitValuatorAxisStruct(dev, 0, -1, -1,
++ InitValuatorAxisStruct(dev, 0,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++ axis_labels[0],
++#endif
++ -1, -1,
+ 9500,
+ 0 /* min_res */,
+ 9500 /* max_res */);
+- InitValuatorAxisStruct(dev, 1, -1, -1,
++ InitValuatorAxisStruct(dev, 1,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++ axis_labels[1],
++#endif
++ -1, -1,
+ 10500,
+ 0 /* min_res */,
+ 10500 /* max_res */);
+--
+1.6.3.rc1.2.g0164.dirty
+