clean up transient's parent's reference in destructor

[chaz/openbox] / src / bindings.cc

diff --git a/src/bindings.cc b/src/bindings.cc
index 3df98da92056b77b320bb85f57b3331aeb487e52..6a135b6d6821a94c4e2b812741529371af171730 100644 (file)
--- a/src/bindings.cc
+++ b/src/bindings.cc
@@ -146,7 +146,7 @@ OBBindings::OBBindings()
 {
   _timer.setTimeout(5000); // chains reset after 5 seconds
   
-  setResetKey("C-g"); // set the default reset key
+//  setResetKey("C-g"); // set the default reset key
 
   for (int i = 0; i < NUM_EVENTS; ++i)
     _events[i] = 0;
@@ -329,13 +329,14 @@ void OBBindings::grabKeys(bool grab)
       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::OBDisplay::grabKey(_resetkey.key, _resetkey.modifiers,
+                                root, false, GrabModeAsync, GrabModeAsync,
+                                false);
+      else
+        otk::OBDisplay::ungrabKey(_resetkey.key, _resetkey.modifiers,
+                                  root);
   }
 }
 
@@ -409,7 +410,7 @@ bool OBBindings::addButton(const std::string &but, MouseContext context,
     // 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();
+      OBClient::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);
       }
@@ -434,7 +435,7 @@ void OBBindings::removeAllButtons()
       // 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();
+        OBClient::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);
         }
@@ -480,8 +481,6 @@ void OBBindings::grabButtons(bool grab, OBClient *client)
 
 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