more debug output changes
Dana Jansens danakj@orodu.net
2 files changed,
10 insertions(+),
7 deletions(-)
M
src/bindings.cc
→
src/bindings.cc
@@ -214,7 +214,6 @@ printf("node=%lx\n", (long)node);
if (!_keytree.first_child) { // there are no nodes at this level yet _keytree.first_child = node; - return; } else { a = _keytree.first_child; last = a;@@ -225,9 +224,6 @@ last = a;
if (a->binding != b->binding) { a = a->next_sibling; } else { - printf("a: %s %d %d\n", a->text.c_str(), a->binding.key, a->binding.modifiers); - printf("b: %s %d %d\n", b->text.c_str(), b->binding.key, b->binding.modifiers); - printf("moving up one in b\n"); tmp = b; b = b->first_child; delete tmp;@@ -271,6 +267,8 @@
if (!(tree = buildtree(keylist, id))) return false; // invalid binding requested + print_branch(tree, " Adding: "); + if (find_key(tree) != -1) { // conflicts with another binding destroytree(tree);@@ -279,6 +277,11 @@ }
// 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; }
M
src/openbox.cc
→
src/openbox.cc
@@ -163,10 +163,10 @@ v.clear();
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