bindings work again. yay

[chaz/openbox] / src / bindings.cc

diff --git a/src/bindings.cc b/src/bindings.cc
index 8f474b37adc32addeca940ebca3a00323dfb9b24..1a102b5452b78c30e65a05f6716bbc36f9e885d9 100644 (file)
--- a/src/bindings.cc
+++ b/src/bindings.cc
@@ -17,9 +17,9 @@ extern "C" {
 namespace ob {
 
 #include <stdio.h>
-static void print_branch(BindingTree *first, std::string str)
+static void print_branch(const BindingTree *first, std::string str)
 {
-  BindingTree *p = first;
+  const BindingTree *p = first;
   
   while (p) {
     if (p->first_child)
@@ -37,9 +37,9 @@ void OBBindings::display()
     printf("Key Tree:\n");
     print_branch(_keytree.first_child, "");
   }
-  if (_mousetree.next_sibling) {
+  if (_mousetree) {
     printf("Mouse Tree:\n");
-    BindingTree *p = _mousetree.next_sibling;
+    BindingTree *p = _mousetree;
     while (p) {
       printf("%d %s\n", p->id, p->text.c_str());
       p = p->next_sibling;
@@ -95,7 +95,8 @@ static bool modvalue(const std::string &mod, unsigned int *val)
   return true;
 }
 
-bool OBBindings::translate(const std::string &str, Binding &b, bool askey)
+bool OBBindings::translate(const std::string &str, Binding &b,
+                           bool askey) const
 {
   // parse out the base key name
   std::string::size_type keybegin = str.find_last_of('-');
@@ -138,7 +139,7 @@ static void destroytree(BindingTree *tree)
   }
 }
 
-BindingTree *OBBindings::buildtree(const StringVect &keylist, int id)
+BindingTree *OBBindings::buildtree(const StringVect &keylist, int id) const
 {
   if (keylist.empty()) return 0; // nothing in the list.. return 0
 
@@ -148,7 +149,7 @@ BindingTree *OBBindings::buildtree(const StringVect &keylist, int id)
   for (it = keylist.rbegin(); it != end; ++it) {
     p = ret;
     ret = new BindingTree(id);
-    if (!p) ret->chain = false;
+    if (!p) ret->chain = false; // only the first built node
     ret->first_child = p;
     if (!translate(*it, ret->binding, true)) {
       destroytree(ret);
@@ -162,7 +163,7 @@ BindingTree *OBBindings::buildtree(const StringVect &keylist, int id)
 
 
 OBBindings::OBBindings()
-  : _curpos(&_keytree)
+  : _curpos(&_keytree), _mousetree(0)
 {
 }
 
@@ -180,19 +181,20 @@ bool OBBindings::add_mouse(const std::string &button, int id)
   if (!translate(button, n.binding, false))
     return false;
 
-  BindingTree *p = _mousetree.next_sibling, *last = &_mousetree;
+  BindingTree *p = _mousetree, **newp = &_mousetree;
   while (p) {
     if (p->binding == n.binding)
       return false; // conflict
-    last = p;
     p = p->next_sibling;
+    newp = &p->next_sibling;
   }
   display();
-  last->next_sibling = new BindingTree(id);
+  *newp = new BindingTree(id);
   display();
-  last->next_sibling->chain = false;
-  last->next_sibling->binding.key = n.binding.key;
-  last->next_sibling->binding.modifiers = n.binding.modifiers;
+  (*newp)->text = button;
+  (*newp)->chain = false;
+  (*newp)->binding.key = n.binding.key;
+  (*newp)->binding.modifiers = n.binding.modifiers;
  
   return true;
 }
@@ -212,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;
@@ -230,14 +231,15 @@ void OBBindings::assimilate(BindingTree *node)
     }
     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) {
+int OBBindings::find_key(BindingTree *search) const {
   BindingTree *a, *b;
   a = _keytree.first_child;
   b = search;
@@ -246,10 +248,12 @@ int OBBindings::find_key(BindingTree *search) {
       a = a->next_sibling;
     } else {
       if (a->chain == b->chain) {
-       if (!a->chain)
+       if (!a->chain) {
          return a->id; // found it! (return the actual id, not the search's)
-      } else
-         return -2; // the chain status' don't match (conflict!)
+        }
+      } else {
+        return -2; // the chain status' don't match (conflict!)
+      }
       b = b->first_child;
       a = a->first_child;
     }
@@ -264,7 +268,7 @@ bool OBBindings::add_key(const StringVect &keylist, int id)
   if (!(tree = buildtree(keylist, id)))
     return false; // invalid binding requested
 
-  if (find_key(tree) < -1) {
+  if (find_key(tree) != -1) {
     // conflicts with another binding
     destroytree(tree);
     return false;
@@ -272,6 +276,7 @@ bool OBBindings::add_key(const StringVect &keylist, int id)
 
   // assimilate this built tree into the main tree
   assimilate(tree); // assimilation destroys/uses the tree
+
   return true;
 }
 
@@ -319,13 +324,13 @@ void OBBindings::remove_all()
     remove_branch(_keytree.first_child);
     _keytree.first_child = 0;
   }
-  BindingTree *p = _mousetree.next_sibling;
+  BindingTree *p = _mousetree;
   while (p) {
     BindingTree *n = p->next_sibling;
     delete p;
     p = n;
   }
-  _mousetree.next_sibling = 0;
+  _mousetree = 0;
 }