1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
|
From: Michael Olbrich <m.olbrich@pengutronix.de>
Date: Thu, 14 Jun 2012 23:27:43 +0200
Subject: [PATCH] add support for ABI 12
Based on the patch from Debian.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
src/tslib.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 file changed, 67 insertions(+), 16 deletions(-)
diff --git a/src/tslib.c b/src/tslib.c
index 065e6cf..0446148 100644
--- a/src/tslib.c
+++ b/src/tslib.c
@@ -69,6 +69,13 @@
#define DEFAULT_HEIGHT 240
#define DEFAULT_WIDTH 320
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
+#define COLLECT_INPUT_OPTIONS(pInfo, options) xf86CollectInputOptions((pInfo), (options), NULL)
+#else
+#define COLLECT_INPUT_OPTIONS(pInfo, options) xf86CollectInputOptions((pInfo), (options))
+#endif
+
+
enum { TSLIB_ROTATE_NONE=0, TSLIB_ROTATE_CW=270, TSLIB_ROTATE_UD=180, TSLIB_ROTATE_CCW=90 };
enum button_state { BUTTON_NOT_PRESSED = 0, BUTTON_1_PRESSED = 1, BUTTON_3_CLICK = 3, BUTTON_3_CLICKED=4, BUTTON_EMULATION_OFF=-1 };
@@ -106,7 +113,7 @@ PointerControlProc(DeviceIntPtr dev, PtrCtrl * ctrl)
}
static Bool
-ConvertProc( LocalDevicePtr local,
+ConvertProc( InputInfoPtr local,
int first,
int num,
int v0,
@@ -135,7 +142,7 @@ struct timeval TimevalDiff(struct timeval a, struct timeval b)
return t;
}
-static void ReadInput (LocalDevicePtr local)
+static void ReadInput (InputInfoPtr local)
{
struct ts_priv *priv = (struct ts_priv *) (local->private);
struct ts_sample samp;
@@ -382,7 +389,11 @@ xf86TslibControlProc(DeviceIntPtr device, int what)
axiswidth - 1, /* max val */
axiswidth, /* resolution */
0, /* min_res */
- axiswidth); /* max_res */
+ axiswidth /* max_res */
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
+ ,Absolute
+#endif
+ );
InitValuatorAxisStruct(device, 1,
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
@@ -392,7 +403,11 @@ xf86TslibControlProc(DeviceIntPtr device, int what)
axisheight - 1, /* max val */
axisheight, /* resolution */
0, /* min_res */
- axisheight); /* max_res */
+ axisheight /* max_res */
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
+ ,Absolute
+#endif
+ );
if (InitProximityClassDeviceStruct (device) == FALSE) {
ErrorF ("Unable to allocate EVTouch touchscreen ProximityClassDeviceStruct\n");
@@ -434,7 +449,7 @@ xf86TslibUninit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
ErrorF("%s\n", __FUNCTION__);
xf86TslibControlProc(pInfo->dev, DEVICE_OFF);
ts_close(priv->ts);
- xfree(pInfo->private);
+ free(pInfo->private);
pInfo->private = NULL;
xf86DeleteInput(pInfo, 0);
}
@@ -444,47 +459,61 @@ xf86TslibUninit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
*
* called when the module subsection is found in XF86Config
*/
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
+static int
+xf86TslibInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
+#else
static InputInfoPtr
xf86TslibInit(InputDriverPtr drv, IDevPtr dev, int flags)
+#endif
{
struct ts_priv *priv;
char *s;
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
InputInfoPtr pInfo;
+#endif
- priv = xcalloc (1, sizeof (struct ts_priv));
+ priv = calloc (1, sizeof (struct ts_priv));
if (!priv)
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
return NULL;
+#else
+ return BadValue;
+#endif
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
if (!(pInfo = xf86AllocateInput(drv, 0))) {
- xfree(priv);
+ free(priv);
return NULL;
}
/* Initialise the InputInfoRec. */
pInfo->name = dev->identifier;
- pInfo->type_name = XI_TOUCHSCREEN;
pInfo->flags =
XI86_KEYBOARD_CAPABLE | XI86_POINTER_CAPABLE |
XI86_SEND_DRAG_EVENTS;
- pInfo->device_control = xf86TslibControlProc;
- pInfo->read_input = ReadInput;
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
pInfo->motion_history_proc = xf86GetMotionEvents;
pInfo->history_size = 0;
#endif
- pInfo->control_proc = NULL;
+ pInfo->conf_idev = dev;
pInfo->close_proc = NULL;
- pInfo->switch_mode = NULL;
pInfo->conversion_proc = ConvertProc;
pInfo->reverse_conversion_proc = NULL;
- pInfo->dev = NULL;
pInfo->private_flags = 0;
pInfo->always_core_feedback = 0;
- pInfo->conf_idev = dev;
+#endif
+
+ pInfo->type_name = XI_TOUCHSCREEN;
+ pInfo->control_proc = NULL;
+ pInfo->read_input = ReadInput;
+ pInfo->device_control = xf86TslibControlProc;
+ pInfo->switch_mode = NULL;
pInfo->private = priv;
+ pInfo->dev = NULL;
/* Collect the options, and process the common options. */
- xf86CollectInputOptions(pInfo, NULL, NULL);
+ COLLECT_INPUT_OPTIONS(pInfo, NULL);
xf86ProcessCommonOptions(pInfo, pInfo->options);
priv->screen_num = xf86SetIntOption(pInfo->options, "ScreenNumber", 0 );
@@ -510,23 +539,39 @@ xf86TslibInit(InputDriverPtr drv, IDevPtr dev, int flags)
priv->rotate = TSLIB_ROTATE_NONE;
}
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
s = xf86CheckStrOption(dev->commonOptions, "path", NULL);
+#else
+ s = xf86CheckStrOption(pInfo->options, "path", NULL);
+#endif
if (!s)
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
s = xf86CheckStrOption(dev->commonOptions, "Device", NULL);
+#else
+ s = xf86CheckStrOption(pInfo->options, "Device", NULL);
+#endif
priv->ts = ts_open(s, 1);
- xfree(s);
+ free(s);
if (!priv->ts) {
ErrorF("ts_open failed (device=%s)\n",s);
xf86DeleteInput(pInfo, 0);
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
return NULL;
+#else
+ return BadValue;
+#endif
}
if (ts_config(priv->ts)) {
ErrorF("ts_config failed\n");
xf86DeleteInput(pInfo, 0);
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
return NULL;
+#else
+ return BadValue;
+#endif
}
pInfo->fd = ts_fd(priv->ts);
@@ -536,11 +581,17 @@ xf86TslibInit(InputDriverPtr drv, IDevPtr dev, int flags)
priv->state = BUTTON_EMULATION_OFF;
}
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
/* Mark the device configured */
pInfo->flags |= XI86_CONFIGURED;
+#endif
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
/* Return the configured device */
return (pInfo);
+#else
+ return Success;
+#endif
}
_X_EXPORT InputDriverRec TSLIB = {
|
