X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Factions.cc;h=ffa0a8f05f01feeb6c48b53f9a48832a84c82633;hb=f8ea576460470ecc2e395cf43e31a67752adbbb5;hp=27f4ccae28c54c2e004be90348e7d2b17552aa48;hpb=ca3e463057ebf8a7a48a5997aedc062cdac72f3f;p=chaz%2Fopenbox

diff --git a/src/actions.cc b/src/actions.cc
index 27f4ccae..ffa0a8f0 100644
--- a/src/actions.cc
+++ b/src/actions.cc
@@ -45,7 +45,6 @@ void OBActions::insertPress(const XButtonEvent &e)
 
   OBClient *c = Openbox::instance->findClient(e.window);
   if (c) a->clientarea = c->area();
-  printf("press %d x:%d y:%d winx:%d winy:%d\n", e.button, e.x_root, e.y_root, c->area().x(), c->area().y());
 }
 
 void OBActions::removePress(const XButtonEvent &e)
@@ -77,7 +76,7 @@ void OBActions::buttonPressHandler(const XButtonEvent &e)
                                   Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
   ButtonData *data = new_button_data(e.window, e.time, state, e.button,
                                      w->mcontext(), MousePress);
-  Openbox::instance->bindings()->fire(data);
+  Openbox::instance->bindings()->fireButton(data);
   Py_DECREF((PyObject*)data);
     
   if (_button) return; // won't count toward CLICK events
@@ -114,7 +113,7 @@ void OBActions::buttonReleaseHandler(const XButtonEvent &e)
                                   Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
   ButtonData *data = new_button_data(e.window, e.time, state, e.button,
                                      w->mcontext(), MouseClick);
-  Openbox::instance->bindings()->fire(data);
+  Openbox::instance->bindings()->fireButton(data);
     
 
   if (e.time - _release.time < DOUBLECLICKDELAY &&
@@ -122,7 +121,7 @@ void OBActions::buttonReleaseHandler(const XButtonEvent &e)
 
     // run the DOUBLECLICK python hook
     data->action = MouseDoubleClick;
-    Openbox::instance->bindings()->fire(data);
+    Openbox::instance->bindings()->fireButton(data);
     
     // reset so you cant triple click for 2 doubleclicks
     _release.win = 0;
@@ -172,7 +171,7 @@ void OBActions::keyPressHandler(const XKeyEvent &e)
 
   unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask |
                                   Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
-  Openbox::instance->bindings()->fire(state, e.keycode, e.time);
+  Openbox::instance->bindings()->fireKey(state, e.keycode, e.time);
 }
 
 
@@ -202,13 +201,11 @@ void OBActions::motionHandler(const XMotionEvent &e)
   unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask |
                                   Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
   unsigned int button = _posqueue[0]->button;
-  printf("motion %d x:%d y:%d winx:%d winy:%d\n", button, x_root, y_root,
-         _posqueue[0]->clientarea.x(), _posqueue[0]->clientarea.y());
   MotionData *data = new_motion_data(e.window, e.time, state, button,
                                      w->mcontext(), MouseMotion,
                                      x_root, y_root, _posqueue[0]->pos,
                                      _posqueue[0]->clientarea);
-  Openbox::instance->bindings()->fire((ButtonData*)data);
+  Openbox::instance->bindings()->fireButton((ButtonData*)data);
   Py_DECREF((PyObject*)data);
 }