X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fkeyboard.c;h=5ac423639c35628036133ece70dc9279ac94770a;hb=985e7dadf9a3ebf4bd265d955c3198e96405e5d2;hp=cf1bc55f33c430b345f9797205e12277b4fd08a9;hpb=0dc7eca4cdfff6425e19a0bace0f9ae8834d04e8;p=chaz%2Fopenbox

diff --git a/openbox/keyboard.c b/openbox/keyboard.c
index cf1bc55f..5ac42363 100644
--- a/openbox/keyboard.c
+++ b/openbox/keyboard.c
@@ -51,13 +51,13 @@ static void grab_keys(gboolean grab)
         while (p) {
             if (p->key)
                 grab_key(p->key, p->state, obt_root(ob_screen),
-                         GrabModeAsync);
+                         GrabModeSync);
             p = p->next_sibling;
         }
         if (curpos)
             grab_key(config_keyboard_reset_keycode,
                      config_keyboard_reset_state,
-                     obt_root(ob_screen), GrabModeAsync);
+                     obt_root(ob_screen), GrabModeSync);
     }
 }
 
@@ -261,6 +261,8 @@ void keyboard_event(ObClient *client, const XEvent *e)
         }
         p = p->next_sibling;
     }
+
+    XAllowEvents(obt_display, AsyncKeyboard, event_curtime);
 }
 
 static void node_rebind(KeyBindingTree *node)
@@ -277,7 +279,6 @@ static void node_rebind(KeyBindingTree *node)
     }
     else {
         /* for leaf nodes, rebind each action assigned to it */
-        GSList *it;
         while (node->actions) {
             /* add each action, and remove them from the original tree so
                they don't get free'd on us */