X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Factions.cc;h=04b507911802c9c1d84e051db3dc1d091368efdd;hb=506b5dbf6f2624df57f09b5c7ba15098b1590cd5;hp=6043ad0e6921a2f8ddf086eda167ebd9f25a9d8a;hpb=90ae66cc44a93ab1419821944c258e72d1e4b559;p=chaz%2Fopenbox diff --git a/src/actions.cc b/src/actions.cc index 6043ad0e..04b50791 100644 --- a/src/actions.cc +++ b/src/actions.cc @@ -5,16 +5,23 @@ #endif #include "actions.hh" +#include "widget.hh" +#include "openbox.hh" +#include "client.hh" +#include "otk/display.hh" #include namespace ob { const unsigned int OBActions::DOUBLECLICKDELAY = 300; +const int OBActions::BUTTONS; OBActions::OBActions() - : _button(0), _enter_win(0) + : _button(0) { + for (int i=0; i0;) + _posqueue[i] = _posqueue[--i]; + _posqueue[0] = a; + a->button = e.button; + a->pos.setPoint(e.x_root, e.y_root); + + OBClient *c = Openbox::instance->findClient(e.window); + // if it's not defined, they should have clicked on the root window, so this + // area would be meaningless anyways + if (c) a->clientarea = c->area(); +} + +void OBActions::removePress(const XButtonEvent &e) +{ + ButtonPressAction *a = 0; + for (int i=0; ibutton == e.button) + a = _posqueue[i]; + if (a) // found one and removed it + _posqueue[i] = _posqueue[i+1]; + } + if (a) { // found one + _posqueue[BUTTONS-1] = a; + a->button = 0; + } +} + void OBActions::buttonPressHandler(const XButtonEvent &e) { + OtkEventHandler::buttonPressHandler(e); + insertPress(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); + OBWidget *w = dynamic_cast + (Openbox::instance->findHandler(e.window)); + + printf("GUILE: PRESS: win %lx type %d modifiers %u button %u time %lx\n", + (long)e.window, (w ? w->type():-1), e.state, e.button, e.time); if (_button) return; // won't count toward CLICK events @@ -40,9 +85,15 @@ void OBActions::buttonPressHandler(const XButtonEvent &e) void OBActions::buttonReleaseHandler(const XButtonEvent &e) { + OtkEventHandler::buttonReleaseHandler(e); + removePress(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); + OBWidget *w = dynamic_cast + (Openbox::instance->findHandler(e.window)); + + printf("GUILE: RELEASE: win %lx type %d, modifiers %u button %u time %lx\n", + (long)e.window, (w ? w->type():-1), e.state, e.button, e.time); // not for the button we're watching? if (_button != e.button) return; @@ -59,15 +110,15 @@ void OBActions::buttonReleaseHandler(const XButtonEvent &e) 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); + printf("GUILE: CLICK: win %lx type %d modifiers %u button %u time %lx\n", + (long)e.window, (w ? w->type():-1), e.state, e.button, 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); + printf("GUILE: DOUBLECLICK: win %lx type %d modifiers %u button %u time %lx\n", + (long)e.window, (w ? w->type():-1), e.state, e.button, e.time); // reset so you cant triple click for 2 doubleclicks _release.win = 0; @@ -82,41 +133,94 @@ void OBActions::buttonReleaseHandler(const XButtonEvent &e) } -void OBActions::enter(Window win, unsigned int modifiers) +void OBActions::enterHandler(const XCrossingEvent &e) { - _enter_win = win; - - (void)modifiers; + OtkEventHandler::enterHandler(e); + // 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)); + printf("GUILE: ENTER: win %lx type %d modifiers %u\n", + (long)e.window, (w ? w->type():-1), e.state); } -void OBActions::leave(unsigned int modifiers) +void OBActions::leaveHandler(const XCrossingEvent &e) { - (void)modifiers; + OtkEventHandler::leaveHandler(e); + // 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; + printf("GUILE: LEAVE: win %lx type %d modifiers %u\n", + (long)e.window, (w ? w->type():-1), e.state); } -void OBActions::drag(Window win, otk::Point delta, unsigned int modifiers, - unsigned int button, Time time) +void OBActions::keyPressHandler(const XKeyEvent &e) { - (void)win;(void)delta;(void)modifiers;(void)button;(void)time; + // XXX: run the KEY guile hook + OBWidget *w = dynamic_cast + (Openbox::instance->findHandler(e.window)); - // XXX: some guile shit... + printf("GUILE: KEY: win %lx type %d modifiers %u keycode %u\n", + (long)e.window, (w ? w->type():-1), e.state, e.keycode); } -void OBActions::key(Window win, unsigned int modifiers, unsigned int keycode) +void OBActions::motionHandler(const XMotionEvent &e) { - (void)win;(void)modifiers;(void)keycode; + 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; + } + } + + + OBWidget *w = dynamic_cast + (Openbox::instance->findHandler(e.window)); + + _dx = x_root - _posqueue[0]->pos.x(); + _dy = y_root - _posqueue[0]->pos.y(); + + // XXX: i can envision all sorts of crazy shit with this.. gestures, etc + printf("GUILE: MOTION: win %lx type %d modifiers %u x %d y %d\n", + (long)e.window, (w ? w->type():-1), e.state, _dx, _dy); + + OBClient *c = Openbox::instance->findClient(e.window); + if (w && c) { + switch (w->type()) { + case OBWidget::Type_Titlebar: + case OBWidget::Type_Label: + c->move(_posqueue[0]->clientarea.x() + _dx, + _posqueue[0]->clientarea.y() + _dy); + break; + case OBWidget::Type_LeftGrip: + c->resize(OBClient::TopRight, + _posqueue[0]->clientarea.width() - _dx, + _posqueue[0]->clientarea.height() + _dy); + break; + case OBWidget::Type_RightGrip: + c->resize(OBClient::TopLeft, + _posqueue[0]->clientarea.width() + _dx, + _posqueue[0]->clientarea.height() + _dy); + break; + default: + break; + } + } }