aboutsummaryrefslogtreecommitdiff
path: root/src/evdev.h
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2013-01-16 08:38:52 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2013-01-23 17:33:10 +1000
commit2f67509b53b27dd7f51ca2aadd19605aee613a61 (patch)
treea5b08454dcb3e2e7b4f094ca204a98b8aa86257d /src/evdev.h
parentMove some stuff into the new alloc function (diff)
downloadxf86-input-evdev-2f67509b53b27dd7f51ca2aadd19605aee613a61.tar.gz
xf86-input-evdev-2f67509b53b27dd7f51ca2aadd19605aee613a61.tar.bz2
xf86-input-evdev-2f67509b53b27dd7f51ca2aadd19605aee613a61.zip
Split rel and abs axis mapping into two separate arrays
This will enable a device to have relative scrolling axes in addition to absolute axes (required by the QEMU tablet). Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'src/evdev.h')
-rw-r--r--src/evdev.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/evdev.h b/src/evdev.h
index 51b7fa0..63c3bfa 100644
--- a/src/evdev.h
+++ b/src/evdev.h
@@ -158,7 +158,8 @@ typedef struct {
int num_vals; /* number of valuators */
int num_mt_vals; /* number of multitouch valuators */
- int axis_map[max(ABS_CNT, REL_CNT)]; /* Map evdev <axis> to index */
+ int abs_axis_map[ABS_CNT]; /* Map evdev ABS_* to index */
+ int rel_axis_map[REL_CNT]; /* Map evdev REL_* to index */
ValuatorMask *vals; /* new values coming in */
ValuatorMask *old_vals; /* old values for calculating relative motion */
ValuatorMask *prox; /* last values set while not in proximity */