[PATCH evdev 1/5] Add the names of the valuators for the multitouch properties
Benjamin Tissoires
tissoire at cena.fr
Sun Mar 28 04:58:09 PDT 2010
The driver has to know the correct labels of the ABS_MT_* events.
However, to keep compatibility with older xserver that don't define
the corresponding labels, this patch does not inject them in the list.
Signed-off-by: Benjamin Tissoires <tissoire at cena.fr>
---
src/evdev.c | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/src/evdev.c b/src/evdev.c
index 66b746a..1491120 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -2264,6 +2264,35 @@ static char* abs_labels[] = {
AXIS_LABEL_PROP_ABS_MISC, /* undefined */
AXIS_LABEL_PROP_ABS_MISC, /* undefined */
AXIS_LABEL_PROP_ABS_VOLUME /* 0x20 */
+ AXIS_LABEL_PROP_ABS_MISC, /* undefined */
+ AXIS_LABEL_PROP_ABS_MISC, /* undefined */
+ AXIS_LABEL_PROP_ABS_MISC, /* undefined */
+ AXIS_LABEL_PROP_ABS_MISC, /* undefined */
+ AXIS_LABEL_PROP_ABS_MISC, /* undefined */
+ AXIS_LABEL_PROP_ABS_MISC, /* undefined */
+ AXIS_LABEL_PROP_ABS_MISC, /* undefined */
+ AXIS_LABEL_PROP_ABS_MISC, /* undefined */
+ AXIS_LABEL_PROP_ABS_MISC, /* undefined */
+ AXIS_LABEL_PROP_ABS_MISC, /* undefined */
+ AXIS_LABEL_PROP_ABS_MISC, /* undefined */
+ AXIS_LABEL_PROP_ABS_MISC, /* undefined */
+ AXIS_LABEL_PROP_ABS_MISC, /* undefined */
+ AXIS_LABEL_PROP_ABS_MISC, /* undefined */
+ AXIS_LABEL_PROP_ABS_MISC, /* undefined */
+ AXIS_LABEL_PROP_ABS_MISC, /* undefined */
+#ifdef AXIS_LABEL_PROP_ABS_MT_TOUCH_MAJOR
+ AXIS_LABEL_PROP_ABS_MT_TOUCH_MAJOR, /* 0x30 */
+ AXIS_LABEL_PROP_ABS_MT_TOUCH_MINOR, /* 0x31 */
+ AXIS_LABEL_PROP_ABS_MT_WIDTH_MAJOR, /* 0x32 */
+ AXIS_LABEL_PROP_ABS_MT_WIDTH_MINOR, /* 0x33 */
+ AXIS_LABEL_PROP_ABS_MT_ORIENTATION, /* 0x34 */
+ AXIS_LABEL_PROP_ABS_MT_POSITION_X, /* 0x35 */
+ AXIS_LABEL_PROP_ABS_MT_POSITION_Y, /* 0x36 */
+ AXIS_LABEL_PROP_ABS_MT_TOOL_TYPE, /* 0x37 */
+ AXIS_LABEL_PROP_ABS_MT_BLOB_ID, /* 0x38 */
+ AXIS_LABEL_PROP_ABS_MT_TRACKING_ID, /* 0x39 */
+ AXIS_LABEL_PROP_ABS_MT_PRESSURE, /* 0x3a */
+#endif /* AXIS_LABEL_PROP_ABS_MT_TOUCH_MAJOR */
};
static char* rel_labels[] = {
--
1.6.6.1
More information about the xorg-devel
mailing list