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

diff --git a/src/bindings.cc b/src/bindings.cc
index a8dfaed0..aa9c288d 100644
--- a/src/bindings.cc
+++ b/src/bindings.cc
@@ -19,6 +19,8 @@ extern "C" {
 #define _(str) gettext(str)
 }
 
+#include <algorithm>
+
 namespace ob {
 
 static bool buttonvalue(const std::string &button, unsigned int *val)
@@ -98,7 +100,7 @@ bool Bindings::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::Display::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 {
@@ -145,17 +147,18 @@ KeyBindingTree *Bindings::buildtree(const StringVect &keylist,
 Bindings::Bindings()
   : _curpos(&_keytree),
     _resetkey(0,0),
-    _timer(Openbox::instance->timerManager(),
-           (otk::TimeoutHandler)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
 }
 
 
 Bindings::~Bindings()
 {
+  if (_timer)
+    delete _timer;
+
   grabKeys(false);
   removeAllKeys();
 //  removeAllButtons(); XXX
@@ -244,14 +247,14 @@ bool Bindings::addKey(const StringVect &keylist, PyObject *callback)
     destroytree(tree);
   } else {
     // grab the server here to make sure no key pressed go missed
-    otk::Display::grab();
+    otk::display->grab();
     grabKeys(false);
 
     // assimilate this built tree into the main tree
     assimilate(tree); // assimilation destroys/uses the tree
 
     grabKeys(true); 
-    otk::Display::ungrab();
+    otk::display->ungrab();
   }
  
   Py_INCREF(callback);
@@ -277,7 +280,7 @@ bool Bindings::removeKey(const StringVect &keylist, PyObject *callback)
                                           callback);
     if (it != t->callbacks.end()) {
       // grab the server here to make sure no key pressed go missed
-      otk::Display::grab();
+      otk::display->grab();
       grabKeys(false);
       
       _curpos = &_keytree;
@@ -286,7 +289,7 @@ bool Bindings::removeKey(const StringVect &keylist, PyObject *callback)
       Py_XDECREF(*it);
       
       grabKeys(true);
-      otk::Display::ungrab();
+      otk::display->ungrab();
       
       return true;
     }
@@ -300,12 +303,12 @@ 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();
+    otk::display->grab();
     grabKeys(false);
     _resetkey.key = b.key;
     _resetkey.modifiers = b.modifiers;
     grabKeys(true);
-    otk::Display::ungrab();
+    otk::display->ungrab();
   }
 }
 
