#endif
#include "actions.hh"
-#include "widget.hh"
+#include "widgetbase.hh"
#include "openbox.hh"
#include "client.hh"
+#include "screen.hh"
#include "python.hh"
#include "bindings.hh"
#include "otk/display.hh"
{
for (int i=0; i<BUTTONS; ++i)
_posqueue[i] = new ButtonPressAction();
-
- for (int i = 0; i < NUM_EVENTS; ++i)
- _callback[i] = 0;
}
(Openbox::instance->findHandler(e.window));
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);
+ int screen;
+ OBClient *c = Openbox::instance->findClient(e.window);
+ if (c)
+ screen = c->screen();
+ else
+ screen = otk::OBDisplay::findScreen(e.root)->screen();
+ MouseData data(screen, c, e.time, state, e.button, w->mcontext(),
+ MousePress);
+ Openbox::instance->bindings()->fireButton(&data);
if (_button) return; // won't count toward CLICK events
_button = e.button;
+
+ if (w->mcontext() == MC_Window) {
+ /*
+ Because of how events are grabbed on the client window, we can't get
+ ButtonRelease events, so instead we simply manufacture them here, so that
+ clicks/doubleclicks etc still work.
+ */
+ //XButtonEvent ev = e;
+ //ev.type = ButtonRelease;
+ buttonReleaseHandler(e);
+ }
}
return;
// 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);
+ int screen;
+ OBClient *c = Openbox::instance->findClient(e.window);
+ if (c)
+ screen = c->screen();
+ else
+ screen = otk::OBDisplay::findScreen(e.root)->screen();
+ MouseData data(screen, c, e.time, state, e.button, w->mcontext(),
+ MouseClick);
+ Openbox::instance->bindings()->fireButton(&data);
// XXX: dont load this every time!!@*
_release.win == e.window && _release.button == e.button) {
// run the DOUBLECLICK python hook
- data->action = MouseDoubleClick;
- Openbox::instance->bindings()->fireButton(data);
+ data.action = MouseDoubleClick;
+ Openbox::instance->bindings()->fireButton(&data);
// reset so you cant triple click for 2 doubleclicks
_release.win = 0;
_release.button = e.button;
_release.time = e.time;
}
-
- Py_DECREF((PyObject*)data);
}
OtkEventHandler::enterHandler(e);
// run the ENTER python hook
- if (_callback[EventEnterWindow]) {
- EventData *data = new_event_data(e.window, EventEnterWindow, e.state);
- python_callback(_callback[EventEnterWindow], (PyObject*)data);
- Py_DECREF((PyObject*)data);
- }
+ int screen;
+ OBClient *c = Openbox::instance->findClient(e.window);
+ if (c)
+ screen = c->screen();
+ else
+ screen = otk::OBDisplay::findScreen(e.root)->screen();
+ EventData data(screen, c, EventEnterWindow, e.state);
+ Openbox::instance->bindings()->fireEvent(&data);
}
OtkEventHandler::leaveHandler(e);
// run the LEAVE python hook
- if (_callback[EventLeaveWindow]) {
- EventData *data = new_event_data(e.window, EventLeaveWindow, e.state);
- python_callback(_callback[EventLeaveWindow], (PyObject*)data);
- Py_DECREF((PyObject*)data);
- }
+ int screen;
+ OBClient *c = Openbox::instance->findClient(e.window);
+ if (c)
+ screen = c->screen();
+ else
+ screen = otk::OBDisplay::findScreen(e.root)->screen();
+ EventData data(screen, c, EventLeaveWindow, e.state);
+ Openbox::instance->bindings()->fireEvent(&data);
}
{
OtkEventHandler::keyPressHandler(e);
+ // 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);
+ Openbox::instance->bindings()->
+ fireKey(otk::OBDisplay::findScreen(e.root)->screen(),
+ state, e.keycode, e.time);
}
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);
+ int screen;
+ OBClient *c = Openbox::instance->findClient(e.window);
+ if (c)
+ screen = c->screen();
+ else
+ screen = otk::OBDisplay::findScreen(e.root)->screen();
+ MouseData data(screen, c, e.time, state, button, w->mcontext(), MouseMotion,
+ x_root, y_root, _posqueue[0]->pos, _posqueue[0]->clientarea);
+ Openbox::instance->bindings()->fireButton(&data);
}
void OBActions::mapRequestHandler(const XMapRequestEvent &e)
{
OtkEventHandler::mapRequestHandler(e);
-
- if (_callback[EventNewWindow]) {
- EventData *data = new_event_data(e.window, EventNewWindow, 0);
- python_callback(_callback[EventNewWindow], (PyObject*)data);
- Py_DECREF((PyObject*)data);
- }
+ // do this in OBScreen::manageWindow
}
void OBActions::unmapHandler(const XUnmapEvent &e)
{
OtkEventHandler::unmapHandler(e);
-
- if (_callback[EventCloseWindow]) {
- EventData *data = new_event_data(e.window, EventCloseWindow, 0);
- python_callback(_callback[EventCloseWindow], (PyObject*)data);
- Py_DECREF((PyObject*)data);
- }
+ // do this in OBScreen::unmanageWindow
}
void OBActions::destroyHandler(const XDestroyWindowEvent &e)
{
OtkEventHandler::destroyHandler(e);
-
- if (_callback[EventCloseWindow]) {
- EventData *data = new_event_data(e.window, EventCloseWindow, 0);
- python_callback(_callback[EventCloseWindow], (PyObject*)data);
- Py_DECREF((PyObject*)data);
- }
+ // do this in OBScreen::unmanageWindow
}
-bool OBActions::bind(EventAction action, PyObject *func)
+#ifdef XKB
+void OBActions::xkbHandler(const XkbEvent &e)
{
- if (action < 0 || action >= NUM_EVENTS) {
- return false;
- }
-
- Py_XDECREF(_callback[action]);
- _callback[action] = func;
- Py_INCREF(func);
- return true;
-}
-
-bool OBActions::unbind(EventAction action)
-{
- if (action < 0 || action >= NUM_EVENTS) {
- return false;
- }
+ Window w;
+ int screen;
- Py_XDECREF(_callback[action]);
- _callback[action] = 0;
- return true;
-}
-
-void OBActions::unbindAll()
-{
- for (int i = 0; i < NUM_EVENTS; ++i) {
- Py_XDECREF(_callback[i]);
- _callback[i] = 0;
+ OtkEventHandler::xkbHandler(e);
+
+ switch (((XkbAnyEvent*)&e)->xkb_type) {
+ case XkbBellNotify:
+ w = ((XkbBellNotifyEvent*)&e)->window;
+ OBClient *c = Openbox::instance->findClient(w);
+ if (c)
+ screen = c->screen();
+ else
+ screen = Openbox::instance->focusedScreen()->number();
+ EventData data(screen, c, EventBell, 0);
+ Openbox::instance->bindings()->fireEvent(&data);
+ break;
}
}
+#endif // XKB
}
+