commit befa65318a06a35d8014879577c0a34060aa30e2
author Scott Moreau <oreaus@gmail.com> Mon Jun 11 14:59:31 2012 -0600
committer Kristian Høgsberg <krh@bitplanet.net> Mon Jun 11 18:24:16 2012 -0400
tree 5045d31aa5fe09d067e428a1fa8a5c1b2675a699
parent e9f68f66dc9d559d9da77d641f3ca925b9973c7b

compositor: Update grab variable in notify_key() after binding handler.

We need to update the temp grab pointer after weston_compositor_run_key_binding()
before calling the key handler because it may have installed a new grab.

src/compositor.c

diff --git a/src/compositor.c b/src/compositor.c
index 26c9a95..09de2f6 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -1839,9 +1839,11 @@
 		*k = key;
 	}
 
-	if (grab == &seat->keyboard->default_grab)
+	if (grab == &seat->keyboard->default_grab) {
 		weston_compositor_run_key_binding(compositor, ws, time, key,
 						  state);
+		grab = seat->keyboard->grab;
+	}
 
 	grab->interface->key(grab, time, key, state);
 	if (mods)