X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Factions.cc;h=79b31a27630630d99adccdaccafde555c34fdf8e;hb=a132968424c96d9dc62d144c5e863a6810c0369d;hp=9660937dc9cce5729e72c9c7909d1971d6246556;hpb=77a8e11660edd66279f2d3def6de3768874ba780;p=chaz%2Fopenbox diff --git a/src/actions.cc b/src/actions.cc index 9660937d..79b31a27 100644 --- a/src/actions.cc +++ b/src/actions.cc @@ -1,4 +1,4 @@ -// -*- mode: C++; indent-tabs-mode: nil; -*- +// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*- #ifdef HAVE_CONFIG_H # include "../config.h" @@ -7,13 +7,15 @@ #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() @@ -21,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) @@ -64,12 +66,20 @@ void OBActions::buttonPressHandler(const XButtonEvent &e) OtkEventHandler::buttonPressHandler(e); insertPress(e); - // XXX: run the PRESS guile hook + // run the PRESS python hook 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); + 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 @@ -82,12 +92,9 @@ void OBActions::buttonReleaseHandler(const XButtonEvent &e) OtkEventHandler::buttonReleaseHandler(e); removePress(e); - // XXX: run the RELEASE guile hook 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); + assert(w); // everything should be a widget // not for the button we're watching? if (_button != e.button) return; @@ -103,17 +110,29 @@ 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 type %d modifiers %u button %u time %lx\n", - (long)e.window, (w ? w->type():-1), 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(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 < DOUBLECLICKDELAY && + if (e.time - _release.time < (unsigned)dblclick && _release.win == e.window && _release.button == e.button) { - // XXX: run the DOUBLECLICK guile hook - 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); - + // 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; @@ -124,6 +143,8 @@ void OBActions::buttonReleaseHandler(const XButtonEvent &e) _release.button = e.button; _release.time = e.time; } + + Py_DECREF((PyObject*)data); } @@ -131,12 +152,12 @@ void OBActions::enterHandler(const XCrossingEvent &e) { OtkEventHandler::enterHandler(e); - // XXX: run the ENTER guile hook - 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); + // run the ENTER python hook + 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); } @@ -144,40 +165,82 @@ void OBActions::leaveHandler(const XCrossingEvent &e) { OtkEventHandler::leaveHandler(e); - // XXX: run the LEAVE guile hook - OBWidget *w = dynamic_cast - (Openbox::instance->findHandler(e.window)); - - printf("GUILE: LEAVE: win %lx type %d modifiers %u\n", - (long)e.window, (w ? w->type():-1), e.state); + // run the LEAVE python hook + 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) { - // XXX: run the KEY guile hook - OBWidget *w = dynamic_cast - (Openbox::instance->findHandler(e.window)); - - printf("GUILE: KEY: win %lx type %d modifiers %u keycode %u\n", - (long)e.window, (w ? w->type():-1), 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(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; + + // 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(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); +} - _dx = e.x - _posqueue[0]->pos.x(); - _dy = e.y - _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); +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 +} }