summaryrefslogtreecommitdiff
path: root/openbox/keyboard.c
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2007-06-12 15:53:14 +0000
committerDana Jansens <danakj@orodu.net>2007-06-12 15:53:14 +0000
commit124303ab7233734273eeccbc7c7507b09ddb2675 (patch)
treecb356b2631f72dabae3901e19ee697fb52ae013a /openbox/keyboard.c
parent8deaf1c239bf65221918ac06c77ea6fdec04b27c (diff)
only xungrabkeyboard when we actually have a passive grab on it
Diffstat (limited to 'openbox/keyboard.c')
-rw-r--r--openbox/keyboard.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/openbox/keyboard.c b/openbox/keyboard.c
index e62f5011..9fd38def 100644
--- 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)