[PATCH 7/9] exposay: add cancel impl to the kbd grab iface

Emilio Pozuelo Monfort pochu27 at gmail.com
Fri Nov 15 08:53:36 PST 2013


Otherwise we'll crash when cancel is called.

Signed-off-by: Emilio Pozuelo Monfort <emilio.pozuelo at collabora.co.uk>
---
 src/shell.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/shell.c b/src/shell.c
index 2ffd37f..accf4de 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -5337,9 +5337,19 @@ exposay_modifier(struct weston_keyboard_grab *grab, uint32_t serial,
 {
 }
 
+static void
+exposay_cancel(struct weston_keyboard_grab *grab)
+{
+	struct desktop_shell *shell =
+		container_of(grab, struct desktop_shell, exposay.grab_kbd);
+
+	exposay_set_state(shell, EXPOSAY_TARGET_CANCEL, shell->exposay.seat);
+}
+
 static const struct weston_keyboard_grab_interface exposay_kbd_grab = {
 	exposay_key,
 	exposay_modifier,
+	exposay_cancel,
 };
 
 /**
-- 
1.8.4.rc3



More information about the wayland-devel mailing list