use the hover and press button colors (this was a bug)

[chaz/openbox] / openbox / keyboard.c

diff --git a/openbox/keyboard.c b/openbox/keyboard.c
index eddda577c6f113e878263d320ee43aad8e4f9fc6..c23d83e627881bb7180d57e6e232ce08b23fa5f5 100644 (file)
--- a/openbox/keyboard.c
+++ b/openbox/keyboard.c
@@ -265,9 +265,45 @@ void keyboard_event(ObClient *client, const XEvent *e)
     }
 }
 
-void keyboard_rebind()
+static void node_rebind(KeyBindingTree *node)
 {
-    tree_rebind(keyboard_firstnode);
+    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)
+{
+    KeyBindingTree *old;
+
+    old = keyboard_firstnode;
+    keyboard_firstnode = NULL;
+    node_rebind(old);
+
+    tree_destroy(old);
+    set_curpos(NULL);
     grab_keys(TRUE);
 }