diff options
| author | Benjamin Tissoires <tissoire@cena.fr> | 2010-03-24 22:06:59 +0100 |
|---|---|---|
| committer | Benjamin Tissoires <tissoire@cena.fr> | 2010-05-29 22:25:43 +0200 |
| commit | e8c20c6bf8bdef141cc9a6fae962ffc9696e070f (patch) | |
| tree | 1c584a90fb11a4ac53817fe89b13daeecd29c4f3 | |
| parent | 4c216242404d749b9ae8ec181146689f89119cb4 (diff) | |
Add the names of the valuators for the multitouch properties
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@cena.fr>
| -rw-r--r-- | src/evdev.c | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/src/evdev.c b/src/evdev.c index bd92d91..0cf1d3e 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -2283,6 +2283,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[] = { |