[PATCH weston 4/5] input: Add notify_touch_cancel()

Derek Foreman derekf at osg.samsung.com
Fri Nov 6 13:56:09 PST 2015


We already have notify_touch(), notify_touch_frame().  We need
notify_touch_cancel() to implement touch in the weston wayland backend
properly.

Signed-off-by: Derek Foreman <derekf at osg.samsung.com>
---
 src/compositor.h | 3 +++
 src/input.c      | 9 +++++++++
 2 files changed, 12 insertions(+)

diff --git a/src/compositor.h b/src/compositor.h
index f3e0075..522c686 100644
--- a/src/compositor.h
+++ b/src/compositor.h
@@ -1136,6 +1136,9 @@ void
 notify_touch_frame(struct weston_seat *seat);
 
 void
+notify_touch_cancel(struct weston_seat *seat);
+
+void
 weston_layer_entry_insert(struct weston_layer_entry *list,
 			  struct weston_layer_entry *entry);
 void
diff --git a/src/input.c b/src/input.c
index 09d12de..8cdd5f6 100644
--- a/src/input.c
+++ b/src/input.c
@@ -1651,6 +1651,15 @@ notify_touch_frame(struct weston_seat *seat)
 	grab->interface->frame(grab);
 }
 
+WL_EXPORT void
+notify_touch_cancel(struct weston_seat *seat)
+{
+	struct weston_touch *touch = weston_seat_get_touch(seat);
+	struct weston_touch_grab *grab = touch->grab;
+
+	grab->interface->cancel(grab);
+}
+
 static int
 pointer_cursor_surface_get_label(struct weston_surface *surface,
 				 char *buf, size_t len)
-- 
2.6.1



More information about the wayland-devel mailing list