-// -*- mode: C++; indent-tabs-mode: nil; -*-
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
#ifdef HAVE_CONFIG_H
# include "../config.h"
#include "widget.hh"
#include "openbox.hh"
#include "client.hh"
+#include "python.hh"
+#include "bindings.hh"
#include "otk/display.hh"
#include <stdio.h>
namespace ob {
-const unsigned int OBActions::DOUBLECLICKDELAY = 300;
const int OBActions::BUTTONS;
OBActions::OBActions()
{
for (int i=0; i<BUTTONS; ++i)
_posqueue[i] = new ButtonPressAction();
-
- // XXX: load a configuration out of somewhere
-
}
_posqueue[i] = _posqueue[--i];
_posqueue[0] = a;
a->button = 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)
OtkEventHandler::buttonPressHandler(e);
insertPress(e);
- // XXX: run the PRESS guile hook
+ // run the PRESS python hook
OBWidget *w = dynamic_cast<OBWidget*>
(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(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
OtkEventHandler::buttonReleaseHandler(e);
removePress(e);
- // XXX: run the RELEASE guile hook
OBWidget *w = dynamic_cast<OBWidget*>
(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;
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(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;
_release.button = e.button;
_release.time = e.time;
}
+
+ Py_DECREF((PyObject*)data);
}
{
OtkEventHandler::enterHandler(e);
- // XXX: run the ENTER guile hook
- OBWidget *w = dynamic_cast<OBWidget*>
- (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(e.window, EventEnterWindow, e.state);
+ Openbox::instance->bindings()->fireEvent(data);
+ Py_DECREF((PyObject*)data);
}
{
OtkEventHandler::leaveHandler(e);
- // XXX: run the LEAVE guile hook
- OBWidget *w = dynamic_cast<OBWidget*>
- (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(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<OBWidget*>
- (Openbox::instance->findHandler(e.window));
+ OtkEventHandler::keyPressHandler(e);
- printf("GUILE: KEY: win %lx type %d modifiers %u keycode %u\n",
- (long)e.window, (w ? w->type():-1), e.state, e.keycode);
+ // 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
+ 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<OBWidget*>
(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);
+}
- _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);
-
- if (w && (w->type() == OBWidget::Type_Titlebar ||
- w->type() == OBWidget::Type_Label)) {
- OBClient *c = Openbox::instance->findClient(e.window);
- if (c) c->move(c->area().x() + _dx, c->area().y() + _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
+}
}
projects / chaz / openbox / blobdiff