X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fbindings.cc;h=77c1dcf848e6d00a2ea88e6be4ff37c8d9ee4453;hb=056ff3b50cddd39b6f45969c17611dc3bf396ae9;hp=3df98da92056b77b320bb85f57b3331aeb487e52;hpb=a9a5f0d7510be5dbf8ae1db99e6c1c01035503d9;p=chaz%2Fopenbox

diff --git a/src/bindings.cc b/src/bindings.cc
index 3df98da9..77c1dcf8 100644
--- 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);
   }
 }
 
@@ -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