X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Factions.cc;h=0dbe46405128135b5cb874299242ecc88c190333;hb=c645416035d64cc959d1dd0e937b31b07489e54b;hp=d8162a50572d1dfd4c693c0c2ad00cfcc217677c;hpb=0a15728be441cf687ef93fd2ab8c38266adacd94;p=chaz%2Fopenbox diff --git a/src/actions.cc b/src/actions.cc index d8162a50..0dbe4640 100644 --- a/src/actions.cc +++ b/src/actions.cc @@ -5,6 +5,11 @@ #endif #include "actions.hh" +#include "widget.hh" +#include "openbox.hh" +#include "client.hh" +#include "python.hh" +#include "otk/display.hh" #include @@ -13,11 +18,8 @@ namespace ob { const unsigned int OBActions::DOUBLECLICKDELAY = 300; OBActions::OBActions() - : _button(0), _enter_win(0) + : _button(0) { - for (int i = 0; i < 2; ++i) - _presses[i] = new MousePressAction(); - // XXX: load a configuration out of somewhere } @@ -28,39 +30,38 @@ OBActions::~OBActions() } -void OBActions::insertPress(Window win, unsigned int button, Time time) -{ - MousePressAction *a = _presses[1]; - _presses[1] = _presses[0]; - _presses[0] = a; - a->win = win; - a->button = button; - a->time = time; -} - - 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 guile hook + OBWidget *w = dynamic_cast + (Openbox::instance->findHandler(e.window)); + + python_callback(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 _button = e.button; - - insertPress(e.window, e.button, e.time); } 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)); + + // run the RELEASE guile hook + python_callback(Action_ButtonRelease, e.window, + (OBWidget::WidgetType)(w ? w->type():-1), + e.state, e.button, e.x_root, e.y_root, e.time); // not for the button we're watching? - if (_button && _button != e.button) return; + if (_button != e.button) return; _button = 0; @@ -73,57 +74,98 @@ 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 guile hook + python_callback(Action_Click, e.window, + (OBWidget::WidgetType)(w ? w->type():-1), + e.state, e.button, e.time); + + if (e.time - _release.time < DOUBLECLICKDELAY && + _release.win == e.window && _release.button == e.button) { + + // run the DOUBLECLICK guile hook + python_callback(Action_DoubleClick, e.window, + (OBWidget::WidgetType)(w ? w->type():-1), + e.state, e.button, e.time); + + // reset so you cant triple click for 2 doubleclicks + _release.win = 0; + _release.button = 0; + _release.time = 0; + } else { + // save the button release, might be part of a double click + _release.win = e.window; + _release.button = e.button; + _release.time = e.time; + } +} - if (_presses[0]->win == _presses[1]->win && - _presses[0]->button == _presses[1]->button && - e.time - _presses[1]->time < DOUBLECLICKDELAY) { - // 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); +void OBActions::enterHandler(const XCrossingEvent &e) +{ + OtkEventHandler::enterHandler(e); + + OBWidget *w = dynamic_cast + (Openbox::instance->findHandler(e.window)); - } + // run the ENTER guile hook + python_callback(Action_EnterWindow, e.window, + (OBWidget::WidgetType)(w ? w->type():-1), e.state); } -void OBActions::enter(Window win, unsigned int modifiers) +void OBActions::leaveHandler(const XCrossingEvent &e) { - _enter_win = win; + OtkEventHandler::leaveHandler(e); - (void)modifiers; - // XXX: run the ENTER guile hook - printf("GUILE: ENTER: win %lx modifiers %u\n", (long)win, modifiers); + OBWidget *w = dynamic_cast + (Openbox::instance->findHandler(e.window)); + // run the LEAVE guile hook + python_callback(Action_LeaveWindow, e.window, + (OBWidget::WidgetType)(w ? w->type():-1), e.state); } -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; + // run the KEY guile hook + python_callback(Action_KeyPress, e.window, + (OBWidget::WidgetType)(w ? w->type():-1), + e.state, e.keycode); } -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 - // XXX: some guile shit... -} + 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; + } + } -void OBActions::key(Window win, unsigned int modifiers, unsigned int keycode) -{ - (void)win;(void)modifiers;(void)keycode; + OBWidget *w = dynamic_cast + (Openbox::instance->findHandler(e.window)); - // XXX: some guile shit... + // XXX: i can envision all sorts of crazy shit with this.. gestures, etc + // maybe that should all be done via python tho.. + // run the simple MOTION guile hook for now... + python_callback(Action_MouseMotion, e.window, + (OBWidget::WidgetType)(w ? w->type():-1), + e.state, e.x_root, e.y_root, e.time); }