@@ -341,75 +344,123 @@ void Bindings::removeAllKeys()
 
 void Bindings::grabKeys(bool grab)
 {
-  for (int i = 0; i < Openbox::instance->screenCount(); ++i) {
-    Window root = otk::Display::screenInfo(i)->rootWindow();
+  for (int i = 0; i < openbox->screenCount(); ++i) {
+    Window root = otk::display->screenInfo(i)->rootWindow();
 
     KeyBindingTree *p = _curpos->first_child;
     while (p) {
       if (grab) {
-        otk::Display::grabKey(p->binding.key, p->binding.modifiers,
+        otk::display->grabKey(p->binding.key, p->binding.modifiers,
                                 root, false, GrabModeAsync, GrabModeAsync,
                                 false);
       }
       else
-        otk::Display::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::Display::grabKey(_resetkey.key, _resetkey.modifiers,
+        otk::display->grabKey(_resetkey.key, _resetkey.modifiers,
                                 root, false, GrabModeAsync, GrabModeAsync,
                                 false);
       else
-        otk::Display::ungrabKey(_resetkey.key, _resetkey.modifiers,
+        otk::display->ungrabKey(_resetkey.key, _resetkey.modifiers,
                                   root);
   }
 }
 
 
+bool Bindings::grabKeyboard(int screen, PyObject *callback)
+{
+  assert(callback);
+  if (_keybgrab_callback) return false; // already grabbed
+
+  int i;
+  for (i = 0; i < openbox->screenCount(); ++i)
+    if (openbox->screen(screen)->number() == screen)
+      break;
+  if (i >= openbox->screenCount())
+    return false; // couldn't find the screen.. it's not managed
+  
+  Window root = otk::display->screenInfo(i)->rootWindow();
+  if (XGrabKeyboard(**otk::display, root, false, GrabModeAsync,
+                    GrabModeSync, CurrentTime))
+    return false;
+  printf("****GRABBED****\n");
+  _keybgrab_callback = callback;
+  return true;
+}
+
+
+void Bindings::ungrabKeyboard()
+{
+  if (!_keybgrab_callback) return; // not grabbed
+
+  _keybgrab_callback = 0;
+  XUngrabKeyboard(**otk::display, CurrentTime);
+  printf("****UNGRABBED****\n");
+}
+
+
 void Bindings::fireKey(int screen, unsigned int modifiers, unsigned int key,
-                         Time time)
+                       Time time, KeyAction action)
 {
-  if (key == _resetkey.key && modifiers == _resetkey.modifiers) {
-    resetChains(this);
+  if (_keybgrab_callback) {
+    Client *c = openbox->focusedClient();
+    KeyData data(screen, c, time, modifiers, key, action);
+    python_callback(_keybgrab_callback, &data);
   } 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 {
-          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);
+    // KeyRelease events only occur during keyboard grabs
+    if (action == EventKeyRelease) return;
+    
+    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) {
+            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 {
+            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;
         }
-        break;
+        p = p->next_sibling;
       }
-      p = p->next_sibling;
     }
   }
 }
 
 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();
+  otk::display->grab();
   self->grabKeys(false);
   self->_curpos = &self->_keytree;
   self->grabKeys(true);
-  otk::Display::ungrab();
+  otk::display->ungrab();
 }
 
 
@@ -440,8 +491,8 @@ bool Bindings::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) {
-      Screen *s = Openbox::instance->screen(sn);
+    for (int sn = 0; sn < openbox->screenCount(); ++sn) {
+      Screen *s = openbox->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);
@@ -466,8 +517,8 @@ void Bindings::removeAllButtons()
         }
       }
       // ungrab the button on all clients
-      for (int sn = 0; sn < Openbox::instance->screenCount(); ++sn) {
-        Screen *s = Openbox::instance->screen(sn);
+      for (int sn = 0; sn < openbox->screenCount(); ++sn) {
+        Screen *s = openbox->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);
@@ -500,10 +551,10 @@ void Bindings::grabButton(bool grab, const Binding &b, MouseContext context,
     return;
   }
   if (grab)
-    otk::Display::grabButton(b.key, b.modifiers, win, false, mask, mode,
-                               GrabModeAsync, None, None, false);
+    otk::display->grabButton(b.key, b.modifiers, win, false, mask, mode,
+                             GrabModeAsync, None, None, false);
   else
-    otk::Display::ungrabButton(b.key, b.modifiers, win);
+    otk::display->ungrabButton(b.key, b.modifiers, win);
 }
 
 void Bindings::grabButtons(bool grab, Client *client)
@@ -518,8 +569,8 @@ void Bindings::grabButtons(bool grab, Client *client)
 void Bindings::fireButton(MouseData *data)
 {
   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);
+    // Replay the event, so it goes to the client
+    XAllowEvents(**otk::display, ReplayPointer, data->time);
   }
   
   ButtonBindingList::iterator it, end = _buttons[data->context].end();
@@ -541,7 +592,7 @@ bool Bindings::addEvent(EventAction action, PyObject *callback)
   }
 #ifdef    XKB
   if (action == EventBell && _eventlist[action].empty())
-    XkbSelectEvents(otk::Display::display, XkbUseCoreKbd,
+    XkbSelectEvents(**otk::display, XkbUseCoreKbd,
                     XkbBellNotifyMask, XkbBellNotifyMask);
 #endif // XKB
   _eventlist[action].push_back(callback);
@@ -563,7 +614,7 @@ bool Bindings::removeEvent(EventAction action, PyObject *callback)
     _eventlist[action].erase(it);
 #ifdef    XKB
     if (action == EventBell && _eventlist[action].empty())
-      XkbSelectEvents(otk::Display::display, XkbUseCoreKbd,
+      XkbSelectEvents(**otk::display, XkbUseCoreKbd,
                       XkbBellNotifyMask, 0);
 #endif // XKB
     return true;