X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Factions.cc;h=716b033bfbbaf122af7d685fc922541f0e804cac;hb=40f3dfbaadef7e5b008d320ab92d47dbb63db1a9;hp=9660937dc9cce5729e72c9c7909d1971d6246556;hpb=77a8e11660edd66279f2d3def6de3768874ba780;p=chaz%2Fopenbox diff --git a/src/actions.cc b/src/actions.cc index 9660937d..716b033b 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,6 +7,8 @@ #include "actions.hh" #include "widget.hh" #include "openbox.hh" +#include "client.hh" +#include "python.hh" #include "otk/display.hh" #include @@ -14,14 +16,10 @@ namespace ob { const unsigned int OBActions::DOUBLECLICKDELAY = 300; -const int OBActions::BUTTONS; OBActions::OBActions() : _button(0) { - for (int i=0; i0;) - _posqueue[i] = _posqueue[--i]; - _posqueue[0] = a; - a->button = e.button; - a->pos.setPoint(e.x, e.y); -} - -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 + // run the PRESS guile 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); + 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 @@ -80,14 +51,14 @@ void OBActions::buttonPressHandler(const XButtonEvent &e) 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); + // 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 != e.button) return; @@ -103,16 +74,18 @@ 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 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) { - // 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 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; @@ -131,12 +104,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 guile hook + python_callback(Action_EnterWindow, e.window, + (OBWidget::WidgetType)(w ? w->type():-1), e.state); } @@ -144,23 +117,24 @@ 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 guile hook + python_callback(Action_LeaveWindow, e.window, + (OBWidget::WidgetType)(w ? w->type():-1), e.state); } 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); + // run the KEY guile hook + python_callback(Action_KeyPress, e.window, + (OBWidget::WidgetType)(w ? w->type():-1), + e.state, e.keycode); } @@ -168,15 +142,30 @@ void OBActions::motionHandler(const XMotionEvent &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)); - _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); + // 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); }