X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fbindings.cc;h=cafc85016736eefd1e68ebdf0c6f0aa5cb73478e;hb=53bed5e59a802f527a22d940d830543726403f1e;hp=a369410294786d003772097aeb910c94baa8b504;hpb=f7a0eb7624fa323a37f9fb0e306d7e1bbc745e15;p=chaz%2Fopenbox

diff --git a/src/bindings.cc b/src/bindings.cc
index a3694102..cafc8501 100644
--- a/src/bindings.cc
+++ b/src/bindings.cc
@@ -241,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 {
@@ -261,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
@@ -295,7 +294,7 @@ bool Bindings::removeKey(const StringVect &keylist, PyObject *callback)
   }
   return false;
 }
-
+*/
 
 void Bindings::setResetKey(const std::string &key)
 {
@@ -442,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;
@@ -482,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))