X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Factions.cc;h=1d4a5bb691a3ce4cbe4fbaef8dd62da6277a04fa;hb=40449e199dfeab57e8d147e07989aef339a7da59;hp=b83b521dd1794f6b96a0efe2cad72a0b4f77dd3a;hpb=4e0b5fdef451c605f563d137b024134a68c6d6de;p=chaz%2Fopenbox diff --git a/src/actions.cc b/src/actions.cc index b83b521d..1d4a5bb6 100644 --- a/src/actions.cc +++ b/src/actions.cc @@ -1,17 +1,21 @@ -// -*- 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 namespace ob { -const unsigned int OBActions::DOUBLECLICKDELAY = 300; const int OBActions::BUTTONS; OBActions::OBActions() @@ -19,9 +23,6 @@ OBActions::OBActions() { for (int i=0; ibutton = e.button; - a->pos.setPoint(e.x, e.y); + a->pos.setPoint(e.x_root, e.y_root); + + OBClient *c = Openbox::instance->findClient(e.window); + if (c) a->clientarea = c->area(); } void OBActions::removePress(const XButtonEvent &e) @@ -62,9 +66,18 @@ 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); + // run the PRESS python hook + OBWidget *w = dynamic_cast + (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()->fireButton(data); + Py_DECREF((PyObject*)data); if (_button) return; // won't count toward CLICK events @@ -77,9 +90,9 @@ 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)); + assert(w); // everything should be a widget // not for the button we're watching? if (_button != e.button) return; @@ -95,17 +108,27 @@ 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 + // 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()->fireButton(data); + - if (e.time - _release.time < DOUBLECLICKDELAY && - _release.win == e.window && _release.button == e.button) { + // XXX: dont load this every time!!@* + long dblclick; + if (!python_get_long("double_click_delay", &dblclick)) + dblclick = 300; - // 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); + 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()->fireButton(data); + // reset so you cant triple click for 2 doubleclicks _release.win = 0; _release.button = 0; @@ -116,6 +139,8 @@ void OBActions::buttonReleaseHandler(const XButtonEvent &e) _release.button = e.button; _release.time = e.time; } + + Py_DECREF((PyObject*)data); } @@ -123,8 +148,10 @@ void OBActions::enterHandler(const XCrossingEvent &e) { OtkEventHandler::enterHandler(e); - // XXX: run the ENTER guile hook - printf("GUILE: ENTER: win %lx modifiers %u\n", (long)e.window, e.state); + // run the ENTER python hook + EventData *data = new_event_data(e.window, EventEnterWindow, e.state); + Openbox::instance->bindings()->fireEvent(data); + Py_DECREF((PyObject*)data); } @@ -132,28 +159,77 @@ void OBActions::leaveHandler(const XCrossingEvent &e) { OtkEventHandler::leaveHandler(e); - // XXX: run the LEAVE guile hook - printf("GUILE: LEAVE: win %lx modifiers %u\n", (long)e.window, e.state); + // run the LEAVE python hook + 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) { - // XXX: run the KEY guile hook - printf("GUILE: KEY: win %lx modifiers %u keycode %u\n", - (long)e.window, e.state, e.keycode); + 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()->fireKey(state, e.keycode, e.time); } void OBActions::motionHandler(const XMotionEvent &e) { + OtkEventHandler::motionHandler(e); + if (!e.same_screen) return; // this just gets stupid - // XXX: i can envision all sorts of crazy shit with this.. gestures, etc - printf("GUILE: MOTION: win %lx modifiers %u x %d y %d\n", - (long)e.window, e.state, - e.x - _posqueue[0]->pos.x(), e.y - _posqueue[0]->pos.y()); + 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)); + 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(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) +{ + OtkEventHandler::mapRequestHandler(e); + // do this in OBScreen::manageWindow } +void OBActions::unmapHandler(const XUnmapEvent &e) +{ + OtkEventHandler::unmapHandler(e); + // do this in OBScreen::unmanageWindow +} + +void OBActions::destroyHandler(const XDestroyWindowEvent &e) +{ + OtkEventHandler::destroyHandler(e); + // do this in OBScreen::unmanageWindow +} }