From db1fb534b8f5a1f19710ac77ef2ce85c4c1270ec Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Mon, 30 Dec 2002 21:10:13 +0000 Subject: [PATCH] bindings work again. yay --- src/bindings.cc | 19 +++---------------- src/openbox.cc | 6 +++--- 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/src/bindings.cc b/src/bindings.cc index 5ab5f66d..1a102b54 100644 --- a/src/bindings.cc +++ b/src/bindings.cc @@ -211,7 +211,6 @@ void OBBindings::assimilate(BindingTree *node) { BindingTree *a, *b, *tmp, *last; - printf("node=%lx\n", (long)node); if (!_keytree.first_child) { // there are no nodes at this level yet _keytree.first_child = node; @@ -220,7 +219,6 @@ void OBBindings::assimilate(BindingTree *node) last = a; b = node; while (a) { - printf("in while.. b=%lx\n", (long)b); last = a; if (a->binding != b->binding) { a = a->next_sibling; @@ -231,20 +229,18 @@ void OBBindings::assimilate(BindingTree *node) a = a->first_child; } } - printf("after while.. b=%lx\n", (long)b); if (last->binding != b->binding) last->next_sibling = b; - else + else { last->first_child = b->first_child; - delete b; + delete b; + } } } int OBBindings::find_key(BindingTree *search) const { BindingTree *a, *b; - print_branch(&_keytree, " Searching:"); - print_branch(search, " for..."); a = _keytree.first_child; b = search; while (a && b) { @@ -253,11 +249,9 @@ int OBBindings::find_key(BindingTree *search) const { } else { if (a->chain == b->chain) { if (!a->chain) { - printf("Match found with %s\n", a->text.c_str()); return a->id; // found it! (return the actual id, not the search's) } } else { - printf("Conflict found with %s\n", a->text.c_str()); return -2; // the chain status' don't match (conflict!) } b = b->first_child; @@ -274,11 +268,8 @@ bool OBBindings::add_key(const StringVect &keylist, int id) if (!(tree = buildtree(keylist, id))) return false; // invalid binding requested - print_branch(tree, " Adding: "); - if (find_key(tree) != -1) { // conflicts with another binding - printf("Conflict\n"); destroytree(tree); return false; } @@ -286,10 +277,6 @@ bool OBBindings::add_key(const StringVect &keylist, int id) // assimilate this built tree into the main tree assimilate(tree); // assimilation destroys/uses the tree - printf("Added!\n"); - print_branch(&_keytree, ""); - printf("\n"); - return true; } diff --git a/src/openbox.cc b/src/openbox.cc index bff7c2e5..e7ffb76b 100644 --- a/src/openbox.cc +++ b/src/openbox.cc @@ -163,10 +163,10 @@ Openbox::Openbox(int argc, char **argv) v.push_back("C-a"); _bindings->add_key(v, 3); -// _bindings->add_mouse("A-1", 1); + _bindings->add_mouse("A-1", 1); -// printf("CHAINS:\n"); -// _bindings->display(); + printf("CHAINS:\n"); + _bindings->display(); ::exit(0); setMasterHandler(_actions); // set as the master event handler -- 2.45.2