[PATCH xserver] Add missing labels for multitouch valuators

Benjamin Tissoires benjamin.tissoires at gmail.com
Fri Oct 26 07:27:34 PDT 2012


ABS_MT_DISTANCE exists since kernel v2.6.38,
ABS_MT_TOOL_X|Y appeared in v3.6.

Signed-off-by: Benjamin Tissoires <benjamin.tissoires at gmail.com>
---

Hi Peter,

as requested, this is an update of the latest input definitions made
in the kernel.

It's been a long time since I submitted patches to X.org, so don't hesitate
to remind me "evident" things if I made any mistake.

Cheers,
Benjamin

 Xi/xiproperty.c              | 3 +++
 include/xserver-properties.h | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/Xi/xiproperty.c b/Xi/xiproperty.c
index 43351bc..796ba09 100644
--- a/Xi/xiproperty.c
+++ b/Xi/xiproperty.c
@@ -105,6 +105,9 @@ static struct dev_properties {
     {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_MT_DISTANCE},
+    {0, AXIS_LABEL_PROP_ABS_MT_TOOL_X},
+    {0, AXIS_LABEL_PROP_ABS_MT_TOOL_Y},
     {0, AXIS_LABEL_PROP_ABS_MISC},
     {0, BTN_LABEL_PROP},
     {0, BTN_LABEL_PROP_BTN_UNKNOWN},
diff --git a/include/xserver-properties.h b/include/xserver-properties.h
index 85f2ce5..bf48fab 100644
--- a/include/xserver-properties.h
+++ b/include/xserver-properties.h
@@ -118,6 +118,9 @@
 #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_MT_DISTANCE    "Abs MT Distance"
+#define AXIS_LABEL_PROP_ABS_MT_TOOL_X      "Abs MT Tool X"
+#define AXIS_LABEL_PROP_ABS_MT_TOOL_Y      "Abs MT Tool Y"
 #define AXIS_LABEL_PROP_ABS_MISC        "Abs Misc"
 
 /* Button names */
-- 
1.7.11.7



More information about the xorg-devel mailing list