[PATCH libinput 7/7] touchpad: Make tap code follow state machine diagram part 3

[Peter Hutterer]

On Sun, Sep 28, 2014 at 01:22:23PM +0200, Hans de Goede wrote:
> We should only mark touches dead on a button click if we're dealing with a
> clickpad.
> 
> Signed-off-by: Hans de Goede <hdegoede at redhat.com>

Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
for the series, but it conflicts because of the missing patch. Once I merge
that, I'll merge this series too (with a couple of typos in the commit msgs
fixed). Thanks for all the work!

Cheers,
   Peter


> ---
>  src/evdev-mt-touchpad-tap.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/src/evdev-mt-touchpad-tap.c b/src/evdev-mt-touchpad-tap.c
> index e9dc147..ce88ff4 100644
> --- a/src/evdev-mt-touchpad-tap.c
> +++ b/src/evdev-mt-touchpad-tap.c
> @@ -562,7 +562,8 @@ tp_tap_handle_state(struct tp_dispatch *tp, uint64_t time)
>  		if (!t->dirty || t->state == TOUCH_NONE)
>  			continue;
>  
> -		if (tp->queued & TOUCHPAD_EVENT_BUTTON_PRESS)
> +		if (tp->buttons.is_clickpad &&
> +		    tp->queued & TOUCHPAD_EVENT_BUTTON_PRESS)
>  			t->tap.state = TAP_TOUCH_STATE_DEAD;
>  
>  		if (t->state == TOUCH_BEGIN) {
> -- 
> 2.1.0
> 
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/wayland-devel
>