update children first

[chaz/openbox] / src / bindings.cc

diff --git a/src/bindings.cc b/src/bindings.cc
index 902340384b1f29e9c27f57e3aa7b573d80233a57..cafc85016736eefd1e68ebdf0c6f0aa5cb73478e 100644 (file)
--- a/src/bindings.cc
+++ b/src/bindings.cc
@@ -159,9 +159,8 @@ Bindings::~Bindings()
   if (_timer)
     delete _timer;
 
-  grabKeys(false);
   removeAllKeys();
-//  removeAllButtons(); XXX
+  //removeAllButtons(); // this is done by each client as they are unmanaged
   removeAllEvents();
 }
 
@@ -242,7 +241,6 @@ bool Bindings::addKey(const StringVect &keylist, PyObject *callback)
 
   if (t) {
     // already bound to something
-    // XXX: look if callback is already bound to this key?
     t->callbacks.push_back(callback);
     destroytree(tree);
   } else {
@@ -262,7 +260,7 @@ bool Bindings::addKey(const StringVect &keylist, PyObject *callback)
   return true;
 }
 
-
+/*
 bool Bindings::removeKey(const StringVect &keylist, PyObject *callback)
 {
   assert(false); // XXX: function not implemented yet
@@ -296,7 +294,7 @@ bool Bindings::removeKey(const StringVect &keylist, PyObject *callback)
   }
   return false;
 }
-
+*/
 
 void Bindings::setResetKey(const std::string &key)
 {
@@ -386,8 +384,6 @@ bool Bindings::grabKeyboard(int screen, PyObject *callback)
   if (XGrabKeyboard(**otk::display, root, false, GrabModeAsync,
                     GrabModeAsync, CurrentTime))
     return false;
-  XGrabPointer(**otk::display, root, false, 0, GrabModeAsync,
-               GrabModeAsync, None, None, CurrentTime);
   _keybgrab_callback = callback;
   return true;
 }
@@ -403,6 +399,24 @@ void Bindings::ungrabKeyboard()
 }
 
 
+bool Bindings::grabPointer(int screen)
+{
+  if (!openbox->screen(screen))
+    return false; // the screen is not managed
+  
+  Window root = otk::display->screenInfo(screen)->rootWindow();
+  XGrabPointer(**otk::display, root, false, 0, GrabModeAsync,
+               GrabModeAsync, None, None, CurrentTime);
+  return true;
+}
+
+
+void Bindings::ungrabPointer()
+{
+  XUngrabPointer(**otk::display, CurrentTime);
+}
+
+
 void Bindings::fireKey(int screen, unsigned int modifiers, unsigned int key,
                        Time time, KeyAction::KA action)
 {
@@ -427,7 +441,7 @@ void Bindings::fireKey(int screen, unsigned int modifiers, unsigned int key,
           _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
+          // grab the server here to make sure no key presses get missed
           otk::display->grab();
           grabKeys(false);
           _curpos = p;
@@ -467,6 +481,7 @@ bool Bindings::addButton(const std::string &but, MouseContext::MC context,
                            MouseAction::MA action, PyObject *callback)
 {
   assert(context >= 0 && context < MouseContext::NUM_MOUSE_CONTEXT);
+  assert(action >= 0 && action < MouseAction::NUM_MOUSE_ACTION);
   
   Binding b(0,0);
   if (!translate(but, b, false))