X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fkeytree.c;h=93a0c7aa6a54aa9e6dc53b0346cf79171c1d3aa0;hb=d179d6428ae585a3b8a13479bfe4586e41de2ff9;hp=714fffda60bc6bbccdfe0bbd46e74f732865a73a;hpb=405d9a3e431b01a221be65f41bccb6c80c43b0a4;p=chaz%2Fopenbox

diff --git a/openbox/keytree.c b/openbox/keytree.c
index 714fffda..93a0c7aa 100644
--- a/openbox/keytree.c
+++ b/openbox/keytree.c
@@ -39,7 +39,7 @@ void tree_destroy(KeyBindingTree *tree)
                 actions_act_unref(sit->data);
             g_slist_free(tree->actions);
         }
-        g_free(tree);
+        g_slice_free(KeyBindingTree, tree);
         tree = c;
     }
 }
@@ -56,7 +56,7 @@ KeyBindingTree *tree_build(GList *keylist)
         GList *kit;
 
         p = ret;
-        ret = g_new0(KeyBindingTree, 1);
+        ret = g_slice_new0(KeyBindingTree);
 
         for (kit = it; kit != NULL; kit = g_list_previous(kit))
             ret->keylist = g_list_prepend(ret->keylist,
@@ -68,13 +68,6 @@ KeyBindingTree *tree_build(GList *keylist)
     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;
@@ -88,22 +81,25 @@ void tree_assimilate(KeyBindingTree *node)
         b = node;
         while (a) {
             last = a;
-            if (!(a->state == b->state && a->key == b->key)) {
+            /* check b->key != 0 for key bindings that didn't get translated */
+            if (!(a->state == b->state && a->key == b->key && b->key != 0)) {
                 a = a->next_sibling;
             } else {
                 tmp = b;
                 b = b->first_child;
-                g_free(tmp);
+                g_slice_free(KeyBindingTree, tmp);
                 a = a->first_child;
             }
         }
-        if (!(last->state == b->state && last->key == b->key)) {
+        /* check b->key != 0, and save key bindings that didn't get translated
+           as siblings here */
+        if (!(last->state == b->state && last->key == b->key && b->key != 0)) {
             last->next_sibling = b;
             b->parent = last->parent;
         } else {
             last->first_child = b->first_child;
             last->first_child->parent = last;
-            g_free(b);
+            g_slice_free(KeyBindingTree, b);
         }
     }
 }
@@ -117,7 +113,10 @@ KeyBindingTree *tree_find(KeyBindingTree *search, gboolean *conflict)
     a = keyboard_firstnode;
     b = search;
     while (a && b) {
-        if (!(a->state == b->state && a->key == b->key)) {
+        /* check b->key != 0 for key bindings that didn't get translated, and
+           don't make them conflict with anything else so that they can all
+           live together in peace and harmony */
+        if (!(a->state == b->state && a->key == b->key && b->key != 0)) {
             a = a->next_sibling;
         } else {
             if ((a->first_child == NULL) == (b->first_child == NULL)) {
@@ -139,16 +138,15 @@ KeyBindingTree *tree_find(KeyBindingTree *search, gboolean *conflict)
 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);
-        }
+    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;
 }