X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fkeytree.c;h=714fffda60bc6bbccdfe0bbd46e74f732865a73a;hb=6653c9db22f47affbe5a189abcbde7786afe9413;hp=b41b1cf7d7a81af2f4f6326b60f4718af23f2829;hpb=df9b2294dbeaedb6ba1af833d0c09f1a294702e9;p=chaz%2Fopenbox

diff --git a/openbox/keytree.c b/openbox/keytree.c
index b41b1cf7..714fffda 100644
--- a/openbox/keytree.c
+++ b/openbox/keytree.c
@@ -19,6 +19,7 @@
 
 #include "keyboard.h"
 #include "translate.h"
+#include "actions.h"
 #include <glib.h>
 
 void tree_destroy(KeyBindingTree *tree)
@@ -35,7 +36,7 @@ void tree_destroy(KeyBindingTree *tree)
                 g_free(it->data);
             g_list_free(tree->keylist);
             for (sit = tree->actions; sit != NULL; sit = sit->next)
-                action_unref(sit->data);
+                actions_act_unref(sit->data);
             g_slist_free(tree->actions);
         }
         g_free(tree);
@@ -61,14 +62,19 @@ KeyBindingTree *tree_build(GList *keylist)
             ret->keylist = g_list_prepend(ret->keylist,
                                           g_strdup(kit->data)); /* deep copy */
         ret->first_child = p;
-        if (!translate_key(it->data, &ret->state, &ret->key)) {
-            tree_destroy(ret);
-            return NULL;
-        }
+        if (p != NULL) p->parent = ret;
+        translate_key(it->data, &ret->state, &ret->key);
     }
     return ret;
 }
 
+void tree_rebind(KeyBindingTree *node) {
+    GList *it = g_list_last(node->keylist);
+    translate_key(it->data, &node->state, &node->key);
+    if (node->next_sibling) tree_rebind(node->next_sibling);
+    if (node->first_child) tree_rebind(node->first_child);
+}
+
 void tree_assimilate(KeyBindingTree *node)
 {
     KeyBindingTree *a, *b, *tmp, *last;
@@ -91,10 +97,12 @@ void tree_assimilate(KeyBindingTree *node)
                 a = a->first_child;
             }
         }
-        if (!(last->state == b->state && last->key == b->key))
+        if (!(last->state == b->state && last->key == b->key)) {
             last->next_sibling = b;
-        else {
+            b->parent = last->parent;
+        } else {
             last->first_child = b->first_child;
+            last->first_child->parent = last;
             g_free(b);
         }
     }
@@ -127,3 +135,20 @@ KeyBindingTree *tree_find(KeyBindingTree *search, gboolean *conflict)
     }
     return NULL; /* it just isn't in here */
 }
+
+gboolean tree_chroot(KeyBindingTree *tree, GList *keylist)
+{
+    guint key, state;
+    if (translate_key(keylist->data, &state, &key)) {
+        while (tree != NULL && !(tree->state == state && tree->key == key))
+            tree = tree->next_sibling;
+        if (tree != NULL) {
+            if (keylist->next == NULL) {
+                tree->chroot = TRUE;
+                return TRUE;
+            } else
+                return tree_chroot(tree->first_child, keylist->next);
+        }
+    }
+    return FALSE;
+}