X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Factions.cc;h=79b31a27630630d99adccdaccafde555c34fdf8e;hb=a132968424c96d9dc62d144c5e863a6810c0369d;hp=c04457da726a93fb4590f3609db3db93e2c91724;hpb=b35dae95a5cdb902f1661b9572af47c3f55c975c;p=chaz%2Fopenbox diff --git a/src/actions.cc b/src/actions.cc index c04457da..79b31a27 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() @@ -70,16 +69,17 @@ void OBActions::buttonPressHandler(const XButtonEvent &e) // run the PRESS python hook OBWidget *w = dynamic_cast (Openbox::instance->findHandler(e.window)); - -/* doCallback(Action_ButtonPress, e.window, - (OBWidget::WidgetType)(w ? w->type():-1), - e.state, e.button, e.x_root, e.y_root, e.time);*/ - if (w) { - Openbox::instance->bindings()->fire(MousePress, w->type(), e.window, - e.state, e.button, - e.x_root, e.y_root, e.time); - } else - assert(false); // why isnt there a type? + 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(otk::OBDisplay::findScreen(e.root)->screen(), + e.window, e.time, state, e.button, w->mcontext(), + MousePress); + Openbox::instance->bindings()->fireButton(data); + Py_DECREF((PyObject*)data); if (_button) return; // won't count toward CLICK events @@ -94,6 +94,7 @@ void OBActions::buttonReleaseHandler(const XButtonEvent &e) OBWidget *w = dynamic_cast (Openbox::instance->findHandler(e.window)); + assert(w); // everything should be a widget // not for the button we're watching? if (_button != e.button) return; @@ -110,29 +111,27 @@ void OBActions::buttonReleaseHandler(const XButtonEvent &e) return; // run the CLICK python hook -/* doCallback(Action_Click, e.window, - (OBWidget::WidgetType)(w ? w->type():-1), - e.state, e.button, e.x_root, e.y_root, e.time);*/ - if (w) { - Openbox::instance->bindings()->fire(MouseClick, w->type(), e.window, - e.state, e.button, - e.x_root, e.y_root, e.time); - } else - assert(false); // why isnt there a type? - - if (e.time - _release.time < DOUBLECLICKDELAY && + // 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(otk::OBDisplay::findScreen(e.root)->screen(), + e.window, e.time, state, e.button, w->mcontext(), + MouseClick); + Openbox::instance->bindings()->fireButton(data); + + + // 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 -/* doCallback(Action_DoubleClick, e.window, - (OBWidget::WidgetType)(w ? w->type():-1), - e.state, e.button, e.x_root, e.y_root, e.time);*/ - if (w) { - Openbox::instance->bindings()->fire(MouseDoubleClick, w->type(), - e.window, e.state, e.button, - e.x_root, e.y_root, e.time); - } else - assert(false); // why isnt there a type? + data->action = MouseDoubleClick; + Openbox::instance->bindings()->fireButton(data); // reset so you cant triple click for 2 doubleclicks _release.win = 0; @@ -144,6 +143,8 @@ void OBActions::buttonReleaseHandler(const XButtonEvent &e) _release.button = e.button; _release.time = e.time; } + + Py_DECREF((PyObject*)data); } @@ -151,12 +152,12 @@ 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(otk::OBDisplay::findScreen(e.root)->screen(), + e.window, EventEnterWindow, e.state); + Openbox::instance->bindings()->fireEvent(data); + Py_DECREF((PyObject*)data); } @@ -164,26 +165,32 @@ 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(otk::OBDisplay::findScreen(e.root)->screen(), + 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); - Openbox::instance->bindings()->fire(e.state, e.keycode, e.time); + // kill off the Button1Mask etc, only want the modifiers + unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask | + Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask); + Openbox::instance->bindings()-> + fireKey(otk::OBDisplay::findScreen(e.root)->screen(), + 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; @@ -200,119 +207,40 @@ void OBActions::motionHandler(const XMotionEvent &e) } } - _dx = x_root - _posqueue[0]->pos.x(); _posqueue[0]->pos.setX(x_root); - _dy = y_root - _posqueue[0]->pos.y(); _posqueue[0]->pos.setY(y_root); - OBWidget *w = dynamic_cast (Openbox::instance->findHandler(e.window)); - - // XXX: i can envision all sorts of crazy shit with this.. gestures, etc - // maybe that should all be done via python tho.. (or radial menus!) - // run the simple MOTION python hook for now... -/* doCallback(Action_MouseMotion, e.window, - (OBWidget::WidgetType)(w ? w->type():-1), - e.state, (unsigned)-1, x_root, y_root, e.time);*/ - if (w) { - Openbox::instance->bindings()->fire(MouseMotion, w->type(), e.window, - e.state, _posqueue[0]->button, - _dx, _dy, e.time); - } else - assert(false); // why isnt there a type? + 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; + MotionData *data = + new_motion_data(otk::OBDisplay::findScreen(e.root)->screen(), + e.window, e.time, state, button, w->mcontext(), + MouseMotion, x_root, y_root, _posqueue[0]->pos, + _posqueue[0]->clientarea); + 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 } }