X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fbindings.cc;h=999b4ad801f47a48db5f9042de05662929fdb66d;hb=4e047f8b1ca2f46a354aca7615cf89d79e0182e2;hp=7bf7a5d2510c585ce1a71302e96999b614fd481f;hpb=656f2fbecf7f74e497353a4bff902ec16937cfc4;p=chaz%2Fopenbox

diff --git a/src/bindings.cc b/src/bindings.cc
index 7bf7a5d2..999b4ad8 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;
   }
 }
 
@@ -37,68 +38,97 @@ void OBBindings::display()
 }
 
 
+static bool modvalue(const std::string &mod, unsigned int *val)
+{
+  if (mod == "C") {           // control
+    *val |= ControlMask;
+  } else if (mod == "S") {    // shift
+    *val |= ShiftMask;
+  } else if (mod == "A" ||    // alt/mod1
+             mod == "M" ||
+             mod == "M1" ||
+             mod == "Mod1") {
+    *val |= Mod1Mask;
+  } else if (mod == "M2" ||   // mod2
+             mod == "Mod2") {
+    *val |= Mod2Mask;
+  } else if (mod == "M3" ||   // mod3
+             mod == "Mod3") {
+    *val |= Mod3Mask;
+  } else if (mod == "W" ||    // windows/mod4
+             mod == "M4" ||
+             mod == "Mod4") {
+    *val |= Mod4Mask;
+  } else if (mod == "M5" ||   // mod5
+             mod == "Mod5") {
+    *val |= Mod5Mask;
+  } else {                    // invalid
+    return false;
+  }
+  return true;
+}
 
 bool OBBindings::translate(const std::string &str, Binding &b)
 {
+  // 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);
+
+  // parse out the requested modifier keys
+  unsigned int modval = 0;
+  std::string::size_type begin = 0, end;
+  while (begin != keybegin) {
+    end = str.find_first_of('-', begin);
+
+    std::string mod(str, begin, end-begin);
+    if (!modvalue(mod, &modval)) {
+      printf(_("Invalid modifier element in key binding: %s\n"), mod.c_str());
+      return false;
+    }
+    
+    begin = end + 1;
+  }
 
-  // XXX: get some modifiers up in the hizzie
-  
+  // set the binding
   KeySym sym = XStringToKeysym(const_cast<char *>(key.c_str()));
   if (sym == NoSymbol) return false;
-  b.modifiers = Mod1Mask; // XXX: no way
+  b.modifiers = modval;
   b.key = XKeysymToKeycode(otk::OBDisplay::display, sym);
   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()
 {
@@ -111,45 +141,41 @@ 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) {
+  if (!_tree.first_child) {
     // there are no nodes at this level yet
-    parent->first_child = node;
-    nextparent = node;
+    _tree.first_child = 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 = _tree.first_child;
+    last = a;
+    b = node;
+    while (a) {
+      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;
+    if (last->binding != b->binding)
+      last->next_sibling = b;
+    else
+      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 +232,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 +252,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);