#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"
void OBActions::insertPress(const XButtonEvent &e)
{
ButtonPressAction *a = _posqueue[BUTTONS - 1];
- for (int i=BUTTONS-1; i>0;)
- _posqueue[i] = _posqueue[--i];
+ // rm'd the last one, shift them all down one
+ for (int i = BUTTONS-1; i > 0; --i) {
+ _posqueue[i] = _posqueue[i-1];
+ }
_posqueue[0] = a;
a->button = e.button;
a->pos.setPoint(e.x_root, e.y_root);
void OBActions::removePress(const XButtonEvent &e)
{
+ int i;
ButtonPressAction *a = 0;
- for (int i=0; i<BUTTONS; ++i) {
- if (_posqueue[i]->button == e.button)
+ for (i=0; i<BUTTONS-1; ++i)
+ if (_posqueue[i]->button == e.button) {
a = _posqueue[i];
- if (a) // found one and removed it
+ break;
+ }
+ if (a) { // found one, remove it and shift the rest up one
+ for (; i < BUTTONS-1; ++i)
_posqueue[i] = _posqueue[i+1];
- }
- if (a) { // found one
_posqueue[BUTTONS-1] = a;
- a->button = 0;
}
+ _posqueue[BUTTONS-1]->button = 0;
}
void OBActions::buttonPressHandler(const XButtonEvent &e)
// 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);
+ }
}
// 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
- EventData *data = new_event_data(e.window, EventEnterWindow, e.state);
- Openbox::instance->bindings()->fireEvent(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
- EventData *data = new_event_data(e.window, EventLeaveWindow, e.state);
- Openbox::instance->bindings()->fireEvent(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);
}
// 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);
}
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)
// do this in OBScreen::unmanageWindow
}
+#ifdef XKB
+void OBActions::xkbHandler(const XkbEvent &e)
+{
+ Window w;
+ int screen;
+
+ 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
+
}
+