[PATCH] added labels for multitouch valuators

[Peter Hutterer]

On Thu, Feb 04, 2010 at 10:33:14AM +0100, Benjamin Tissoires wrote:
> 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.
> 
> Kernel 2.6.33-rc6 and above also declare ABS_MT_PRESSURE, so we will have to include it when that kernel will be marked as stable.
> 
> Signed-off-by: Benjamin Tissoires <tissoire at cena.fr>

Since we're not actually dependent on the kernel defines (we just duplicated
them for convenience) you can just add the MT pressure define in this patch.

Cheers,
  Peter
> ---
>  Xi/xiproperty.c              |   10 ++++++++++
>  include/xserver-properties.h |   10 ++++++++++
>  2 files changed, 20 insertions(+), 0 deletions(-)
> 
> diff --git a/Xi/xiproperty.c b/Xi/xiproperty.c
> index ea66c54..1438491 100644
> --- a/Xi/xiproperty.c
> +++ b/Xi/xiproperty.c
> @@ -93,6 +93,16 @@ 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_MISC},
>  
>      {0, BTN_LABEL_PROP},
> diff --git a/include/xserver-properties.h b/include/xserver-properties.h
> index 626d0ad..5bf8a08 100644
> --- a/include/xserver-properties.h
> +++ b/include/xserver-properties.h
> @@ -89,6 +89,16 @@
>  #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_MISC        "Abs Misc"
>  
>  /* Button names */
> -- 
> 1.6.6