X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Factions.cc;h=50259c89e518f1223150b8a8473db24eefe50ab2;hb=745e840547b5443ecfb9b6f0a4f14b0d035d59c2;hp=af33f51c60d562914dd31cf7db99a2e4b4099f86;hpb=772ff27864b724c884ca5681fedc42711c63ec82;p=chaz%2Fopenbox diff --git a/src/actions.cc b/src/actions.cc index af33f51c..50259c89 100644 --- a/src/actions.cc +++ b/src/actions.cc @@ -1,10 +1,15 @@ -// -*- 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 @@ -12,14 +17,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 - 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)); + + 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 @@ -75,11 +52,14 @@ 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)); + + // run the RELEASE python 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; @@ -95,17 +75,19 @@ 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 + 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 modifiers %u button %u time %lx\n", - (long)e.window, e.state, e.button, e.time); - + // run the DOUBLECLICK python 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; @@ -123,8 +105,12 @@ 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); + OBWidget *w = dynamic_cast + (Openbox::instance->findHandler(e.window)); + + // run the ENTER python hook + python_callback(Action_EnterWindow, e.window, + (OBWidget::WidgetType)(w ? w->type():-1), e.state); } @@ -132,26 +118,64 @@ 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); + OBWidget *w = dynamic_cast + (Openbox::instance->findHandler(e.window)); + + // run the LEAVE python 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 - printf("GUILE: KEY: win %lx modifiers %u keycode %u\n", - (long)e.window, e.state, e.keycode); +// OBWidget *w = dynamic_cast +// (Openbox::instance->findHandler(e.window)); + + Openbox::instance->bindings()->fire(e.window, e.state, e.keycode, e.time); } 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)); + // 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()); + // maybe that should all be done via python tho.. (or radial menus!) + // run the simple MOTION python 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); } +void OBActions::mapRequestHandler(const XMapRequestEvent &e) +{ +} + +void OBActions::unmapHandler(const XUnmapEvent &e) +{ +} + +void OBActions::destroyHandler(const XDestroyWindowEvent &e) +{ +} }