X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fbindings.cc;h=a8dfaed0bc8c5efa4512c08406108b5e3977e6f9;hb=2a6c730f02fcd127cc831297eacca6f5a80fb44c;hp=3e9358d5bd33edcc4829f2f6f6c161066e7fd90d;hpb=7db3ffecc980821ada3e805e2471716896e2410a;p=chaz%2Fopenbox

diff --git a/src/bindings.cc b/src/bindings.cc
index 3e9358d5..a8dfaed0 100644
--- a/src/bindings.cc
+++ b/src/bindings.cc
@@ -23,15 +23,15 @@ namespace ob {
 
 static bool buttonvalue(const std::string &button, unsigned int *val)
 {
-  if (button == "1" || button == "Button1") {
+  if (button == "Left" || button == "1" || button == "Button1") {
     *val |= Button1;
-  } else if (button == "2" || button == "Button2") {
+  } else if (button == "Middle" || button == "2" || button == "Button2") {
     *val |= Button2;
-  } else if (button == "3" || button == "Button3") {
+  } else if (button == "Right" || button == "3" || button == "Button3") {
     *val |= Button3;
-  } else if (button == "4" || button == "Button4") {
+  } else if (button == "Up" || button == "4" || button == "Button4") {
     *val |= Button4;
-  } else if (button == "5" || button == "Button5") {
+  } else if (button == "Down" || button == "5" || button == "Button5") {
     *val |= Button5;
   } else
     return false;
@@ -68,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) const
+bool Bindings::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('-');
@@ -98,7 +98,7 @@ bool OBBindings::translate(const std::string &str, Binding &b,bool askey) const
       printf(_("Invalid Key name in key binding: %s\n"), key.c_str());
       return false;
     }
-    if (!(b.key = XKeysymToKeycode(otk::OBDisplay::display, sym)))
+    if (!(b.key = XKeysymToKeycode(otk::Display::display, sym)))
       printf(_("No valid keycode for Key in key binding: %s\n"), key.c_str());
     return b.key != 0;
   } else {
@@ -115,8 +115,8 @@ static void destroytree(KeyBindingTree *tree)
   }
 }
 
