X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fbindings.cc;h=2ce8c8e4304a4e01fa5b56d9a028997cbca56b53;hb=2c977ae7ffe1e287264989669d2cfd2eb499d4ee;hp=83c9913fc9bcfe1e5eb2932ad91e3bee5fda3f49;hpb=cdcc526a0274cace9f542960fe4eee4ddcc23d31;p=chaz%2Fopenbox

diff --git a/src/bindings.cc b/src/bindings.cc
index 83c9913f..2ce8c8e4 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)
@@ -145,17 +147,17 @@ KeyBindingTree *Bindings::buildtree(const StringVect &keylist,
 Bindings::Bindings()
   : _curpos(&_keytree),
     _resetkey(0,0),
-    _timer(openbox->timerManager(),
-           (otk::TimeoutHandler)resetChains, this)
+    _timer((otk::Timer *) 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
@@ -379,7 +381,11 @@ void Bindings::fireKey(int screen, unsigned int modifiers, unsigned int key,
     while (p) {
       if (p->binding.key == key && p->binding.modifiers == modifiers) {
         if (p->chain) {
-          _timer.start(); // start/restart the timer
+	  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);
@@ -403,7 +409,10 @@ void Bindings::fireKey(int screen, unsigned int modifiers, unsigned int key,
 
 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();
   self->grabKeys(false);