X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Factions.cc;h=1d4a5bb691a3ce4cbe4fbaef8dd62da6277a04fa;hb=40449e199dfeab57e8d147e07989aef339a7da59;hp=79b9fc410dd85a131cad9ec1a84d5094b8e52e41;hpb=1c8090fa67994215f5e79cd9dd08f82110589d8a;p=chaz%2Fopenbox diff --git a/src/actions.cc b/src/actions.cc index 79b9fc41..1d4a5bb6 100644 --- a/src/actions.cc +++ b/src/actions.cc @@ -16,7 +16,6 @@ namespace ob { -const unsigned int OBActions::DOUBLECLICKDELAY = 300; const int OBActions::BUTTONS; OBActions::OBActions() @@ -72,11 +71,12 @@ void OBActions::buttonPressHandler(const XButtonEvent &e) (Openbox::instance->findHandler(e.window)); assert(w); // everything should be a widget + // kill off the Button1Mask etc, only want the modifiers unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask | 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 @@ -109,19 +109,25 @@ void OBActions::buttonReleaseHandler(const XButtonEvent &e) return; // run the CLICK python hook + // kill off the Button1Mask etc, only want the modifiers unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask | 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 && + // XXX: dont load this every time!!@* + long dblclick; + if (!python_get_long("double_click_delay", &dblclick)) + dblclick = 300; + + if (e.time - _release.time < (unsigned)dblclick && _release.win == e.window && _release.button == e.button) { // 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; @@ -142,12 +148,10 @@ void OBActions::enterHandler(const XCrossingEvent &e) { OtkEventHandler::enterHandler(e); - OBWidget *w = dynamic_cast - (Openbox::instance->findHandler(e.window)); - // run the ENTER python hook - doCallback(Action_EnterWindow, e.window, - (OBWidget::WidgetType)(w ? w->type():-1), e.state, 0, 0, 0, 0); + EventData *data = new_event_data(e.window, EventEnterWindow, e.state); + Openbox::instance->bindings()->fireEvent(data); + Py_DECREF((PyObject*)data); } @@ -155,28 +159,28 @@ void OBActions::leaveHandler(const XCrossingEvent &e) { OtkEventHandler::leaveHandler(e); - OBWidget *w = dynamic_cast - (Openbox::instance->findHandler(e.window)); - // run the LEAVE python hook - doCallback(Action_LeaveWindow, e.window, - (OBWidget::WidgetType)(w ? w->type():-1), e.state, 0, 0, 0, 0); + EventData *data = new_event_data(e.window, EventLeaveWindow, e.state); + Openbox::instance->bindings()->fireEvent(data); + Py_DECREF((PyObject*)data); } void OBActions::keyPressHandler(const XKeyEvent &e) { -// OBWidget *w = dynamic_cast -// (Openbox::instance->findHandler(e.window)); + OtkEventHandler::keyPressHandler(e); + // kill off the Button1Mask etc, only want the modifiers 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); } void OBActions::motionHandler(const XMotionEvent &e) { + OtkEventHandler::motionHandler(e); + if (!e.same_screen) return; // this just gets stupid int x_root = e.x_root, y_root = e.y_root; @@ -198,6 +202,7 @@ void OBActions::motionHandler(const XMotionEvent &e) assert(w); // everything should be a widget // run the MOTION python hook + // kill off the Button1Mask etc, only want the modifiers unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask | Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask); unsigned int button = _posqueue[0]->button; @@ -205,103 +210,26 @@ 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); } void OBActions::mapRequestHandler(const XMapRequestEvent &e) { - doCallback(Action_NewWindow, e.window, (OBWidget::WidgetType)-1, - 0, 0, 0, 0, 0); + OtkEventHandler::mapRequestHandler(e); + // do this in OBScreen::manageWindow } void OBActions::unmapHandler(const XUnmapEvent &e) { - (void)e; - doCallback(Action_CloseWindow, e.window, (OBWidget::WidgetType)-1, - 0, 0, 0, 0, 0); + OtkEventHandler::unmapHandler(e); + // do this in OBScreen::unmanageWindow } void OBActions::destroyHandler(const XDestroyWindowEvent &e) { - (void)e; - doCallback(Action_CloseWindow, e.window, (OBWidget::WidgetType)-1, - 0, 0, 0, 0, 0); -} - -void OBActions::doCallback(ActionType action, Window window, - OBWidget::WidgetType type, unsigned int state, - unsigned int button, int xroot, int yroot, - Time time) -{ - std::pair it_pair = - _callbacks.equal_range(action); - - CallbackMap::iterator it; -// for (it = it_pair.first; it != it_pair.second; ++it) -// python_callback(it->second, action, window, type, state, -// button, xroot, yroot, time); - // XXX do a callback -} - -bool OBActions::registerCallback(ActionType action, PyObject *func, - bool atfront) -{ - if (action < 0 || action >= OBActions::NUM_ACTIONS) { - return false; - } - if (!func) - return false; - - std::pair it_pair = - _callbacks.equal_range(action); - - CallbackMap::iterator it; - for (it = it_pair.first; it != it_pair.second; ++it) - if (it->second == func) - return true; // already in there - if (atfront) - _callbacks.insert(_callbacks.begin(), CallbackMapPair(action, func)); - else - _callbacks.insert(CallbackMapPair(action, func)); - Py_INCREF(func); - return true; -} - -bool OBActions::unregisterCallback(ActionType action, PyObject *func) -{ - if (action < 0 || action >= OBActions::NUM_ACTIONS) { - return false; - } - if (!func) - return false; - - std::pair it_pair = - _callbacks.equal_range(action); - - CallbackMap::iterator it; - for (it = it_pair.first; it != it_pair.second; ++it) - if (it->second == func) - break; - if (it != it_pair.second) { // its been registered before - Py_DECREF(func); - _callbacks.erase(it); - } - return true; -} - -bool OBActions::unregisterAllCallbacks(ActionType action) -{ - if (action < 0 || action >= OBActions::NUM_ACTIONS) { - return false; - } - - while (!_callbacks.empty()) { - CallbackMap::iterator it = _callbacks.begin(); - Py_DECREF(it->second); - _callbacks.erase(it); - } - return true; + OtkEventHandler::destroyHandler(e); + // do this in OBScreen::unmanageWindow } }