X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fbindings.cc;h=78fc74cdfe642f1e5ca1f241104c2c65cc2c5429;hb=5face4c6f35172761367f63ac0b6eaf62d84e532;hp=77c1dcf848e6d00a2ea88e6be4ff37c8d9ee4453;hpb=e3b50c2d137ba194073dc062edf73e79c18b7fe8;p=chaz%2Fopenbox

diff --git a/src/bindings.cc b/src/bindings.cc
index 77c1dcf8..78fc74cd 100644
--- a/src/bindings.cc
+++ b/src/bindings.cc
@@ -19,19 +19,21 @@ extern "C" {
 #define _(str) gettext(str)
 }
 
+#include <algorithm>
+
 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 +70,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 +100,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, sym)))
       printf(_("No valid keycode for Key in key binding: %s\n"), key.c_str());
     return b.key != 0;
   } else {
@@ -115,8 +117,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 +127,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,31 +144,29 @@ KeyBindingTree *OBBindings::buildtree(const StringVect &keylist,
 }
 
 
-OBBindings::OBBindings()
+Bindings::Bindings()
   : _curpos(&_keytree),
     _resetkey(0,0),
-    _timer(Openbox::instance->timerManager(),
-           (otk::OBTimeoutHandler)resetChains, this)
+    _timer((otk::Timer *) 0),
+    _keybgrab_callback(0)
 {
-  _timer.setTimeout(5000); // chains reset after 5 seconds
-  
 //  setResetKey("C-g"); // set the default reset key
-
-  for (int i = 0; i < NUM_EVENTS; ++i)
-    _events[i] = 0;
 }
 
 
-OBBindings::~OBBindings()
+Bindings::~Bindings()
 {
+  if (_timer)
+    delete _timer;
+
   grabKeys(false);
   removeAllKeys();
-  removeAllButtons();
+//  removeAllButtons(); XXX
   removeAllEvents();
 }
 
 
-void OBBindings::assimilate(KeyBindingTree *node)
+void Bindings::assimilate(KeyBindingTree *node)
 {
   KeyBindingTree *a, *b, *tmp, *last;
 
@@ -194,7 +198,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;
@@ -206,7 +211,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;
@@ -220,34 +225,45 @@ PyObject *OBBindings::find(KeyBindingTree *search, bool *conflict) const {
 }
 
 
-bool OBBindings::addKey(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::removeKey(const StringVect &keylist)
+bool Bindings::removeKey(const StringVect &keylist, PyObject *callback)
 {
   assert(false); // XXX: function not implemented yet
 
@@ -257,30 +273,42 @@ bool OBBindings::removeKey(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();
   }
 }
 
@@ -293,14 +321,17 @@ 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::removeAllKeys()
+void Bindings::removeAllKeys()
 {
   grabKeys(false);
   if (_keytree.first_child) {
@@ -311,38 +342,76 @@ void OBBindings::removeAllKeys()
 }
 
 
-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();
+  for (int i = 0; i < ScreenCount(**otk::display); ++i) {
+    Screen *sc = openbox->screen(i);
+    if (!sc) continue; // not a managed screen
+    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 (_resetkey.key)
       if (grab)
-        otk::OBDisplay::grabKey(_resetkey.key, _resetkey.modifiers,
+        otk::display->grabKey(_resetkey.key, _resetkey.modifiers,
                                 root, false, GrabModeAsync, GrabModeAsync,
                                 false);
       else
-        otk::OBDisplay::ungrabKey(_resetkey.key, _resetkey.modifiers,
+        otk::display->ungrabKey(_resetkey.key, _resetkey.modifiers,
                                   root);
   }
 }
 
 
-void OBBindings::fireKey(unsigned int modifiers, unsigned int key, Time time)
+bool Bindings::grabKeyboard(int screen, PyObject *callback)
 {
+  assert(callback);
+  if (_keybgrab_callback) return false; // already grabbed
+
+  if (!openbox->screen(screen))
+    return false; // the screen is not managed
+  
+  Window root = otk::display->screenInfo(screen)->rootWindow();
+  if (XGrabKeyboard(**otk::display, root, false, GrabModeAsync,
+                    GrabModeAsync, CurrentTime))
+    return false;
+  _keybgrab_callback = callback;
+  return true;
+}
+
+
+void Bindings::ungrabKeyboard()
+{
+  if (!_keybgrab_callback) return; // not grabbed
+
+  _keybgrab_callback = 0;
+  XUngrabKeyboard(**otk::display, CurrentTime);
+}
+
+
+void Bindings::fireKey(int screen, unsigned int modifiers, unsigned int key,
+                       Time time, KeyAction::KA action)
+{
+  if (_keybgrab_callback) {
+    Client *c = openbox->focusedClient();
+    KeyData data(screen, c, time, modifiers, key, action);
+    python_callback(_keybgrab_callback, &data);
+  }
+  
+  // KeyRelease events only occur during keyboard grabs
+  if (action == KeyAction::Release) return;
+    
   if (key == _resetkey.key && modifiers == _resetkey.modifiers) {
     resetChains(this);
   } else {
@@ -350,17 +419,23 @@ void OBBindings::fireKey(unsigned int modifiers, unsigned int key, Time time)
     while (p) {
       if (p->binding.key == key && p->binding.modifiers == modifiers) {
         if (p->chain) {
-          _timer.start(); // start/restart the timer
+          if (_timer)
+            delete _timer;
+          _timer = new otk::Timer(5000, // 5 second timeout
+                                  (otk::Timer::TimeoutHandler)resetChains,
+                                  this);
+          // 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);
+          Client *c = openbox->focusedClient();
+          KeyData data(screen, c, time, modifiers, key, action);
+          CallbackList::iterator it, end = p->callbacks.end();
+          for (it = p->callbacks.begin(); it != end; ++it)
+            python_callback(*it, &data);
           resetChains(this);
         }
         break;
@@ -370,19 +445,25 @@ void OBBindings::fireKey(unsigned int modifiers, unsigned int key, Time time)
   }
 }
 
-void OBBindings::resetChains(OBBindings *self)
+void Bindings::resetChains(Bindings *self)
 {
-  self->_timer.stop();
+  if (self->_timer) {
+    delete self->_timer;
+    self->_timer = (otk::Timer *) 0;
+  }
+  // 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,
-                           MouseAction action, PyObject *callback)
+bool Bindings::addButton(const std::string &but, MouseContext::MC context,
+                           MouseAction::MA action, PyObject *callback)
 {
-  assert(context >= 0 && context < NUM_MOUSE_CONTEXT);
+  assert(context >= 0 && context < MouseContext::NUM_MOUSE_CONTEXT);
   
   Binding b(0,0);
   if (!translate(but, b, false))
@@ -394,8 +475,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;
     }
 
@@ -408,130 +487,154 @@ bool OBBindings::addButton(const std::string &but, MouseContext context,
     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);
-      OBScreen::ClientList::iterator c_it, c_end = s->clients.end();
+    for (int sn = 0; sn < ScreenCount(**otk::display); ++sn) {
+      Screen *s = openbox->screen(sn);
+      if (!s) continue; // not managed
+      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::removeAllButtons()
+void Bindings::removeAllButtons()
 {
-  for (int i = i; i < NUM_MOUSE_CONTEXT; ++i) {
+  for (int i = 0; i < MouseContext::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;
+      for (int a = 0; a < MouseAction::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) {
-        OBScreen *s = Openbox::instance->screen(sn);
-        OBScreen::ClientList::iterator c_it, c_end = s->clients.end();
+      for (int sn = 0; sn < ScreenCount(**otk::display); ++sn) {
+        Screen *s = openbox->screen(sn);
+        if (!s) continue; // not managed
+        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);
+          grabButton(false, (*it)->binding, (MouseContext::MC)i, *c_it);
         }
       }
     }
   }
 }
 
-void OBBindings::grabButton(bool grab, const Binding &b, MouseContext context,
-                            OBClient *client)
+void Bindings::grabButton(bool grab, const Binding &b,
+                          MouseContext::MC context, Client *client)
 {
   Window win;
   int mode = GrabModeAsync;
+  unsigned int mask;
   switch(context) {
-  case MC_Frame:
+  case MouseContext::Frame:
     win = client->frame->window();
+    mask = ButtonPressMask | ButtonMotionMask | ButtonReleaseMask;
     break;
-  case MC_Window:
+  case MouseContext::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::OBDisplay::grabButton(b.key, b.modifiers, win, false,
-                               ButtonPressMask | ButtonMotionMask |
-                               ButtonReleaseMask, mode, GrabModeAsync,
-                               None, None, false);
+    otk::display->grabButton(b.key, b.modifiers, win, false, mask, mode,
+                             GrabModeAsync, None, None, false);
   else
-    otk::OBDisplay::ungrabButton(b.key, b.modifiers, win);
+    otk::display->ungrabButton(b.key, b.modifiers, win);
 }
 
-void OBBindings::grabButtons(bool grab, OBClient *client)
+void Bindings::grabButtons(bool grab, Client *client)
 {
-  for (int i = 0; i < NUM_MOUSE_CONTEXT; ++i) {
+  for (int i = 0; i < MouseContext::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);
+      grabButton(grab, (*it)->binding, (MouseContext::MC)i, client);
   }
 }
 
-void OBBindings::fireButton(ButtonData *data)
+void Bindings::fireButton(MouseData *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);
+  if (data->context == MouseContext::Window) {
+    // Replay the event, so it goes to the client
+    XAllowEvents(**otk::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 OBBindings::addEvent(EventAction action, PyObject *callback)
+bool Bindings::addEvent(EventAction::EA action, PyObject *callback)
 {
-  if (action < 0 || action >= NUM_EVENTS) {
+  if (action < 0 || action >= EventAction::NUM_EVENTS) {
     return false;
   }
-
-  Py_XDECREF(_events[action]);
-  _events[action] = callback;
+#ifdef    XKB
+  if (action == EventAction::Bell && _eventlist[action].empty())
+    XkbSelectEvents(**otk::display, XkbUseCoreKbd,
+                    XkbBellNotifyMask, XkbBellNotifyMask);
+#endif // XKB
+  _eventlist[action].push_back(callback);
   Py_INCREF(callback);
   return true;
 }
 
-bool OBBindings::removeEvent(EventAction action)
+bool Bindings::removeEvent(EventAction::EA action, PyObject *callback)
 {
-  if (action < 0 || action >= NUM_EVENTS) {
+  if (action < 0 || action >= EventAction::NUM_EVENTS) {
     return false;
   }
   
-  Py_XDECREF(_events[action]);
-  _events[action] = 0;
-  return true;
+  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 == EventAction::Bell && _eventlist[action].empty())
+      XkbSelectEvents(**otk::display, XkbUseCoreKbd,
+                      XkbBellNotifyMask, 0);
+#endif // XKB
+    return true;
+  }
+  return false;
 }
 
-void OBBindings::removeAllEvents()
+void Bindings::removeAllEvents()
 {
-  for (int i = 0; i < NUM_EVENTS; ++i) {
-    Py_XDECREF(_events[i]);
-    _events[i] = 0;
+  for (int i = 0; i < EventAction::NUM_EVENTS; ++i) {
+    while (!_eventlist[i].empty()) {
+      Py_XDECREF(_eventlist[i].front());
+      _eventlist[i].pop_front();
+    }
   }
 }
 
-void OBBindings::fireEvent(EventData *data)
+void Bindings::fireEvent(EventData *data)
 {
-  if (_events[data->action])
-    python_callback(_events[data->action], (PyObject*)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);
 }
 
 }