From: Dana Jansens <danakj@orodu.net>
Date: Fri, 3 Jan 2003 22:34:50 +0000 (+0000)
Subject: no default reset key
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=e6ae9e51f792e4eb3316e6b4b75bd864535d7665;p=chaz%2Fopenbox

no default reset key
---

diff --git a/src/bindings.cc b/src/bindings.cc
index 3df98da9..97dd2aa1 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);
   }
 }