#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);
+ g_slice_free(KeyBindingTree, tree);
tree = c;
}
}
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,
g_strdup(kit->data)); /* deep copy */
ret->first_child = p;
if (p != NULL) p->parent = ret;
- if (!translate_key(it->data, &ret->state, &ret->key)) {
- tree_destroy(ret);
- return NULL;
- }
+ 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;
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);
}
}
}
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)) {
gboolean tree_chroot(KeyBindingTree *tree, GList *keylist)
{
- if (keylist == NULL) {
- tree->chroot = TRUE;
- return TRUE;
- } else {
- 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)
- return tree_chroot(tree, keylist->next);
- }
+ 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;
}