From c896401209f570b2873afe99099b4b9b49cb283d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Wed, 5 Feb 2014 14:25:18 -0800 Subject: [PATCH] input: Run touch binding before calling touch grab We don't want to send events if the binding is going to handle the touch event. Also, this restricts touch bindings to only trigger on touch down. For gesture bindings we want something similar to the motion signal we have for the pointer. --- src/input.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/input.c b/src/input.c index 10001920e..e20c870d1 100644 --- a/src/input.c +++ b/src/input.c @@ -1482,6 +1482,9 @@ notify_touch(struct weston_seat *seat, uint32_t time, int touch_id, return; } + weston_compositor_run_touch_binding(ec, seat, + time, touch_type); + grab->interface->down(grab, time, touch_id, sx, sy); if (touch->num_tp == 1) { touch->grab_serial = @@ -1518,8 +1521,6 @@ notify_touch(struct weston_seat *seat, uint32_t time, int touch_id, weston_touch_set_focus(seat, NULL); break; } - - weston_compositor_run_touch_binding(ec, seat, time, touch_type); } static void