summaryrefslogtreecommitdiff
path: root/src/actions.cc
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2003-01-03 07:03:59 +0000
committerDana Jansens <danakj@orodu.net>2003-01-03 07:03:59 +0000
commit31e37b3e889daec26784399f6737ec9d8830e366 (patch)
tree4999fbe5b9314bbc54ae306dfd8f7b99df9a90a9 /src/actions.cc
parent7db3ffecc980821ada3e805e2471716896e2410a (diff)
cleanup naming in OBBindings
Diffstat (limited to 'src/actions.cc')
-rw-r--r--src/actions.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/actions.cc b/src/actions.cc
index 79b9fc41..ffa0a8f0 100644
--- 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);
}