way sexier buildtree

[chaz/openbox] / src / bindings.cc

diff --git a/src/bindings.cc b/src/bindings.cc
index e92b40e5cf2cbb460633ad371abe197530b93b1e..ba21410cbdf49f1a7ebcf38ce370d81c90f99efe 100644 (file)
--- a/src/bindings.cc
+++ b/src/bindings.cc
@@ -9,6 +9,9 @@
 
 extern "C" {
 #include <X11/Xlib.h>
+
+#include "gettext.h"
+#define _(str) gettext(str)
 }
 
 namespace ob {
@@ -23,9 +26,7 @@ static void print_branch(BindingTree *first, std::string str)
       print_branch(p->first_child, str + " " + p->text);
     if (!p->chain)
       printf("%d%s\n", p->id, (str + " " + p->text).c_str());
-    BindingTree *s = p->next_sibling;
-    delete p;
-    p = s;
+    p = p->next_sibling;
   }
 }
 
@@ -40,22 +41,18 @@ void OBBindings::display()
 
 bool OBBindings::translate(const std::string &str, Binding &b)
 {
-  unsigned int mods = 0;
-  std::string modstring;
-  
   // parse out the base key name
   std::string::size_type keybegin = str.find_last_of('-');
   keybegin = (keybegin == std::string::npos) ? 0 : keybegin + 1;
   std::string key(str, keybegin);
 
-  // XXX: get some modifiers up in the hizzie
   // parse out the requested modifier keys
+  unsigned int mods = 0;
   std::string::size_type begin = 0, end;
   while (begin != keybegin) {
     end = str.find_first_of('-', begin);
 
     std::string mod(str, begin, end-begin);
-    modstring += mod;
 
     if (mod == "C") {           // control
       mods |= ControlMask;
@@ -79,12 +76,13 @@ bool OBBindings::translate(const std::string &str, Binding &b)
     } else if (mod == "M5" ||   // mod5
                mod == "Mod5") {
       mods |= Mod5Mask;
+    } else {                    // invalid
+      printf(_("Invalid modifier element in key binding: %s\n"), mod.c_str());
+      return false;
     }
     begin = end + 1;
   }
   
-  printf("got modifier: %s\n", modstring.c_str());
-    
   KeySym sym = XStringToKeysym(const_cast<char *>(key.c_str()));
   if (sym == NoSymbol) return false;
   b.modifiers = mods;
@@ -92,53 +90,37 @@ bool OBBindings::translate(const std::string &str, Binding &b)
   return b.key != 0;
 }
 
+static void destroytree(BindingTree *tree)
+{
+  while (tree) {
+    BindingTree *c = tree->first_child;
+    delete tree;
+    tree = c;
+  }
+}
+
 BindingTree *OBBindings::buildtree(const StringVect &keylist, int id)
 {
   if (keylist.empty()) return 0; // nothing in the list.. return 0
 
-  BindingTree *ret = new BindingTree(id), *p = 0;
+  BindingTree *ret = 0, *p;
 
-  StringVect::const_iterator it, end = keylist.end();
-  for (it = keylist.begin(); it != end; ++it) {
-    if (p)
-      p = p->first_child = new BindingTree(id);
-    else
-      p = ret; // the first node
-    
-    if (!translate(*it, p->binding))
-      break;
-    p->text = *it;
-  }
-  if (it != end) {
-    // build failed.. clean up and return 0
+  StringVect::const_reverse_iterator it, end = keylist.rend();
+  for (it = keylist.rbegin(); it != end; ++it) {
     p = ret;
-    while (p->first_child) {
-      BindingTree *c = p->first_child;
-      delete p;
-      p = c;      
+    ret = new BindingTree(id);
+    if (!p) ret->chain = false;
+    ret->first_child = p;
+    if (!translate(*it, ret->binding)) {
+      destroytree(ret);
+      ret = 0;
+      break;
     }
-    delete p;
-    return 0;
-  } else {
-    // set the proper chain status on the last node
-    p->chain = false;
+    ret->text = *it; // XXX: rm me
   }
-
-  printf("BUILDING:\n");
-  print_branch(ret, "");
-  
-  // successfully built a tree
   return ret;
 }
 
-static void destroytree(BindingTree *tree)
-{
-  while (tree) {
-    BindingTree *c = tree->first_child;
-    delete tree;
-    tree = c;
-  }
-}
 
 OBBindings::OBBindings()
 {
@@ -163,7 +145,7 @@ void OBBindings::assimilate(BindingTree *node)
     a = _tree.first_child;
     last = a;
     b = node;
-    while (a->first_child) {
+    while (a) {
       last = a;
       if (a->binding != b->binding) {
         a = a->next_sibling;
@@ -174,7 +156,10 @@ void OBBindings::assimilate(BindingTree *node)
         a = a->first_child;
       }
     }
-    last->first_child = b->first_child;
+    if (last->binding != b->binding)
+      last->next_sibling = b;
+    else
+      last->first_child = b->first_child;
     delete b;
   }
 }