only xungrabkeyboard when we actually have a passive grab on it

[chaz/openbox] / openbox / keyboard.c

diff --git a/openbox/keyboard.c b/openbox/keyboard.c
index e62f5011292a21456533ce6777cb482a9af65d76..9fd38def9452a03d1534cb3cef0a0ab2cedbcc47 100644 (file)
--- a/openbox/keyboard.c
+++ b/openbox/keyboard.c
@@ -276,7 +276,13 @@ void keyboard_event(ObClient *client, const XEvent *e)
 {
     KeyBindingTree *p;
 
+    if (e->type == KeyRelease) {
+        grab_key_passive_count(-1);
+        return;
+    }
+
     g_assert(e->type == KeyPress);
+    grab_key_passive_count(1);
 
     if (e->xkey.keycode == config_keyboard_reset_keycode &&
         e->xkey.state == config_keyboard_reset_state)