keytree.c for the Openbox window manager
Copyright (c) 2006 Mikael Magnusson
- Copyright (c) 2003 Ben Jansens
+ Copyright (c) 2003-2007 Dana Jansens
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include "keyboard.h"
#include "translate.h"
+#include "actions.h"
#include <glib.h>
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);
return NULL; /* nothing in the list.. */
for (it = g_list_last(keylist); it; it = g_list_previous(it)) {
+ GList *kit;
+
p = ret;
ret = g_new0(KeyBindingTree, 1);
- if (p == NULL) {
- GList *it;
- /* this is the first built node, the bottom node of the tree */
- ret->keylist = g_list_copy(keylist); /* shallow copy */
- for (it = ret->keylist; it; it = g_list_next(it)) /* deep copy */
- it->data = g_strdup(it->data);
- }
+ for (kit = it; kit != NULL; kit = g_list_previous(kit))
+ 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;
}
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;
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;
- else {
+ b->parent = last->parent;
+ } else {
last->first_child = b->first_child;
+ last->first_child->parent = last;
g_free(b);
}
}
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)) {
}
return NULL; /* it just isn't in here */
}
+
+gboolean tree_chroot(KeyBindingTree *tree, GList *keylist)
+{
+ guint key, state;
+ 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;
+}