X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fbindings.cc;h=9abc33fe24ac0656b686d0f6960d6fdbd43378ea;hb=376ce0032ed64a7030e66edcb9bc39e77d63d347;hp=d6bf85d0bbf49a6f3bea5214abc2fb802fa148b8;hpb=e05d5f7934ce27893f900627fbd06b1679d4c0ad;p=chaz%2Fopenbox

diff --git a/src/bindings.cc b/src/bindings.cc
index d6bf85d0..9abc33fe 100644
--- a/src/bindings.cc
+++ b/src/bindings.cc
@@ -106,26 +106,26 @@ bool OBBindings::translate(const std::string &str, Binding &b,bool askey) const
   }
 }
 
-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,
+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(callback);
+    ret = new KeyBindingTree(callback);
     if (!p) ret->chain = false; // only the first built node
     ret->first_child = p;
     if (!translate(*it, ret->binding)) {
@@ -139,7 +139,7 @@ BindingTree *OBBindings::buildtree(const StringVect &keylist,
 
 
 OBBindings::OBBindings()
-  : _curpos(&_tree),
+  : _curpos(&_keytree),
     _resetkey(0,0),
     _timer(Openbox::instance->timerManager(),
            (otk::OBTimeoutHandler)reset, this)
@@ -153,19 +153,20 @@ OBBindings::OBBindings()
 OBBindings::~OBBindings()
 {
   grabKeys(false);
-  removeAll();
+  removeAllKeys();
+  removeAllButtons();
 }
 
 
-void OBBindings::assimilate(BindingTree *node)
+void OBBindings::assimilate(KeyBindingTree *node)
 {
-  BindingTree *a, *b, *tmp, *last;
+  KeyBindingTree *a, *b, *tmp, *last;
 
-  if (!_tree.first_child) {
+  if (!_keytree.first_child) {
     // there are no nodes at this level yet
-    _tree.first_child = node;
+    _keytree.first_child = node;
   } else {
-    a = _tree.first_child;
+    a = _keytree.first_child;
     last = a;
     b = node;
     while (a) {
@@ -189,10 +190,10 @@ void OBBindings::assimilate(BindingTree *node)
 }
 
 
-PyObject *OBBindings::find(BindingTree *search, bool *conflict) const {
+PyObject *OBBindings::find(KeyBindingTree *search, bool *conflict) const {
   *conflict = false;
-  BindingTree *a, *b;
-  a = _tree.first_child;
+  KeyBindingTree *a, *b;
+  a = _keytree.first_child;
   b = search;
   while (a && b) {
     if (a->binding != b->binding) {
@@ -215,9 +216,9 @@ PyObject *OBBindings::find(BindingTree *search, bool *conflict) const {
 }
 
 
-bool OBBindings::add(const StringVect &keylist, PyObject *callback)
+bool OBBindings::addKey(const StringVect &keylist, PyObject *callback)
 {
-  BindingTree *tree;
+  KeyBindingTree *tree;
   bool conflict;
 
   if (!(tree = buildtree(keylist, callback)))
@@ -242,11 +243,11 @@ bool OBBindings::add(const StringVect &keylist, PyObject *callback)
 }
 
 
-bool OBBindings::remove(const StringVect &keylist)
+bool OBBindings::removeKey(const StringVect &keylist)
 {
   assert(false); // XXX: function not implemented yet
 
-  BindingTree *tree;
+  KeyBindingTree *tree;
   bool conflict;
 
   if (!(tree = buildtree(keylist, 0)))
@@ -256,7 +257,7 @@ bool OBBindings::remove(const StringVect &keylist)
   if (func) {
     grabKeys(false);
 
-    _curpos = &_tree;
+    _curpos = &_keytree;
     
     // XXX do shit here ...
     Py_DECREF(func);
@@ -280,14 +281,14 @@ void OBBindings::setResetKey(const std::string &key)
 }
 
 
-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;
@@ -295,12 +296,14 @@ static void remove_branch(BindingTree *first)
 }
 
 
-void OBBindings::removeAll()
+void OBBindings::removeAllKeys()
 {
-  if (_tree.first_child) {
-    remove_branch(_tree.first_child);
-    _tree.first_child = 0;
+  grabKeys(false);
+  if (_keytree.first_child) {
+    remove_branch(_keytree.first_child);
+    _keytree.first_child = 0;
   }
+  grabKeys(true);
 }
 
 
@@ -309,7 +312,7 @@ 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) {
         otk::OBDisplay::grabKey(p->binding.key, p->binding.modifiers,
@@ -333,12 +336,12 @@ void OBBindings::grabKeys(bool grab)
 }
 
 
-void OBBindings::fire(unsigned int modifiers, unsigned int key, Time time)
+void OBBindings::fireKey(unsigned int modifiers, unsigned int key, Time time)
 {
   if (key == _resetkey.key && modifiers == _resetkey.modifiers) {
     reset(this);
   } else {
-    BindingTree *p = _curpos->first_child;
+    KeyBindingTree *p = _curpos->first_child;
     while (p) {
       if (p->binding.key == key && p->binding.modifiers == modifiers) {
         if (p->chain) {
@@ -350,7 +353,9 @@ void OBBindings::fire(unsigned int modifiers, unsigned int key, Time time)
           Window win = None;
           OBClient *c = Openbox::instance->focusedClient();
           if (c) win = c->window();
-          python_callback(p->callback, win, modifiers, key, time);
+          KeyData *data = new_key_data(win, time, modifiers, key);
+          python_callback(p->callback, (PyObject*)data);
+          Py_DECREF((PyObject*)data);
           reset(this);
         }
         break;
@@ -364,8 +369,109 @@ void OBBindings::reset(OBBindings *self)
 {
   self->_timer.stop();
   self->grabKeys(false);
-  self->_curpos = &self->_tree;
+  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);
+    // XXX GRAB the new button everywhere!
+  } 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()
+{
+  // XXX: UNGRAB shits
+  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;
+      }
+  }
+}
+
+void OBBindings::grabButtons(bool grab, OBClient *client)
+{
+  for (int i = 0; i < NUM_MOUSE_CONTEXT; ++i) {
+    Window win;
+    int mode = GrabModeAsync;
+    switch (i) {
+    case MC_Frame:
+      win = client->frame->window();
+      break;
+    case MC_Window:
+      win = client->frame->plate();
+      mode = GrabModeSync; // this is handled in the plate's buttonPressHandler
+      break;
+    default:
+      // any other elements already get button events, don't grab on them
+      continue;
+    }
+    ButtonBindingList::iterator it, end = _buttons[i].end();
+    for (it = _buttons[i].begin(); it != end; ++it)
+      if (grab)
+        otk::OBDisplay::grabButton((*it)->binding.key,
+                                   (*it)->binding.modifiers, win, false,
+                                   ButtonPressMask | ButtonMotionMask |
+                                   ButtonReleaseMask, mode, GrabModeAsync,
+                                   None, None, false);
+      else
+        otk::OBDisplay::ungrabButton((*it)->binding.key,
+                                     (*it)->binding.modifiers, win);
+  }
+}
+
+void OBBindings::fireButton(ButtonData *data)
+{
+  printf("but.mods %d.%d\n", data->button, data->state);
+  
+  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);
+    }
+}
+
 }