X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fbindings.cc;h=6a135b6d6821a94c4e2b812741529371af171730;hb=c7b22b4f9cee63d860ad4f6617cd5210299b9d8b;hp=6d1d420ecf71c81c5ebc0d9af4b3e62153561cc0;hpb=d7a30f93b517ac76816d0acea92e9c56ad5d6594;p=chaz%2Fopenbox

diff --git a/src/bindings.cc b/src/bindings.cc
index 6d1d420e..6a135b6d 100644
--- a/src/bindings.cc
+++ b/src/bindings.cc
@@ -21,38 +21,6 @@ extern "C" {
 
 namespace ob {
 
-#include <stdio.h>
-static void print_branch(const BindingTree *first, std::string str)
-{
-  const 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") {
@@ -100,8 +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) const
+bool OBBindings::translate(const std::string &str, Binding &b,bool askey) const
 {
   // parse out the base key name
   std::string::size_type keybegin = str.find_last_of('-');
@@ -116,7 +83,7 @@ bool OBBindings::translate(const std::string &str, Binding &b,
 
     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;
     }
     
@@ -127,105 +94,77 @@ bool OBBindings::translate(const std::string &str, Binding &b,
   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);
+    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;
   } else {
     return buttonvalue(key, &b.key);
   }
 }
 
-static void destroytree(BindingTree *tree)
+static void destroytree(KeyBindingTree *tree)
 {
   while (tree) {
-    BindingTree *c = tree->first_child;
+    KeyBindingTree *c = tree->first_child;
     delete tree;
     tree = c;
   }
 }
 
-BindingTree *OBBindings::buildtree(const StringVect &keylist, int id) const
+KeyBindingTree *OBBindings::buildtree(const StringVect &keylist,
+                                   PyObject *callback) const
 {
   if (keylist.empty()) return 0; // nothing in the list.. return 0
 
-  BindingTree *ret = 0, *p;
+  KeyBindingTree *ret = 0, *p;
 
   StringVect::const_reverse_iterator it, end = keylist.rend();
   for (it = keylist.rbegin(); it != end; ++it) {
     p = ret;
-    ret = new BindingTree(id);
+    ret = new KeyBindingTree(callback);
     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(&_keytree),
+    _resetkey(0,0),
+    _timer(Openbox::instance->timerManager(),
+           (otk::OBTimeoutHandler)resetChains, this)
 {
-}
-
-
-OBBindings::~OBBindings()
-{
-  grabMouseOnAll(false); // ungrab everything
-  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;
-  }
-
-  grabMouseOnAll(false); // ungrab everything
+  _timer.setTimeout(5000); // chains reset after 5 seconds
   
-  *newp = new BindingTree(id);
-  (*newp)->text = button;
-  (*newp)->chain = false;
-  (*newp)->binding.key = n.binding.key;
-  (*newp)->binding.modifiers = n.binding.modifiers;
+//  setResetKey("C-g"); // set the default reset key
 
-  grabMouseOnAll(true);
-  
-  return true;
+  for (int i = 0; i < NUM_EVENTS; ++i)
+    _events[i] = 0;
 }
 
 
-int OBBindings::remove_mouse(const std::string &button)
+OBBindings::~OBBindings()
 {
-  (void)button;
-  assert(false); // XXX: function not implemented yet
-
-  grabMouseOnAll(false); // ungrab everything
-
-  // do shit...
-  
-  grabMouseOnAll(true);
+  grabKeys(false);
+  removeAllKeys();
+  removeAllButtons();
+  removeAllEvents();
 }
 
 
-void OBBindings::assimilate(BindingTree *node)
+void OBBindings::assimilate(KeyBindingTree *node)
 {
-  BindingTree *a, *b, *tmp, *last;
+  KeyBindingTree *a, *b, *tmp, *last;
 
   if (!_keytree.first_child) {
     // there are no nodes at this level yet
@@ -255,8 +194,9 @@ void OBBindings::assimilate(BindingTree *node)
 }
 
 
-int OBBindings::find_key(BindingTree *search) const {
-  BindingTree *a, *b;
+PyObject *OBBindings::find(KeyBindingTree *search, bool *conflict) const {
+  *conflict = false;
+  KeyBindingTree *a, *b;
   a = _keytree.first_child;
   b = search;
   while (a && b) {
@@ -265,27 +205,30 @@ int OBBindings::find_key(BindingTree *search) const {
     } else {
       if (a->chain == b->chain) {
 	if (!a->chain) {
-	  return a->id; // found it! (return the actual id, not the search's)
+          // found it! (return the actual id, not the search's)
+	  return a->callback;
         }
       } else {
-        return -2; // the chain status' don't match (conflict!)
+        *conflict = true;
+        return 0; // the chain status' don't match (conflict!)
       }
       b = b->first_child;
       a = a->first_child;
     }
   }
-  return -1; // it just isn't in here
+  return 0; // it just isn't in here
 }
 
 
-bool OBBindings::add_key(const StringVect &keylist, int id)
+bool OBBindings::addKey(const StringVect &keylist, PyObject *callback)
 {
-  BindingTree *tree;
+  KeyBindingTree *tree;
+  bool conflict;
 
-  if (!(tree = buildtree(keylist, id)))
+  if (!(tree = buildtree(keylist, callback)))
     return false; // invalid binding requested
 
-  if (find_key(tree) != -1) {
+  if (find(tree, &conflict) || conflict) {
     // conflicts with another binding
     destroytree(tree);
     return false;
@@ -296,119 +239,75 @@ bool OBBindings::add_key(const StringVect &keylist, int id)
   // assimilate this built tree into the main tree
   assimilate(tree); // assimilation destroys/uses the tree
 
+  Py_INCREF(callback);
+
   grabKeys(true); 
  
   return true;
 }
 
 
-int OBBindings::find_key(const StringVect &keylist)
+bool OBBindings::removeKey(const StringVect &keylist)
 {
-  BindingTree *tree;
-  bool ret;
+  assert(false); // XXX: function not implemented yet
+
+  KeyBindingTree *tree;
+  bool conflict;
 
   if (!(tree = buildtree(keylist, 0)))
     return false; // invalid binding requested
 
-  ret = find_key(tree) >= 0;
-
-  destroytree(tree);
+  PyObject *func = find(tree, &conflict);
+  if (func) {
+    grabKeys(false);
 
-  return ret;
+    _curpos = &_keytree;
+    
+    // XXX do shit here ...
+    Py_DECREF(func);
+    
+    grabKeys(true);
+    return true;
+  }
+  return false;
 }
 
 
-int OBBindings::remove_key(const StringVect &keylist)
+void OBBindings::setResetKey(const std::string &key)
 {
-  (void)keylist;
-  assert(false); // XXX: function not implemented yet
-
-  grabKeys(false);
-  _curpos = &_keytree;
-
-  // do shit here...
-  
-  grabKeys(true);
-
+  Binding b(0, 0);
+  if (translate(key, b)) {
+    grabKeys(false);
+    _resetkey.key = b.key;
+    _resetkey.modifiers = b.modifiers;
+    grabKeys(true);
+  }
 }
 
 
-static void remove_branch(BindingTree *first)
+static void remove_branch(KeyBindingTree *first)
 {
-  BindingTree *p = first;
+  KeyBindingTree *p = first;
 
   while (p) {
     if (p->first_child)
       remove_branch(p->first_child);
-    BindingTree *s = p->next_sibling;
+    KeyBindingTree *s = p->next_sibling;
+    Py_XDECREF(p->callback);
     delete p;
     p = s;
   }
 }
 
 
-void OBBindings::remove_all()
+void OBBindings::removeAllKeys()
 {
+  grabKeys(false);
   if (_keytree.first_child) {
     remove_branch(_keytree.first_child);
     _keytree.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)
-{
-  BindingTree *c = _curpos->first_child;
-
-  while (c) {
-    if (c->binding.key == key && c->binding.modifiers == modifiers) {
-      _curpos = c;
-      break;
-    }
-  }
-  if (c) {
-    if (!_curpos->chain) {
-      // XXX execute command for _curpos->id
-      _curpos = &_keytree; // back to the start
-    }
-  }
-}
-
-
-void OBBindings::grabMouse(bool grab, const OBClient *client)
-{
-  BindingTree *p = _mousetree;
-  while (p) {
-    if (grab)
-      otk::OBDisplay::grabButton(p->binding.key, p->binding.modifiers,
-                                 client->frame->window(), false,
-                                 ButtonMotionMask | ButtonPressMask |
-                                 ButtonReleaseMask, GrabModeAsync,
-                                 GrabModeAsync, None, None, false);
-    else
-      otk::OBDisplay::ungrabButton(p->binding.key, p->binding.modifiers,
-                                   client->frame->window());
-    p = p->next_sibling;
-  }
-}
-
-
-void OBBindings::grabMouseOnAll(bool grab)
-{
-  for (int i = 0; i < Openbox::instance->screenCount(); ++i) {
-    OBScreen *s = Openbox::instance->screen(i);
-    assert(s);
-    OBScreen::ClientList::iterator it, end = s->clients.end();
-    for (it = s->clients.begin(); it != end; ++it)
-      grabMouse(grab, *it);
-  }
+  grabKeys(true);
 }
 
 
@@ -417,53 +316,222 @@ void OBBindings::grabKeys(bool grab)
   for (int i = 0; i < Openbox::instance->screenCount(); ++i) {
     Window root = otk::OBDisplay::screenInfo(i)->rootWindow();
 
-    BindingTree *p = _curpos->first_child;
+    KeyBindingTree *p = _curpos->first_child;
     while (p) {
-      if (grab)
+      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 (_resetkey.key)
+      if (grab)
+        otk::OBDisplay::grabKey(_resetkey.key, _resetkey.modifiers,
+                                root, false, GrabModeAsync, GrabModeAsync,
+                                false);
+      else
+        otk::OBDisplay::ungrabKey(_resetkey.key, _resetkey.modifiers,
+                                  root);
   }
 }
 
 
-void OBBindings::fire(OBActions::ActionType type, Window window,
-                      unsigned int modifiers, unsigned int key, Time time)
+void OBBindings::fireKey(unsigned int modifiers, unsigned int key, Time time)
 {
-  if (type == OBActions::Action_KeyPress) {
-    BindingTree *p = _curpos->first_child;
+  if (key == _resetkey.key && modifiers == _resetkey.modifiers) {
+    resetChains(this);
+  } else {
+    KeyBindingTree *p = _curpos->first_child;
     while (p) {
       if (p->binding.key == key && p->binding.modifiers == modifiers) {
         if (p->chain) {
+          _timer.start(); // start/restart the timer
           grabKeys(false);
           _curpos = p;
           grabKeys(true);
         } else {
-          python_callback_binding(p->id, type, window, modifiers, key, time);
-          _curpos = &_keytree;
+          Window win = None;
+          OBClient *c = Openbox::instance->focusedClient();
+          if (c) win = c->window();
+          KeyData *data = new_key_data(win, time, modifiers, key);
+          python_callback(p->callback, (PyObject*)data);
+          Py_DECREF((PyObject*)data);
+          resetChains(this);
         }
         break;
       }
       p = p->next_sibling;
     }
-    
-    assert(false);
-  } else {
-    BindingTree *p = _mousetree;
-    while (p) {
-      if (p->binding.key == key && p->binding.modifiers == modifiers) {
-        python_callback_binding(p->id, type, window, modifiers, key, time);
-        break;
+  }
+}
+
+void OBBindings::resetChains(OBBindings *self)
+{
+  self->_timer.stop();
+  self->grabKeys(false);
+  self->_curpos = &self->_keytree;
+  self->grabKeys(true);
+}
+
+
+bool OBBindings::addButton(const std::string &but, MouseContext context,
+                           MouseAction action, PyObject *callback)
+{
+  assert(context >= 0 && context < NUM_MOUSE_CONTEXT);
+  
+  Binding b(0,0);
+  if (!translate(but, b, false))
+    return false;
+
+  ButtonBindingList::iterator it, end = _buttons[context].end();
+
+  // look for a duplicate binding
+  for (it = _buttons[context].begin(); it != end; ++it)
+    if ((*it)->binding.key == b.key &&
+        (*it)->binding.modifiers == b.modifiers) {
+      if ((*it)->callback[action] == callback)
+        return true; // already bound
+      break;
+    }
+
+  ButtonBinding *bind;
+  
+  // the binding didnt exist yet, add it
+  if (it == end) {
+    bind = new ButtonBinding();
+    bind->binding.key = b.key;
+    bind->binding.modifiers = b.modifiers;
+    _buttons[context].push_back(bind);
+    // grab the button on all clients
+    for (int sn = 0; sn < Openbox::instance->screenCount(); ++sn) {
+      OBScreen *s = Openbox::instance->screen(sn);
+      OBClient::List::iterator c_it, c_end = s->clients.end();
+      for (c_it = s->clients.begin(); c_it != c_end; ++c_it) {
+        grabButton(true, bind->binding, context, *c_it);
       }
-      p = p->next_sibling;
     }
+  } else
+    bind = *it;
+  Py_XDECREF(bind->callback[action]); // if it was already bound, unbind it
+  bind->callback[action] = callback;
+  Py_INCREF(callback);
+  return true;
+}
+
+void OBBindings::removeAllButtons()
+{
+  for (int i = i; i < NUM_MOUSE_CONTEXT; ++i) {
+    ButtonBindingList::iterator it, end = _buttons[i].end();
+    for (it = _buttons[i].begin(); it != end; ++it) {
+      for (int a = 0; a < NUM_MOUSE_ACTION; ++a) {
+        Py_XDECREF((*it)->callback[a]);
+        (*it)->callback[a] = 0;
+      }
+      // ungrab the button on all clients
+      for (int sn = 0; sn < Openbox::instance->screenCount(); ++sn) {
+        OBScreen *s = Openbox::instance->screen(sn);
+        OBClient::List::iterator c_it, c_end = s->clients.end();
+        for (c_it = s->clients.begin(); c_it != c_end; ++c_it) {
+          grabButton(false, (*it)->binding, (MouseContext)i, *c_it);
+        }
+      }
+    }
+  }
+}
+
+void OBBindings::grabButton(bool grab, const Binding &b, MouseContext context,
+                            OBClient *client)
+{
+  Window win;
+  int mode = GrabModeAsync;
+  switch(context) {
+  case MC_Frame:
+    win = client->frame->window();
+    break;
+  case MC_Window:
+    win = client->frame->plate();
+    mode = GrabModeSync; // this is handled in fireButton
+    break;
+  default:
+    // any other elements already get button events, don't grab on them
+    return;
+  }
+  if (grab)
+    otk::OBDisplay::grabButton(b.key, b.modifiers, win, false,
+                               ButtonPressMask | ButtonMotionMask |
+                               ButtonReleaseMask, mode, GrabModeAsync,
+                               None, None, false);
+  else
+    otk::OBDisplay::ungrabButton(b.key, b.modifiers, win);
+}
+
+void OBBindings::grabButtons(bool grab, OBClient *client)
+{
+  for (int i = 0; i < NUM_MOUSE_CONTEXT; ++i) {
+    ButtonBindingList::iterator it, end = _buttons[i].end();
+    for (it = _buttons[i].begin(); it != end; ++it)
+      grabButton(grab, (*it)->binding, (MouseContext)i, client);
+  }
+}
+
+void OBBindings::fireButton(ButtonData *data)
+{
+  if (data->context == MC_Window) {
+    // these are grabbed in Sync mode to allow the press to be normal to the
+    // client
+    XAllowEvents(otk::OBDisplay::display, ReplayPointer, data->time);
+  }
+  
+  ButtonBindingList::iterator it, end = _buttons[data->context].end();
+  for (it = _buttons[data->context].begin(); it != end; ++it)
+    if ((*it)->binding.key == data->button &&
+        (*it)->binding.modifiers == data->state) {
+      if ((*it)->callback[data->action])
+        python_callback((*it)->callback[data->action], (PyObject*)data);
+    }
+}
+
+
+bool OBBindings::addEvent(EventAction action, PyObject *callback)
+{
+  if (action < 0 || action >= NUM_EVENTS) {
+    return false;
+  }
+
+  Py_XDECREF(_events[action]);
+  _events[action] = callback;
+  Py_INCREF(callback);
+  return true;
+}
+
+bool OBBindings::removeEvent(EventAction action)
+{
+  if (action < 0 || action >= NUM_EVENTS) {
+    return false;
+  }
+  
+  Py_XDECREF(_events[action]);
+  _events[action] = 0;
+  return true;
+}
+
+void OBBindings::removeAllEvents()
+{
+  for (int i = 0; i < NUM_EVENTS; ++i) {
+    Py_XDECREF(_events[i]);
+    _events[i] = 0;
   }
 }
 
+void OBBindings::fireEvent(EventData *data)
+{
+  if (_events[data->action])
+    python_callback(_events[data->action], (PyObject*)data);
+}
 
 }