-// -*- mode: C++; indent-tabs-mode: nil; -*-
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
#ifdef HAVE_CONFIG_H
# include "../config.h"
#include "openbox.hh"
#include "client.hh"
#include "python.hh"
+#include "bindings.hh"
#include "otk/display.hh"
#include <stdio.h>
{
for (int i=0; i<BUTTONS; ++i)
_posqueue[i] = new ButtonPressAction();
-
- // XXX: load a configuration out of somewhere
-
}
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();
}
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);
- python_callback(Action_ButtonPress, e.window,
- (OBWidget::WidgetType)(w ? w->type():-1),
- e.state, e.button, e.time);
+ assert(w); // everything should be a widget
+
+ 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()->fire(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
+ 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()->fire(data);
+
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
+ data->action = MouseDoubleClick;
+ Openbox::instance->bindings()->fire(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
+ doCallback(Action_EnterWindow, e.window,
+ (OBWidget::WidgetType)(w ? w->type():-1), e.state, 0, 0, 0, 0);
}
{
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
+ doCallback(Action_LeaveWindow, e.window,
+ (OBWidget::WidgetType)(w ? w->type():-1), e.state, 0, 0, 0, 0);
}
void OBActions::keyPressHandler(const XKeyEvent &e)
{
- // XXX: run the KEY guile hook
- OBWidget *w = dynamic_cast<OBWidget*>
- (Openbox::instance->findHandler(e.window));
+// OBWidget *w = dynamic_cast<OBWidget*>
+// (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);
+ unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask |
+ Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
+ Openbox::instance->bindings()->fire(state, e.keycode, e.time);
}
}
}
-
OBWidget *w = dynamic_cast<OBWidget*>
(Openbox::instance->findHandler(e.window));
+ assert(w); // everything should be a widget
+
+ // run the MOTION python hook
+ 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()->fire((ButtonData*)data);
+ Py_DECREF((PyObject*)data);
+}
- _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);
+void OBActions::mapRequestHandler(const XMapRequestEvent &e)
+{
+ doCallback(Action_NewWindow, e.window, (OBWidget::WidgetType)-1,
+ 0, 0, 0, 0, 0);
+}
- 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:
+void OBActions::unmapHandler(const XUnmapEvent &e)
+{
+ (void)e;
+ doCallback(Action_CloseWindow, e.window, (OBWidget::WidgetType)-1,
+ 0, 0, 0, 0, 0);
+}
+
+void OBActions::destroyHandler(const XDestroyWindowEvent &e)
+{
+ (void)e;
+ doCallback(Action_CloseWindow, e.window, (OBWidget::WidgetType)-1,
+ 0, 0, 0, 0, 0);
+}
+
+void OBActions::doCallback(ActionType action, Window window,
+ OBWidget::WidgetType type, unsigned int state,
+ unsigned int button, int xroot, int yroot,
+ Time time)
+{
+ std::pair<CallbackMap::iterator, CallbackMap::iterator> it_pair =
+ _callbacks.equal_range(action);
+
+ CallbackMap::iterator it;
+// for (it = it_pair.first; it != it_pair.second; ++it)
+// python_callback(it->second, action, window, type, state,
+// button, xroot, yroot, time);
+ // XXX do a callback
+}
+
+bool OBActions::registerCallback(ActionType action, PyObject *func,
+ bool atfront)
+{
+ if (action < 0 || action >= OBActions::NUM_ACTIONS) {
+ return false;
+ }
+ if (!func)
+ return false;
+
+ std::pair<CallbackMap::iterator, CallbackMap::iterator> it_pair =
+ _callbacks.equal_range(action);
+
+ CallbackMap::iterator it;
+ for (it = it_pair.first; it != it_pair.second; ++it)
+ if (it->second == func)
+ return true; // already in there
+ if (atfront)
+ _callbacks.insert(_callbacks.begin(), CallbackMapPair(action, func));
+ else
+ _callbacks.insert(CallbackMapPair(action, func));
+ Py_INCREF(func);
+ return true;
+}
+
+bool OBActions::unregisterCallback(ActionType action, PyObject *func)
+{
+ if (action < 0 || action >= OBActions::NUM_ACTIONS) {
+ return false;
+ }
+ if (!func)
+ return false;
+
+ std::pair<CallbackMap::iterator, CallbackMap::iterator> it_pair =
+ _callbacks.equal_range(action);
+
+ CallbackMap::iterator it;
+ for (it = it_pair.first; it != it_pair.second; ++it)
+ if (it->second == func)
break;
- }
+ if (it != it_pair.second) { // its been registered before
+ Py_DECREF(func);
+ _callbacks.erase(it);
}
+ return true;
}
+bool OBActions::unregisterAllCallbacks(ActionType action)
+{
+ if (action < 0 || action >= OBActions::NUM_ACTIONS) {
+ return false;
+ }
+
+ while (!_callbacks.empty()) {
+ CallbackMap::iterator it = _callbacks.begin();
+ Py_DECREF(it->second);
+ _callbacks.erase(it);
+ }
+ return true;
+}
}