titlebar layouts work

[chaz/openbox] / src / actions.cc

diff --git a/src/actions.cc b/src/actions.cc
index 79b9fc410dd85a131cad9ec1a84d5094b8e52e41..ffa0a8f05f01feeb6c48b53f9a48832a84c82633 100644 (file)
--- a/src/actions.cc
+++ b/src/actions.cc
@@ -76,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
@@ -113,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 &&
@@ -121,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;
@@ -171,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);
 }
 
 
@@ -205,7 +205,7 @@ void OBActions::motionHandler(const XMotionEvent &e)
                                      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);
 }