andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add labels for multitouch valuators

Browse Source 
Thoses definitions have been included in the kernel but the X server is not updated accordingly.
Without these definitions, the multitouch axes are not correctly labelled.

Signed-off-by: Benjamin Tissoires <tissoire@cena.fr>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Benjamin Tissoires 2010-02-08 13:50:43 +01:00 committed by Peter Hutterer
parent 901c4ebf62
commit a34812b090
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Xi/xiproperty.c
View File

@ -93,6 +93,17 @@ static struct dev_properties
{0, AXIS_LABEL_PROP_ABS_TILT_Y},
{0, AXIS_LABEL_PROP_ABS_TOOL_WIDTH},
{0, AXIS_LABEL_PROP_ABS_VOLUME},
{0, AXIS_LABEL_PROP_ABS_MT_TOUCH_MAJOR},
{0, AXIS_LABEL_PROP_ABS_MT_TOUCH_MINOR},
{0, AXIS_LABEL_PROP_ABS_MT_WIDTH_MAJOR},
{0, AXIS_LABEL_PROP_ABS_MT_WIDTH_MINOR},
{0, AXIS_LABEL_PROP_ABS_MT_ORIENTATION},
{0, AXIS_LABEL_PROP_ABS_MT_POSITION_X},
{0, AXIS_LABEL_PROP_ABS_MT_POSITION_Y},
{0, AXIS_LABEL_PROP_ABS_MT_TOOL_TYPE},
{0, AXIS_LABEL_PROP_ABS_MT_BLOB_ID},
{0, AXIS_LABEL_PROP_ABS_MT_TRACKING_ID},
{0, AXIS_LABEL_PROP_ABS_MT_PRESSURE},
{0, AXIS_LABEL_PROP_ABS_MISC},
{0, BTN_LABEL_PROP},

11
include/xserver-properties.h
View File

@ -89,6 +89,17 @@
#define AXIS_LABEL_PROP_ABS_TILT_Y "Abs Tilt Y"
#define AXIS_LABEL_PROP_ABS_TOOL_WIDTH "Abs Tool Width"
#define AXIS_LABEL_PROP_ABS_VOLUME "Abs Volume"
#define AXIS_LABEL_PROP_ABS_MT_TOUCH_MAJOR "Abs MT Touch Major"
#define AXIS_LABEL_PROP_ABS_MT_TOUCH_MINOR "Abs MT Touch Minor"
#define AXIS_LABEL_PROP_ABS_MT_WIDTH_MAJOR "Abs MT Width Major"
#define AXIS_LABEL_PROP_ABS_MT_WIDTH_MINOR "Abs MT Width Minor"
#define AXIS_LABEL_PROP_ABS_MT_ORIENTATION "Abs MT Orientation"
#define AXIS_LABEL_PROP_ABS_MT_POSITION_X "Abs MT Position X"
#define AXIS_LABEL_PROP_ABS_MT_POSITION_Y "Abs MT Position Y"
#define AXIS_LABEL_PROP_ABS_MT_TOOL_TYPE "Abs MT Tool Type"
#define AXIS_LABEL_PROP_ABS_MT_BLOB_ID "Abs MT Blob ID"
#define AXIS_LABEL_PROP_ABS_MT_TRACKING_ID "Abs MT Tracking ID"
#define AXIS_LABEL_PROP_ABS_MT_PRESSURE "Abs MT Pressure"
#define AXIS_LABEL_PROP_ABS_MISC "Abs Misc"
/* Button names */