X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fbindings.cc;h=ef14d585638f918e3e251b0301abb6448f3317fb;hb=1161a90a70b21d3064a9dee62c72dd4be3025ada;hp=95442a1eabc35fc4be013527075ba839b35ae8d8;hpb=5f8e2b75fadc1878aebf063e5fc5bf25fbf70385;p=chaz%2Fopenbox

diff --git a/src/bindings.cc b/src/bindings.cc
index 95442a1e..ef14d585 100644
--- a/src/bindings.cc
+++ b/src/bindings.cc
@@ -5,6 +5,11 @@
 #endif
 
 #include "bindings.hh"
+#include "screen.hh"
+#include "openbox.hh"
+#include "client.hh"
+#include "frame.hh"
+#include "python.hh"
 #include "otk/display.hh"
 
 extern "C" {
@@ -16,38 +21,6 @@ extern "C" {
 
 namespace ob {
 
-#include <stdio.h>
-static void print_branch(BindingTree *first, std::string str)
-{
-  BindingTree *p = first;
-  
-  while (p) {
-    if (p->first_child)
-      print_branch(p->first_child, str + " " + p->text);
-    if (!p->chain)
-      printf("%d%s\n", p->id, (str + " " + p->text).c_str());
-    p = p->next_sibling;
-  }
-}
-
-
-void OBBindings::display()
-{
-  if (_keytree.first_child) {
-    printf("Key Tree:\n");
-    print_branch(_keytree.first_child, "");
-  }
-  if (_mousetree) {
-    printf("Mouse Tree:\n");
-    BindingTree *p = _mousetree;
-    while (p) {
-      printf("%d %s\n", p->id, p->text.c_str());
-      p = p->next_sibling;
-    }
-  }
-}
-
-
 static bool buttonvalue(const std::string &button, unsigned int *val)
 {
   if (button == "1" || button == "Button1") {
@@ -95,7 +68,7 @@ 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) const
 {
   // parse out the base key name
   std::string::size_type keybegin = str.find_last_of('-');
@@ -110,7 +83,7 @@ bool OBBindings::translate(const std::string &str, Binding &b, bool askey)
 
     std::string mod(str, begin, end-begin);
     if (!modvalue(mod, &modval)) {
-//      printf(_("Invalid modifier element in key binding: %s\n"), mod.c_str());
+      printf(_("Invalid modifier element in key binding: %s\n"), mod.c_str());
       return false;
     }
     
@@ -119,14 +92,14 @@ bool OBBindings::translate(const std::string &str, Binding &b, bool askey)
 
   // set the binding
   b.modifiers = modval;
-  if (askey) {
-    KeySym sym = XStringToKeysym(const_cast<char *>(key.c_str()));
-    if (sym == NoSymbol) return false;
-    b.key = XKeysymToKeycode(otk::OBDisplay::display, sym);
-    return b.key != 0;
-  } else {
-    return buttonvalue(key, &b.key);
+  KeySym sym = XStringToKeysym(const_cast<char *>(key.c_str()));
+  if (sym == NoSymbol) {
+    printf(_("Invalid Key name in key binding: %s\n"), key.c_str());
+    return false;
   }
+  if (!(b.key = XKeysymToKeycode(otk::OBDisplay::display, sym)))
+    printf(_("No valid keycode for Key in key binding: %s\n"), key.c_str());
+  return b.key != 0;
 }
 
 static void destroytree(BindingTree *tree)
@@ -138,7 +111,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,78 +121,44 @@ 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)) {
+    if (!translate(*it, ret->binding)) {
       destroytree(ret);
       ret = 0;
       break;
     }
-    ret->text = *it; // XXX: rm me
   }
   return ret;
 }
 
 
 OBBindings::OBBindings()
-  : _curpos(&_keytree), _mousetree(0)
+  : _curpos(&_tree), _resetkey(0,0)
 {
+  setResetKey("C-g"); // set the default reset key
 }
 
 
 OBBindings::~OBBindings()
 {
+  grabKeys(false);
   remove_all();
 }
 
 
-bool OBBindings::add_mouse(const std::string &button, int id)
-{
-  BindingTree n;
-
-  if (!translate(button, n.binding, false))
-    return false;
-
-  BindingTree *p = _mousetree, **newp = &_mousetree;
-  while (p) {
-    if (p->binding == n.binding)
-      return false; // conflict
-    p = p->next_sibling;
-    newp = &p->next_sibling;
-  }
-  display();
-  *newp = new BindingTree(id);
-  display();
-  (*newp)->text = button;
-  (*newp)->chain = false;
-  (*newp)->binding.key = n.binding.key;
-  (*newp)->binding.modifiers = n.binding.modifiers;
- 
-  return true;
-}
-
-
-int OBBindings::remove_mouse(const std::string &button)
-{
-  (void)button;
-  assert(false); // XXX: function not implemented yet
-}
-
-
 void OBBindings::assimilate(BindingTree *node)
 {
   BindingTree *a, *b, *tmp, *last;
 
-  printf("node=%lx\n", (long)node);
-  if (!_keytree.first_child) {
+  if (!_tree.first_child) {
     // there are no nodes at this level yet
-    _keytree.first_child = node;
+    _tree.first_child = node;
   } else {
-    a = _keytree.first_child;
+    a = _tree.first_child;
     last = a;
     b = node;
     while (a) {
-  printf("in while.. b=%lx\n", (long)b);
       last = a;
       if (a->binding != b->binding) {
         a = a->next_sibling;
@@ -230,29 +169,31 @@ void OBBindings::assimilate(BindingTree *node)
         a = a->first_child;
       }
     }
-  printf("after while.. b=%lx\n", (long)b);
     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(BindingTree *search) const {
   BindingTree *a, *b;
-  a = _keytree.first_child;
+  a = _tree.first_child;
   b = search;
   while (a && b) {
     if (a->binding != b->binding) {
       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;
     }
@@ -260,33 +201,32 @@ int OBBindings::find_key(BindingTree *search) {
   return -1; // it just isn't in here
 }
 
-bool OBBindings::add_key(const StringVect &keylist, int id)
+
+bool OBBindings::add(const StringVect &keylist, int id)
 {
   BindingTree *tree;
 
   if (!(tree = buildtree(keylist, id)))
     return false; // invalid binding requested
 
-  print_branch(tree, " Adding: ");
-  
-  if (find_key(tree) != -1) {
+  if (find(tree) != -1) {
     // conflicts with another binding
     destroytree(tree);
     return false;
   }
 
+  grabKeys(false);
+  
   // assimilate this built tree into the main tree
   assimilate(tree); // assimilation destroys/uses the tree
 
-  printf("Added!\n");
-  print_branch(&_keytree, "");
-  printf("\n");
-  
+  grabKeys(true); 
+ 
   return true;
 }
 
 
-int OBBindings::find_key(const StringVect &keylist)
+int OBBindings::find(const StringVect &keylist)
 {
   BindingTree *tree;
   bool ret;
@@ -294,7 +234,7 @@ int OBBindings::find_key(const StringVect &keylist)
   if (!(tree = buildtree(keylist, 0)))
     return false; // invalid binding requested
 
-  ret = find_key(tree) >= 0;
+  ret = find(tree) >= 0;
 
   destroytree(tree);
 
@@ -302,10 +242,30 @@ int OBBindings::find_key(const StringVect &keylist)
 }
 
 
-int OBBindings::remove_key(const StringVect &keylist)
+int OBBindings::remove(const StringVect &keylist)
 {
   (void)keylist;
   assert(false); // XXX: function not implemented yet
+
+  grabKeys(false);
+  _curpos = &_tree;
+
+  // do shit here...
+  
+  grabKeys(true);
+
+}
+
+
+void OBBindings::setResetKey(const std::string &key)
+{
+  Binding b(0, 0);
+  if (translate(key, b)) {
+    grabKeys(false);
+    _resetkey.key = b.key;
+    _resetkey.modifiers = b.modifiers;
+    grabKeys(true);
+  }
 }
 
 
@@ -325,34 +285,65 @@ static void remove_branch(BindingTree *first)
 
 void OBBindings::remove_all()
 {
-  if (_keytree.first_child) {
-    remove_branch(_keytree.first_child);
-    _keytree.first_child = 0;
+  if (_tree.first_child) {
+    remove_branch(_tree.first_child);
+    _tree.first_child = 0;
   }
-  BindingTree *p = _mousetree;
-  while (p) {
-    BindingTree *n = p->next_sibling;
-    delete p;
-    p = n;
-  }
-  _mousetree = 0;
 }
 
 
-void OBBindings::process(unsigned int modifiers, unsigned int key)
+void OBBindings::grabKeys(bool grab)
 {
-  BindingTree *c = _curpos->first_child;
+  for (int i = 0; i < Openbox::instance->screenCount(); ++i) {
+    Window root = otk::OBDisplay::screenInfo(i)->rootWindow();
 
-  while (c) {
-    if (c->binding.key == key && c->binding.modifiers == modifiers) {
-      _curpos = c;
-      break;
+    BindingTree *p = _curpos->first_child;
+    while (p) {
+      if (grab)
+        otk::OBDisplay::grabKey(p->binding.key, p->binding.modifiers,
+                                root, false, GrabModeAsync, GrabModeAsync,
+                                false);
+      else
+        otk::OBDisplay::ungrabKey(p->binding.key, p->binding.modifiers,
+                                  root);
+      p = p->next_sibling;
     }
+
+    if (grab)
+      otk::OBDisplay::grabKey(_resetkey.key, _resetkey.modifiers,
+                              root, true, GrabModeAsync, GrabModeAsync,
+                              false);
+    else
+      otk::OBDisplay::ungrabKey(_resetkey.key, _resetkey.modifiers,
+                                root);
   }
-  if (c) {
-    if (!_curpos->chain) {
-      // XXX execute command for _curpos->id
-      _curpos = &_keytree; // back to the start
+}
+
+
+void OBBindings::fire(Window window, unsigned int modifiers, unsigned int key,
+                      Time time)
+{
+  if (key == _resetkey.key && modifiers == _resetkey.modifiers) {
+    grabKeys(false);
+    _curpos = &_tree;
+    grabKeys(true);
+  } else {
+    BindingTree *p = _curpos->first_child;
+    while (p) {
+      if (p->binding.key == key && p->binding.modifiers == modifiers) {
+        if (p->chain) {
+          grabKeys(false);
+          _curpos = p;
+          grabKeys(true);
+        } else {
+          python_callback_binding(p->id, window, modifiers, key, time);
+          grabKeys(false);
+          _curpos = &_tree;
+          grabKeys(true);
+        }
+        break;
+      }
+      p = p->next_sibling;
     }
   }
 }