[PATCH libinput] evdev: INPUT_PROP_DIRECT devices can't be touchpads

[Jonas Ådahl]

On Thu, May 29, 2014 at 04:00:58PM +1000, Peter Hutterer wrote:
> Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

Reading the documentation, this change looks sane to me.

Reviewed-by: Jonas Ådahl <jadahl at gmail.com>

> ---
>  src/evdev.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/src/evdev.c b/src/evdev.c
> index 08a18fd..b7baab6 100644
> --- a/src/evdev.c
> +++ b/src/evdev.c
> @@ -648,7 +648,8 @@ evdev_configure_device(struct evdev_device *device)
>  		has_rel = 1;
>  
>  	if (libevdev_has_event_type(evdev, EV_KEY)) {
> -		if (libevdev_has_event_code(evdev, EV_KEY, BTN_TOOL_FINGER) &&
> +		if (!libevdev_has_property(evdev, INPUT_PROP_DIRECT) &&
> +		    libevdev_has_event_code(evdev, EV_KEY, BTN_TOOL_FINGER) &&
>  		    !libevdev_has_event_code(evdev, EV_KEY, BTN_TOOL_PEN) &&
>  		    (has_abs || has_mt)) {
>  			device->dispatch = evdev_mt_touchpad_create(device);
> -- 
> 1.9.3
> 
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/wayland-devel