-KeyBindingTree *OBBindings::buildtree(const StringVect &keylist,
-                                   PyObject *callback) const
+KeyBindingTree *Bindings::buildtree(const StringVect &keylist,
+                                      PyObject *callback) const
 {
   if (keylist.empty()) return 0; // nothing in the list.. return 0
 
@@ -125,8 +125,12 @@ KeyBindingTree *OBBindings::buildtree(const StringVect &keylist,
   StringVect::const_reverse_iterator it, end = keylist.rend();
   for (it = keylist.rbegin(); it != end; ++it) {
     p = ret;
-    ret = new KeyBindingTree(callback);
-    if (!p) ret->chain = false; // only the first built node
+    ret = new KeyBindingTree();
+    if (!p) {
+      // this is the first built node, the bottom node of the tree
+      ret->chain = false;
+      ret->callbacks.push_back(callback);
+    }
     ret->first_child = p;
     if (!translate(*it, ret->binding)) {
       destroytree(ret);
@@ -138,26 +142,28 @@ KeyBindingTree *OBBindings::buildtree(const StringVect &keylist,
 }
 
 
-OBBindings::OBBindings()
+Bindings::Bindings()
   : _curpos(&_keytree),
     _resetkey(0,0),
     _timer(Openbox::instance->timerManager(),
-           (otk::OBTimeoutHandler)reset, this)
+           (otk::TimeoutHandler)resetChains, this)
 {
   _timer.setTimeout(5000); // chains reset after 5 seconds
   
-  setResetKey("C-g"); // set the default reset key
+//  setResetKey("C-g"); // set the default reset key
 }
 
 
-OBBindings::~OBBindings()
+Bindings::~Bindings()
 {
   grabKeys(false);
-  removeAll();
+  removeAllKeys();
+//  removeAllButtons(); XXX
+  removeAllEvents();
 }
 
 
-void OBBindings::assimilate(KeyBindingTree *node)
+void Bindings::assimilate(KeyBindingTree *node)
 {
   KeyBindingTree *a, *b, *tmp, *last;
 
@@ -189,7 +195,8 @@ void OBBindings::assimilate(KeyBindingTree *node)
 }
 
 
-PyObject *OBBindings::find(KeyBindingTree *search, bool *conflict) const {
+KeyBindingTree *Bindings::find(KeyBindingTree *search,
+                                 bool *conflict) const {
   *conflict = false;
   KeyBindingTree *a, *b;
   a = _keytree.first_child;
@@ -201,7 +208,7 @@ PyObject *OBBindings::find(KeyBindingTree *search, bool *conflict) const {
       if (a->chain == b->chain) {
 	if (!a->chain) {
           // found it! (return the actual id, not the search's)
-	  return a->callback;
+	  return a;
         }
       } else {
         *conflict = true;
@@ -215,34 +222,45 @@ PyObject *OBBindings::find(KeyBindingTree *search, bool *conflict) const {
 }
 
 
-bool OBBindings::add(const StringVect &keylist, PyObject *callback)
+bool Bindings::addKey(const StringVect &keylist, PyObject *callback)
 {
-  KeyBindingTree *tree;
+  KeyBindingTree *tree, *t;
   bool conflict;
 
   if (!(tree = buildtree(keylist, callback)))
     return false; // invalid binding requested
 
-  if (find(tree, &conflict) || conflict) {
+  t = find(tree, &conflict);
+  if (conflict) {
     // 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
+  if (t) {
+    // already bound to something
+    // XXX: look if callback is already bound to this key?
+    t->callbacks.push_back(callback);
+    destroytree(tree);
+  } else {
+    // grab the server here to make sure no key pressed go missed
+    otk::Display::grab();
+    grabKeys(false);
 
-  Py_INCREF(callback);
+    // assimilate this built tree into the main tree
+    assimilate(tree); // assimilation destroys/uses the tree
 
-  grabKeys(true); 
+    grabKeys(true); 
+    otk::Display::ungrab();
+  }
  
+  Py_INCREF(callback);
+
   return true;
 }
 
 
-bool OBBindings::remove(const StringVect &keylist)
+bool Bindings::removeKey(const StringVect &keylist, PyObject *callback)
 {
   assert(false); // XXX: function not implemented yet
 
@@ -252,30 +270,42 @@ bool OBBindings::remove(const StringVect &keylist)
   if (!(tree = buildtree(keylist, 0)))
     return false; // invalid binding requested
 
-  PyObject *func = find(tree, &conflict);
-  if (func) {
-    grabKeys(false);
-
-    _curpos = &_keytree;
-    
-    // XXX do shit here ...
-    Py_DECREF(func);
-    
-    grabKeys(true);
-    return true;
+  KeyBindingTree *t = find(tree, &conflict);
+  if (t) {
+    CallbackList::iterator it = std::find(t->callbacks.begin(),
+                                          t->callbacks.end(),
+                                          callback);
+    if (it != t->callbacks.end()) {
+      // grab the server here to make sure no key pressed go missed
+      otk::Display::grab();
+      grabKeys(false);
+      
+      _curpos = &_keytree;
+      
+      // XXX do shit here ...
+      Py_XDECREF(*it);
+      
+      grabKeys(true);
+      otk::Display::ungrab();
+      
+      return true;
+    }
   }
   return false;
 }
 
 
-void OBBindings::setResetKey(const std::string &key)
+void Bindings::setResetKey(const std::string &key)
 {
   Binding b(0, 0);
   if (translate(key, b)) {
+    // grab the server here to make sure no key pressed go missed
+    otk::Display::grab();
     grabKeys(false);
     _resetkey.key = b.key;
     _resetkey.modifiers = b.modifiers;
     grabKeys(true);
+    otk::Display::ungrab();
   }
 }
 
@@ -288,72 +318,81 @@ static void remove_branch(KeyBindingTree *first)
     if (p->first_child)
       remove_branch(p->first_child);
     KeyBindingTree *s = p->next_sibling;
-    Py_XDECREF(p->callback);
+    while(!p->callbacks.empty()) {
+      Py_XDECREF(p->callbacks.front());
+      p->callbacks.pop_front();
+    }
     delete p;
     p = s;
   }
 }
 
 
-void OBBindings::removeAll()
+void Bindings::removeAllKeys()
 {
+  grabKeys(false);
   if (_keytree.first_child) {
     remove_branch(_keytree.first_child);
     _keytree.first_child = 0;
   }
+  grabKeys(true);
 }
 
 
-void OBBindings::grabKeys(bool grab)
+void Bindings::grabKeys(bool grab)
 {
   for (int i = 0; i < Openbox::instance->screenCount(); ++i) {
-    Window root = otk::OBDisplay::screenInfo(i)->rootWindow();
+    Window root = otk::Display::screenInfo(i)->rootWindow();
 
     KeyBindingTree *p = _curpos->first_child;
     while (p) {
       if (grab) {
-        otk::OBDisplay::grabKey(p->binding.key, p->binding.modifiers,
+        otk::Display::grabKey(p->binding.key, p->binding.modifiers,
                                 root, false, GrabModeAsync, GrabModeAsync,
                                 false);
       }
       else
-        otk::OBDisplay::ungrabKey(p->binding.key, p->binding.modifiers,
+        otk::Display::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 (_resetkey.key)
+      if (grab)
+        otk::Display::grabKey(_resetkey.key, _resetkey.modifiers,
+                                root, false, GrabModeAsync, GrabModeAsync,
+                                false);
+      else
+        otk::Display::ungrabKey(_resetkey.key, _resetkey.modifiers,
+                                  root);
   }
 }
 
 
-void OBBindings::fire(unsigned int modifiers, unsigned int key, Time time)
+void Bindings::fireKey(int screen, unsigned int modifiers, unsigned int key,
+                         Time time)
 {
   if (key == _resetkey.key && modifiers == _resetkey.modifiers) {
-    reset(this);
+    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
+          // grab the server here to make sure no key pressed go missed
+          otk::Display::grab();
           grabKeys(false);
           _curpos = p;
           grabKeys(true);
+          otk::Display::ungrab();
         } else {
-          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);
-          reset(this);
+          Client *c = Openbox::instance->focusedClient();
+          KeyData data(screen, c, time, modifiers, key);
+          CallbackList::iterator it, end = p->callbacks.end();
+          for (it = p->callbacks.begin(); it != end; ++it)
+            python_callback(*it, &data);
+          resetChains(this);
         }
         break;
       }
@@ -362,16 +401,19 @@ void OBBindings::fire(unsigned int modifiers, unsigned int key, Time time)
   }
 }
 
-void OBBindings::reset(OBBindings *self)
+void Bindings::resetChains(Bindings *self)
 {
   self->_timer.stop();
+  // grab the server here to make sure no key pressed go missed
+  otk::Display::grab();
   self->grabKeys(false);
   self->_curpos = &self->_keytree;
   self->grabKeys(true);
+  otk::Display::ungrab();
 }
 
 
-bool OBBindings::addButton(const std::string &but, MouseContext context,
+bool Bindings::addButton(const std::string &but, MouseContext context,
                            MouseAction action, PyObject *callback)
 {
   assert(context >= 0 && context < NUM_MOUSE_CONTEXT);
@@ -386,8 +428,6 @@ bool OBBindings::addButton(const std::string &but, MouseContext context,
   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;
     }
 
@@ -399,57 +439,153 @@ bool OBBindings::addButton(const std::string &but, MouseContext context,
     bind->binding.key = b.key;
     bind->binding.modifiers = b.modifiers;
     _buttons[context].push_back(bind);
-    // XXX GRAB the new button everywhere!
+    // grab the button on all clients
+    for (int sn = 0; sn < Openbox::instance->screenCount(); ++sn) {
+      Screen *s = Openbox::instance->screen(sn);
+      Client::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);
+      }
+    }
   } else
     bind = *it;
-  Py_XDECREF(bind->callback[action]); // if it was already bound, unbind it
-  bind->callback[action] = callback;
+  bind->callbacks[action].push_back(callback);
   Py_INCREF(callback);
   return true;
 }
 
-void OBBindings::grabButtons(bool grab, OBClient *client)
+void Bindings::removeAllButtons()
 {
   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) {
+      for (int a = 0; a < NUM_MOUSE_ACTION; ++a) {
+        while (!(*it)->callbacks[a].empty()) {
+          Py_XDECREF((*it)->callbacks[a].front());
+          (*it)->callbacks[a].pop_front();
+        }
+      }
+      // ungrab the button on all clients
+      for (int sn = 0; sn < Openbox::instance->screenCount(); ++sn) {
+        Screen *s = Openbox::instance->screen(sn);
+        Client::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 Bindings::grabButton(bool grab, const Binding &b, MouseContext context,
+                            Client *client)
+{
+  Window win;
+  int mode = GrabModeAsync;
+  unsigned int mask;
+  switch(context) {
+  case MC_Frame:
+    win = client->frame->window();
+    mask = ButtonPressMask | ButtonMotionMask | ButtonReleaseMask;
+    break;
+  case MC_Window:
+    win = client->frame->plate();
+    mode = GrabModeSync; // this is handled in fireButton
+    mask = ButtonPressMask; // can't catch more than this with Sync mode
+                            // the release event is manufactured by the
+                            // master buttonPressHandler
+    break;
+  default:
+    // any other elements already get button events, don't grab on them
+    return;
+  }
+  if (grab)
+    otk::Display::grabButton(b.key, b.modifiers, win, false, mask, mode,
+                               GrabModeAsync, None, None, false);
+  else
+    otk::Display::ungrabButton(b.key, b.modifiers, win);
+}
+
+void Bindings::grabButtons(bool grab, Client *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)
-      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);
+      grabButton(grab, (*it)->binding, (MouseContext)i, client);
   }
 }
 
-void OBBindings::fire(ButtonData *data)
+void Bindings::fireButton(MouseData *data)
 {
-  printf("but.mods %d.%d\n", data->button, data->state);
+  if (data->context == MC_Window) {
+    // Replay the event, so it goes to the client, and ungrab the device.
+    XAllowEvents(otk::Display::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);
+      CallbackList::iterator c_it,c_end = (*it)->callbacks[data->action].end();
+      for (c_it = (*it)->callbacks[data->action].begin();
+           c_it != c_end; ++c_it)
+        python_callback(*c_it, data);
     }
 }
 
+
+bool Bindings::addEvent(EventAction action, PyObject *callback)
+{
+  if (action < 0 || action >= NUM_EVENTS) {
+    return false;
+  }
+#ifdef    XKB
+  if (action == EventBell && _eventlist[action].empty())
+    XkbSelectEvents(otk::Display::display, XkbUseCoreKbd,
+                    XkbBellNotifyMask, XkbBellNotifyMask);
+#endif // XKB
+  _eventlist[action].push_back(callback);
+  Py_INCREF(callback);
+  return true;
+}
+
+bool Bindings::removeEvent(EventAction action, PyObject *callback)
+{
+  if (action < 0 || action >= NUM_EVENTS) {
+    return false;
+  }
+  
+  CallbackList::iterator it = std::find(_eventlist[action].begin(),
+                                        _eventlist[action].end(),
+                                        callback);
+  if (it != _eventlist[action].end()) {
+    Py_XDECREF(*it);
+    _eventlist[action].erase(it);
+#ifdef    XKB
+    if (action == EventBell && _eventlist[action].empty())
+      XkbSelectEvents(otk::Display::display, XkbUseCoreKbd,
+                      XkbBellNotifyMask, 0);
+#endif // XKB
+    return true;
+  }
+  return false;
+}
+
+void Bindings::removeAllEvents()
+{
+  for (int i = 0; i < NUM_EVENTS; ++i) {
+    while (!_eventlist[i].empty()) {
+      Py_XDECREF(_eventlist[i].front());
+      _eventlist[i].pop_front();
+    }
+  }
+}
+
+void Bindings::fireEvent(EventData *data)
+{
+  CallbackList::iterator c_it, c_end = _eventlist[data->action].end();
+  for (c_it = _eventlist[data->action].begin(); c_it != c_end; ++c_it)
+    python_callback(*c_it, data);
+}
+
 }