X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Factions.cc;h=50259c89e518f1223150b8a8473db24eefe50ab2;hb=745e840547b5443ecfb9b6f0a4f14b0d035d59c2;hp=d2b4ceef34344e95960e1129a5a435c43af234ef;hpb=3827c1a76e27865a9e2cc9da43c42399ea354e18;p=chaz%2Fopenbox diff --git a/src/actions.cc b/src/actions.cc index d2b4ceef..50259c89 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" @@ -9,6 +9,7 @@ #include "openbox.hh" #include "client.hh" #include "python.hh" +#include "bindings.hh" #include "otk/display.hh" #include @@ -16,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_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 + // 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); python_callback(Action_ButtonPress, e.window, (OBWidget::WidgetType)(w ? w->type():-1), - e.state, e.button, e.time); + e.state, e.button, e.x_root, e.y_root, e.time); if (_button) return; // won't count toward CLICK events @@ -90,14 +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 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 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; @@ -113,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 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 + 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 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; @@ -141,12 +105,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 + python_callback(Action_EnterWindow, e.window, + (OBWidget::WidgetType)(w ? w->type():-1), e.state); } @@ -154,23 +118,21 @@ 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 + 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)); +// 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); + Openbox::instance->bindings()->fire(e.window, e.state, e.keycode, e.time); } @@ -196,36 +158,24 @@ void OBActions::motionHandler(const XMotionEvent &e) 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; - } - } + // 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) +{ +} }