Merge branch 'backport' into work

[chaz/openbox] / openbox / keyboard.c

diff --git a/openbox/keyboard.c b/openbox/keyboard.c
index c2e567fff2deabec27d38e5350db68893d271805..5ac423639c35628036133ece70dc9279ac94770a 100644 (file)
--- 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,11 +261,49 @@ void keyboard_event(ObClient *client, const XEvent *e)
         }
         p = p->next_sibling;
     }
+
+    XAllowEvents(obt_display, AsyncKeyboard, event_curtime);
+}
+
+static void node_rebind(KeyBindingTree *node)
+{
+    if (node->first_child) {
+        /* find leaf nodes */
+        node_rebind(node->first_child);
+
+        /* for internal nodes, add them to the tree if they
+           are a chroot, but do this after adding their
+           children */
+        if (node->chroot)
+            keyboard_chroot(node->keylist);
+    }
+    else {
+        /* for leaf nodes, rebind each action assigned to it */
+        while (node->actions) {
+            /* add each action, and remove them from the original tree so
+               they don't get free'd on us */
+            keyboard_bind(node->keylist, node->actions->data);
+            node->actions = g_slist_delete_link(node->actions, node->actions);
+        }
+
+        if (node->chroot)
+            keyboard_chroot(node->keylist);
+    }
+
+    /* go through each sibling */
+    if (node->next_sibling) node_rebind(node->next_sibling);
 }
 
 void keyboard_rebind(void)
 {
-    tree_rebind(keyboard_firstnode);
+    KeyBindingTree *old;
+
+    old = keyboard_firstnode;
+    keyboard_firstnode = NULL;
+    node_rebind(old);
+
+    tree_destroy(old);
+    set_curpos(NULL);
     grab_keys(TRUE);
 }