the bindings tree might work now

[chaz/openbox] / src / bindings.cc

diff --git a/src/bindings.cc b/src/bindings.cc
index 7bf7a5d2510c585ce1a71302e96999b614fd481f..f007624e07af4833cc5b0d55e056c291ef36e82e 100644 (file)
--- a/src/bindings.cc
+++ b/src/bindings.cc
@@ -40,14 +40,52 @@ void OBBindings::display()
 
 bool OBBindings::translate(const std::string &str, Binding &b)
 {
+  unsigned int mods = 0;
+  
+  // parse out the base key name
   std::string::size_type keybegin = str.find_last_of('-');
-  std::string key(str, keybegin != std::string::npos ? keybegin + 1 : 0);
+  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
+  std::string::size_type begin = 0, end;
+  while (begin != keybegin) {
+    end = str.find_first_of('-', begin);
+
+    std::string mod(str, begin, end-begin);
+
+    if (mod == "C") {           // control
+      mods |= ControlMask;
+    } else if (mod == "S") {    // shift
+      mods |= ShiftMask;
+    } else if (mod == "A" ||    // alt/mod1
+               mod == "M" ||
+               mod == "M1" ||
+               mod == "Mod1") {
+      mods |= Mod1Mask;
+    } else if (mod == "M2" ||   // mod2
+               mod == "Mod2") {
+      mods |= Mod2Mask;
+    } else if (mod == "M3" ||   // mod3
+               mod == "Mod3") {
+      mods |= Mod3Mask;
+    } else if (mod == "W" ||    // windows/mod4
+               mod == "M4" ||
+               mod == "Mod4") {
+      mods |= Mod4Mask;
+    } else if (mod == "M5" ||   // mod5
+               mod == "Mod5") {
+      mods |= Mod5Mask;
+    }
+    printf("got modifier: got modifier: %s\n", mod.c_str());
+    
+    begin = end + 1;
+  }
   
   KeySym sym = XStringToKeysym(const_cast<char *>(key.c_str()));
   if (sym == NoSymbol) return false;
-  b.modifiers = Mod1Mask; // XXX: no way
+  b.modifiers = mods;
   b.key = XKeysymToKeycode(otk::OBDisplay::display, sym);
   return b.key != 0;
 }
@@ -111,45 +149,38 @@ OBBindings::~OBBindings()
 }
 
 
-static void assimilate(BindingTree *parent, BindingTree *node)
+void OBBindings::assimilate(BindingTree *node)
 {
-  BindingTree *p, *lastsib, *nextparent, *nextnode = node->first_child;
+  BindingTree *a, *b, *tmp, *last;
 
   if (!parent->first_child) {
     // there are no nodes at this level yet
     parent->first_child = node;
-    nextparent = node;
+    return;
   } else {
-    p = lastsib = parent->first_child;
-
-    while (p->next_sibling) {
-      p = p->next_sibling;
-      lastsib = p; // finds the last sibling
-      if (p->binding == node->binding) {
-       // found an identical binding..
-       assert(node->chain && p->chain);
-       delete node; // kill the one we aren't using
-        printf("using existing node\n");
-       break;
+    a = parent->first_child;
+    last = a;
+    b = node;
+    while (a->first_child) {
+      last = a;
+      if (a->binding != b->binding) {
+        a = a->next_sibling;
+      } else {
+        tmp = b;
+        b = b->first_child;
+        delete tmp;
+        a = a->first_child;
       }
     }
-    if (!p) {
-      // couldn't find an existing binding, use this new one, and insert it
-      // into the list
-      p = lastsib->next_sibling = node;
-      printf("inserting %s\n", p->text.c_str());
-    }
-    nextparent = p;
+    last->first_child = b->first_child;
+    delete b;
   }
-
-  if (nextnode)
-    assimilate(nextparent, nextnode);
 }
 
 
 int OBBindings::find(BindingTree *search) {
   BindingTree *a, *b;
-  a = _tree;
+  a = _tree.first_child;
   b = search;
   while (a && b) {
     if (a->binding != b->binding) {
@@ -206,14 +237,14 @@ bool OBBindings::add(const StringVect &keylist, int id)
   if (!(tree = buildtree(keylist, id)))
     return false; // invalid binding requested
 
-  if (find_bind(_tree.first_child, tree) < -1) {
+  if (find(tree) < -1) {
     // conflicts with another binding
     destroytree(tree);
     return false;
   }
 
   // assimilate this built tree into the main tree
-  assimilate(&_tree, tree); // assimilation destroys/uses the tree
+  assimilate(tree); // assimilation destroys/uses the tree
   return true;
 }
 
@@ -226,7 +257,7 @@ int OBBindings::find(const StringVect &keylist)
   if (!(tree = buildtree(keylist, 0)))
     return false; // invalid binding requested
 
-  ret = find_bind(_tree.first_child, tree) >= 0;
+  ret = find(tree) >= 0;
 
   destroytree(tree);