more debug output changes

diff --git a/src/bindings.cc b/src/bindings.cc
index 4cffb559bcada1e449a0d97856882fa22af48c0c..95442a1eabc35fc4be013527075ba839b35ae8d8 100644 (file)
--- a/src/bindings.cc
+++ b/src/bindings.cc
@@ -214,7 +214,6 @@ void OBBindings::assimilate(BindingTree *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 @@ void OBBindings::assimilate(BindingTree *node)
       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 @@ 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
     destroytree(tree);
@@ -279,6 +277,11 @@ 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 e7ffb76bf76fe305619c3ff1b956724b6ec0376c..bff7c2e5e885628dd1dab2a0d08dd2917be3578a 100644 (file)
--- 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