X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Factions.cc;h=64e763d76c2838699fa7d80796a4c55dcc96c76e;hb=4721c53868187d10e3732cea63efa9fbd352178d;hp=6043ad0e6921a2f8ddf086eda167ebd9f25a9d8a;hpb=90ae66cc44a93ab1419821944c258e72d1e4b559;p=chaz%2Fopenbox diff --git a/src/actions.cc b/src/actions.cc index 6043ad0e..64e763d7 100644 --- a/src/actions.cc +++ b/src/actions.cc @@ -1,10 +1,16 @@ -// -*- mode: C++; indent-tabs-mode: nil; -*- +// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*- #ifdef HAVE_CONFIG_H # include "../config.h" #endif #include "actions.hh" +#include "widget.hh" +#include "openbox.hh" +#include "client.hh" +#include "python.hh" +#include "bindings.hh" +#include "otk/display.hh" #include @@ -13,9 +19,8 @@ namespace ob { const unsigned int OBActions::DOUBLECLICKDELAY = 300; OBActions::OBActions() - : _button(0), _enter_win(0) + : _button(0) { - // XXX: load a configuration out of somewhere } @@ -28,9 +33,15 @@ OBActions::~OBActions() void OBActions::buttonPressHandler(const XButtonEvent &e) { - // XXX: run the PRESS guile hook - printf("GUILE: PRESS: win %lx modifiers %u button %u time %lx\n", - (long)e.window, e.state, e.button, e.time); + OtkEventHandler::buttonPressHandler(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 (_button) return; // won't count toward CLICK events @@ -40,9 +51,10 @@ void OBActions::buttonPressHandler(const XButtonEvent &e) void OBActions::buttonReleaseHandler(const XButtonEvent &e) { - // XXX: run the RELEASE guile hook - printf("GUILE: RELEASE: win %lx modifiers %u button %u time %lx\n", - (long)e.window, e.state, e.button, e.time); + OtkEventHandler::buttonReleaseHandler(e); + + OBWidget *w = dynamic_cast + (Openbox::instance->findHandler(e.window)); // not for the button we're watching? if (_button != e.button) return; @@ -58,17 +70,19 @@ void OBActions::buttonReleaseHandler(const XButtonEvent &e) e.x < attr.width && e.y < attr.height)) return; - // XXX: run the CLICK guile hook - printf("GUILE: CLICK: win %lx modifiers %u button %u time %lx\n", - (long)e.window, e.state, e.button, e.time); + // 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 (e.time - _release.time < DOUBLECLICKDELAY && _release.win == e.window && _release.button == e.button) { - // XXX: run the DOUBLECLICK guile hook - printf("GUILE: DOUBLECLICK: win %lx modifiers %u button %u time %lx\n", - (long)e.window, e.state, e.button, e.time); - + // 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); + // reset so you cant triple click for 2 doubleclicks _release.win = 0; _release.button = 0; @@ -82,42 +96,167 @@ void OBActions::buttonReleaseHandler(const XButtonEvent &e) } -void OBActions::enter(Window win, unsigned int modifiers) +void OBActions::enterHandler(const XCrossingEvent &e) { - _enter_win = win; + 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); +} - (void)modifiers; - // XXX: run the ENTER guile hook - printf("GUILE: ENTER: win %lx modifiers %u\n", (long)win, modifiers); +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); } -void OBActions::leave(unsigned int modifiers) +void OBActions::keyPressHandler(const XKeyEvent &e) { - (void)modifiers; - // XXX: run the LEAVE guile hook - printf("GUILE: LEAVE: win %lx modifiers %u\n", (long)_enter_win, modifiers); +// OBWidget *w = dynamic_cast +// (Openbox::instance->findHandler(e.window)); - _enter_win = 0; + Openbox::instance->bindings()->fire(e.state, e.keycode, e.time); } -void OBActions::drag(Window win, otk::Point delta, unsigned int modifiers, - unsigned int button, Time time) +void OBActions::motionHandler(const XMotionEvent &e) { - (void)win;(void)delta;(void)modifiers;(void)button;(void)time; + if (!e.same_screen) return; // this just gets stupid + + int x_root = e.x_root, y_root = e.y_root; + + // compress changes to a window into a single change + XEvent ce; + while (XCheckTypedEvent(otk::OBDisplay::display, e.type, &ce)) { + if (ce.xmotion.window != e.window) { + XPutBackEvent(otk::OBDisplay::display, &ce); + break; + } else { + x_root = e.x_root; + y_root = e.y_root; + } + } + - // XXX: some guile shit... + 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); } +void OBActions::mapRequestHandler(const XMapRequestEvent &e) +{ + doCallback(Action_NewWindow, e.window, (OBWidget::WidgetType)-1, + 0, 0, 0, 0, 0); +} -void OBActions::key(Window win, unsigned int modifiers, unsigned int keycode) +void OBActions::unmapHandler(const XUnmapEvent &e) { - (void)win;(void)modifiers;(void)keycode; + (void)e; + doCallback(Action_CloseWindow, e.window, (OBWidget::WidgetType)-1, + 0, 0, 0, 0, 0); +} - // XXX: some guile shit... +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); +} + +bool OBActions::registerCallback(ActionType action, PyObject *func, + bool atfront) +{ + if (action < 0 || action >= OBActions::NUM_ACTIONS || + action == OBActions::Action_KeyPress) { + 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) // not 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 || + action == OBActions::Action_KeyPress) { + 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 || + action == OBActions::Action_KeyPress) { + return false; + } + + while (!_callbacks.empty()) { + CallbackMap::iterator it = _callbacks.begin(); + Py_DECREF(it->second); + _callbacks.erase(it); + } + return true; +} }