[PATCH libinput] evdev: recognize and use ID_INPUT_TRACKBALL

[Hans de Goede]

Hi,

On 03-08-16 23:57, Peter Hutterer wrote:
> We leave the old LIBINPUT_MODEL_TRACKBALL in place until we can rely on
> systems to have the new systemd tagging.
>
> https://github.com/systemd/systemd/pull/3872
>
> Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

LGTM:

Reviewed-by: Hans de Goede <hdegoede at redhat.com>

Regards,

Hans

> ---
>  src/evdev.c | 10 +++++++---
>  1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/src/evdev.c b/src/evdev.c
> index ed581b4..9a0b991 100644
> --- a/src/evdev.c
> +++ b/src/evdev.c
> @@ -67,6 +67,7 @@ enum evdev_device_udev_tags {
>          EVDEV_UDEV_TAG_ACCELEROMETER = (1 << 7),
>          EVDEV_UDEV_TAG_TABLET_PAD = (1 << 8),
>          EVDEV_UDEV_TAG_POINTINGSTICK = (1 << 9),
> +        EVDEV_UDEV_TAG_TRACKBALL = (1 << 10),
>  };
>
>  struct evdev_udev_tag_match {
> @@ -86,6 +87,7 @@ static const struct evdev_udev_tag_match evdev_udev_tag_matches[] = {
>  	{"ID_INPUT_JOYSTICK",		EVDEV_UDEV_TAG_JOYSTICK},
>  	{"ID_INPUT_ACCELEROMETER",	EVDEV_UDEV_TAG_ACCELEROMETER},
>  	{"ID_INPUT_POINTINGSTICK",	EVDEV_UDEV_TAG_POINTINGSTICK},
> +	{"ID_INPUT_TRACKBALL",		EVDEV_UDEV_TAG_TRACKBALL},
>
>  	/* sentinel value */
>  	{ 0 },
> @@ -1797,8 +1799,9 @@ evdev_read_model_flags(struct evdev_device *device)
>  		MODEL(DELL_TOUCHPAD),
>  		MODEL(TRACKBALL),
>  		MODEL(APPLE_MAGICMOUSE),
> -		{ NULL, EVDEV_MODEL_DEFAULT },
>  #undef MODEL
> +		{ "ID_INPUT_TRACKBALL", EVDEV_MODEL_TRACKBALL },
> +		{ NULL, EVDEV_MODEL_DEFAULT },
>  	};
>  	const struct model_map *m = model_map;
>  	uint32_t model_flags = 0;
> @@ -2146,7 +2149,7 @@ evdev_configure_device(struct evdev_device *device)
>  	}
>
>  	log_info(libinput,
> -		 "input device '%s', %s is tagged by udev as:%s%s%s%s%s%s%s%s%s\n",
> +		 "input device '%s', %s is tagged by udev as:%s%s%s%s%s%s%s%s%s%s\n",
>  		 device->devname, devnode,
>  		 udev_tags & EVDEV_UDEV_TAG_KEYBOARD ? " Keyboard" : "",
>  		 udev_tags & EVDEV_UDEV_TAG_MOUSE ? " Mouse" : "",
> @@ -2156,7 +2159,8 @@ evdev_configure_device(struct evdev_device *device)
>  		 udev_tags & EVDEV_UDEV_TAG_POINTINGSTICK ? " Pointingstick" : "",
>  		 udev_tags & EVDEV_UDEV_TAG_JOYSTICK ? " Joystick" : "",
>  		 udev_tags & EVDEV_UDEV_TAG_ACCELEROMETER ? " Accelerometer" : "",
> -		 udev_tags & EVDEV_UDEV_TAG_TABLET_PAD ? " TabletPad" : "");
> +		 udev_tags & EVDEV_UDEV_TAG_TABLET_PAD ? " TabletPad" : "",
> +		 udev_tags & EVDEV_UDEV_TAG_TRACKBALL ? " Trackball" : "");
>
>  	if (udev_tags & EVDEV_UDEV_TAG_ACCELEROMETER) {
>  		log_info(libinput,
>