[PATCH evdev] Add the names of the valuators for the multitouch properties

[Peter Hutterer]

On Sat, Oct 16, 2010 at 08:20:31PM +0200, Benjamin Tissoires wrote:
> Thoses definitions have been included in the kernel and in the X server.
> However, the evdev driver has not been updated accordingly.
> 
> Without these definitions, the multitouch axes are not correctly labelled.
> 
> Signed-off-by: Benjamin Tissoires <tissoire at cena.fr>
> ---
> 
> This patch is in my queue since a few month... in fact since January ;)

thanks, sorry about the wait. I put a ifdef for ABI_XINPUT_VERSION 10
around it, that was the first one with the xserver properties included.
will push in a bit.

Cheers,
  Peter
> 
>  src/evdev.c |   27 +++++++++++++++++++++++++++
>  1 files changed, 27 insertions(+), 0 deletions(-)
> 
> diff --git a/src/evdev.c b/src/evdev.c
> index 9e1fb10..9933a72 100644
> --- a/src/evdev.c
> +++ b/src/evdev.c
> @@ -2281,6 +2281,33 @@ 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 */
> +    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 */
>  };
>  
>  static char* rel_labels[] = {
> -- 
> 1.7.2.3
>