X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fbindings.cc;h=f34b9af3d682e0d521bbe8c1cc2e7b191080119c;hb=a826509b51c03c55363f15356e73046158fe48aa;hp=fff4b47b224a698dbd403a9f6d3528e0f7aa819e;hpb=6d59c9cce7ca7c25942c2af72fab7bd2e7c6331d;p=chaz%2Fopenbox

diff --git a/src/bindings.cc b/src/bindings.cc
index fff4b47b..f34b9af3 100644
--- 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;
@@ -80,13 +77,12 @@ bool OBBindings::translate(const std::string &str, Binding &b)
                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;
@@ -126,9 +122,6 @@ BindingTree *OBBindings::buildtree(const StringVect &keylist, int id)
     p->chain = false;
   }
 
-  printf("BUILDING:\n");
-  print_branch(ret, "");
-  
   // successfully built a tree
   return ret;
 }
@@ -165,7 +158,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;
@@ -176,7 +169,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;
   }
 }