You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
111 lines
3.9 KiB
111 lines
3.9 KiB
# --- SDE-COPYRIGHT-NOTE-BEGIN --- |
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|
# |
|
# Filename: package/.../xf86-input-fpit/0001-Cope-with-XINPUT-ABI-7.patch |
|
# Copyright (C) 2010 The OpenSDE Project |
|
# |
|
# More information can be found in the files COPYING and README. |
|
# |
|
# This patch file is dual-licensed. It is available under the license the |
|
# patched project is licensed under, as long as it is an OpenSource license |
|
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms |
|
# of the GNU General Public License as published by the Free Software |
|
# Foundation; either version 2 of the License, or (at your option) any later |
|
# version. |
|
# --- SDE-COPYRIGHT-NOTE-END --- |
|
|
|
From ae95bf640db6c171609e6937bcd60fa710ce23ad Mon Sep 17 00:00:00 2001 |
|
From: Peter Hutterer <peter.hutterer@who-t.net> |
|
Date: Fri, 17 Jul 2009 14:38:31 +1000 |
|
Subject: [PATCH 1/3] Cope with XINPUT ABI 7. |
|
|
|
--- |
|
src/xf86Fpit.c | 40 +++++++++++++++++++++++++++++++++++----- |
|
1 files changed, 35 insertions(+), 5 deletions(-) |
|
|
|
diff --git a/src/xf86Fpit.c b/src/xf86Fpit.c |
|
index 528ebb9..f40c6a9 100644 |
|
--- a/src/xf86Fpit.c |
|
+++ b/src/xf86Fpit.c |
|
@@ -188,6 +188,9 @@ static void xf86FpitSetUpAxes(DeviceIntPtr dev, FpitPrivatePtr priv) |
|
* screen to fit one meter. |
|
*/ |
|
int quarter_turns; |
|
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 |
|
+ Atom axis_labels[2] = { 0, 0 }; |
|
+#endif |
|
|
|
priv->screen_width = screenInfo.screens[priv->screen_no]->width; |
|
priv->screen_height = screenInfo.screens[priv->screen_no]->height; |
|
@@ -212,14 +215,30 @@ static void xf86FpitSetUpAxes(DeviceIntPtr dev, FpitPrivatePtr priv) |
|
} |
|
|
|
if (priv->fpitTotalOrientation & FPIT_THEN_SWAP_XY) { |
|
- InitValuatorAxisStruct(dev, 1, priv->fpitMinX, priv->fpitMaxX, 9500, 0 /* min_res */ , |
|
+ InitValuatorAxisStruct(dev, 1, |
|
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 |
|
+ axis_labels[1], |
|
+#endif |
|
+ priv->fpitMinX, priv->fpitMaxX, 9500, 0 /* min_res */ , |
|
9500 /* max_res */ ); |
|
- InitValuatorAxisStruct(dev, 0, priv->fpitMinY, priv->fpitMaxY, 10500, 0 /* min_res */ , |
|
+ InitValuatorAxisStruct(dev, 0, |
|
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 |
|
+ axis_labels[0], |
|
+#endif |
|
+ priv->fpitMinY, priv->fpitMaxY, 10500, 0 /* min_res */ , |
|
10500 /* max_res */ ); |
|
} else { |
|
- InitValuatorAxisStruct(dev, 0, priv->fpitMinX, priv->fpitMaxX, 9500, 0 /* min_res */ , |
|
+ InitValuatorAxisStruct(dev, 0, |
|
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 |
|
+ axis_labels[0], |
|
+#endif |
|
+ priv->fpitMinY, priv->fpitMaxY, 9500, 0 /* min_res */ , |
|
9500 /* max_res */ ); |
|
- InitValuatorAxisStruct(dev, 1, priv->fpitMinY, priv->fpitMaxY, 10500, 0 /* min_res */ , |
|
+ InitValuatorAxisStruct(dev, 1, |
|
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 |
|
+ axis_labels[1], |
|
+#endif |
|
+ priv->fpitMinY, priv->fpitMaxY, 10500, 0 /* min_res */ , |
|
10500 /* max_res */ ); |
|
} |
|
} |
|
@@ -408,6 +427,10 @@ static Bool xf86FpitControl(DeviceIntPtr dev, int mode) |
|
unsigned char map[] = { |
|
0, 1, 2, 3 /* DMC: changed this so we can use all three buttons */ |
|
}; |
|
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 |
|
+ Atom btn_labels[3] = { 0 }; |
|
+ Atom axis_labels[2] = { 0, 0 }; |
|
+#endif |
|
|
|
|
|
switch (mode) { |
|
@@ -420,7 +443,11 @@ static Bool xf86FpitControl(DeviceIntPtr dev, int mode) |
|
/* |
|
* Device reports button press for up to 3 buttons. |
|
*/ |
|
- if (InitButtonClassDeviceStruct(dev, 3, map) == FALSE) { |
|
+ if (InitButtonClassDeviceStruct(dev, 3, |
|
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 |
|
+ btn_labels, |
|
+#endif |
|
+ map) == FALSE) { |
|
ErrorF("Unable to allocate Fpit touchscreen ButtonClassDeviceStruct\n"); |
|
return !Success; |
|
} |
|
@@ -435,6 +462,9 @@ static Bool xf86FpitControl(DeviceIntPtr dev, int mode) |
|
} |
|
|
|
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 |
|
-- |
|
1.6.5.3 |
|
|
|
|