[PATCH 1/2] input: don't run modifier bindings when the kbd is grabbed

pochu27 at gmail.com pochu27 at gmail.com
Wed Nov 27 01:34:32 PST 2013


From: Emilio Pozuelo Monfort <emilio.pozuelo at collabora.co.uk>

We don't want bindings to be run while the keyboard is grabbed.
Otherwise the binding handler may grab the keyboard too, making
the old grab go away without even being cancelled.
---
 src/bindings.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/bindings.c b/src/bindings.c
index fb758d1..fe21ed6 100644
--- a/src/bindings.c
+++ b/src/bindings.c
@@ -293,6 +293,9 @@ weston_compositor_run_modifier_binding(struct weston_compositor *compositor,
 {
 	struct weston_binding *b;
 
+	if (seat->keyboard->grab != &seat->keyboard->default_grab)
+		return;
+
 	wl_list_for_each(b, &compositor->modifier_binding_list, link) {
 		weston_modifier_binding_handler_t handler = b->handler;
 
-- 
1.8.4.rc3



More information about the wayland-devel mailing list