#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"
namespace ob {
-const unsigned int OBActions::DOUBLECLICKDELAY = 300;
const int OBActions::BUTTONS;
OBActions::OBActions()
// run the PRESS python hook
OBWidget *w = dynamic_cast<OBWidget*>
(Openbox::instance->findHandler(e.window));
+ assert(w); // everything should be a widget
-/* doCallback(Action_ButtonPress, e.window,
- (OBWidget::WidgetType)(w ? w->type():-1),
- e.state, e.button, e.x_root, e.y_root, e.time);*/
- if (w) {
- Openbox::instance->bindings()->fire(MousePress, w->type(), e.window,
- e.state, e.button,
- e.x_root, e.y_root, e.time);
- } else
- assert(false); // why isnt there a type?
+ // kill off the Button1Mask etc, only want the modifiers
+ unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask |
+ Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
+ 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);
+ }
}
OBWidget *w = dynamic_cast<OBWidget*>
(Openbox::instance->findHandler(e.window));
+ assert(w); // everything should be a widget
// not for the button we're watching?
if (_button != e.button) return;
return;
// run the CLICK python hook
-/* doCallback(Action_Click, e.window,
- (OBWidget::WidgetType)(w ? w->type():-1),
- e.state, e.button, e.x_root, e.y_root, e.time);*/
- if (w) {
- Openbox::instance->bindings()->fire(MouseClick, w->type(), e.window,
- e.state, e.button,
- e.x_root, e.y_root, e.time);
- } else
- assert(false); // why isnt there a type?
-
- if (e.time - _release.time < DOUBLECLICKDELAY &&
+ // kill off the Button1Mask etc, only want the modifiers
+ unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask |
+ Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
+ 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!!@*
+ long dblclick;
+ if (!python_get_long("double_click_delay", &dblclick))
+ dblclick = 300;
+
+ if (e.time - _release.time < (unsigned)dblclick &&
_release.win == e.window && _release.button == e.button) {
// run the DOUBLECLICK python hook
-/* doCallback(Action_DoubleClick, e.window,
- (OBWidget::WidgetType)(w ? w->type():-1),
- e.state, e.button, e.x_root, e.y_root, e.time);*/
- if (w) {
- Openbox::instance->bindings()->fire(MouseDoubleClick, w->type(),
- e.window, e.state, e.button,
- e.x_root, e.y_root, e.time);
- } else
- assert(false); // why isnt there a type?
+ data.action = MouseDoubleClick;
+ Openbox::instance->bindings()->fireButton(&data);
// reset so you cant triple click for 2 doubleclicks
_release.win = 0;
{
OtkEventHandler::enterHandler(e);
- OBWidget *w = dynamic_cast<OBWidget*>
- (Openbox::instance->findHandler(e.window));
-
// run the ENTER python hook
- doCallback(Action_EnterWindow, e.window,
- (OBWidget::WidgetType)(w ? w->type():-1), e.state, 0, 0, 0, 0);
+ 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);
- OBWidget *w = dynamic_cast<OBWidget*>
- (Openbox::instance->findHandler(e.window));
-
// run the LEAVE python hook
- doCallback(Action_LeaveWindow, e.window,
- (OBWidget::WidgetType)(w ? w->type():-1), e.state, 0, 0, 0, 0);
+ 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);
}
void OBActions::keyPressHandler(const XKeyEvent &e)
{
-// OBWidget *w = dynamic_cast<OBWidget*>
-// (Openbox::instance->findHandler(e.window));
-
- Openbox::instance->bindings()->fire(e.state, e.keycode, e.time);
+ 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(otk::OBDisplay::findScreen(e.root)->screen(),
+ 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;
}
}
- _dx = x_root - _posqueue[0]->pos.x(); _posqueue[0]->pos.setX(x_root);
- _dy = y_root - _posqueue[0]->pos.y(); _posqueue[0]->pos.setY(y_root);
-
OBWidget *w = dynamic_cast<OBWidget*>
(Openbox::instance->findHandler(e.window));
-
- // XXX: i can envision all sorts of crazy shit with this.. gestures, etc
- // maybe that should all be done via python tho.. (or radial menus!)
- // run the simple MOTION python hook for now...
-/* doCallback(Action_MouseMotion, e.window,
- (OBWidget::WidgetType)(w ? w->type():-1),
- e.state, (unsigned)-1, x_root, y_root, e.time);*/
- if (w) {
- Openbox::instance->bindings()->fire(MouseMotion, w->type(), e.window,
- e.state, _posqueue[0]->button,
- _dx, _dy, e.time);
- } else
- assert(false); // why isnt there a type?
+ 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;
+ 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)
{
- doCallback(Action_NewWindow, e.window, (OBWidget::WidgetType)-1,
- 0, 0, 0, 0, 0);
+ OtkEventHandler::mapRequestHandler(e);
+ // do this in OBScreen::manageWindow
}
void OBActions::unmapHandler(const XUnmapEvent &e)
{
- (void)e;
- doCallback(Action_CloseWindow, e.window, (OBWidget::WidgetType)-1,
- 0, 0, 0, 0, 0);
+ OtkEventHandler::unmapHandler(e);
+ // do this in OBScreen::unmanageWindow
}
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;
+ OtkEventHandler::destroyHandler(e);
+ // do this in OBScreen::unmanageWindow
}
-bool OBActions::unregisterCallback(ActionType action, PyObject *func)
+#ifdef XKB
+void OBActions::xkbHandler(const XkbEvent &e)
{
- if (action < 0 || action >= OBActions::NUM_ACTIONS) {
- return false;
- }
- if (!func)
- return false;
+ Window w;
+ int screen;
- 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);
+ 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;
}
- return true;
}
+#endif // XKB
-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;
}
-}
projects / chaz / openbox / blobdiff