#include "otk/display.hh"
#include <stdio.h>
+#include <algorithm>
namespace ob {
const int Actions::BUTTONS;
Actions::Actions()
- : _button(0)
+ : _button(0),
+ _dragging(false)
{
for (int i=0; i<BUTTONS; ++i)
_posqueue[i] = new ButtonPressAction();
// run the PRESS python hook
WidgetBase *w = dynamic_cast<WidgetBase*>
(openbox->findHandler(e.window));
- assert(w); // everything should be a widget
+ if (!w) return;
// kill off the Button1Mask etc, only want the modifiers
unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask |
if (c)
screen = c->screen();
else
- screen = otk::Display::findScreen(e.root)->screen();
+ screen = otk::display->findScreen(e.root)->screen();
MouseData data(screen, c, e.time, state, e.button, w->mcontext(),
- MousePress);
+ MouseAction::Press);
openbox->bindings()->fireButton(&data);
if (_button) return; // won't count toward CLICK events
_button = e.button;
- if (w->mcontext() == MC_Window) {
+ if (w->mcontext() == MouseContext::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
WidgetBase *w = dynamic_cast<WidgetBase*>
(openbox->findHandler(e.window));
- assert(w); // everything should be a widget
+ if (!w) return;
+
+ // run the RELEASE python hook
+ // kill off the Button1Mask etc, only want the modifiers
+ unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask |
+ Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
+ int screen;
+ Client *c = openbox->findClient(e.window);
+ if (c)
+ screen = c->screen();
+ else
+ screen = otk::display->findScreen(e.root)->screen();
+ MouseData data(screen, c, e.time, state, e.button, w->mcontext(),
+ MouseAction::Release);
+ openbox->bindings()->fireButton(&data);
// not for the button we're watching?
if (_button != e.button) return;
_button = 0;
+ _dragging = false;
// find the area of the window
XWindowAttributes attr;
- if (!XGetWindowAttributes(otk::Display::display, e.window, &attr)) return;
+ if (!XGetWindowAttributes(**otk::display, e.window, &attr)) return;
// if not on the window any more, it isnt a CLICK
if (!(e.same_screen && e.x >= 0 && e.y >= 0 &&
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);
- int screen;
- Client *c = openbox->findClient(e.window);
- if (c)
- screen = c->screen();
- else
- screen = otk::Display::findScreen(e.root)->screen();
- MouseData data(screen, c, e.time, state, e.button, w->mcontext(),
- MouseClick);
+ data.action = MouseAction::Click;
openbox->bindings()->fireButton(&data);
// XXX: dont load this every time!!@*
long dblclick;
- if (!python_get_long("double_click_delay", &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
- data.action = MouseDoubleClick;
+ data.action = MouseAction::DoubleClick;
openbox->bindings()->fireButton(&data);
// reset so you cant triple click for 2 doubleclicks
if (c)
screen = c->screen();
else
- screen = otk::Display::findScreen(e.root)->screen();
- EventData data(screen, c, EventEnterWindow, e.state);
+ screen = otk::display->findScreen(e.root)->screen();
+ EventData data(screen, c, EventAction::EnterWindow, e.state);
openbox->bindings()->fireEvent(&data);
}
if (c)
screen = c->screen();
else
- screen = otk::Display::findScreen(e.root)->screen();
- EventData data(screen, c, EventLeaveWindow, e.state);
+ screen = otk::display->findScreen(e.root)->screen();
+ EventData data(screen, c, EventAction::LeaveWindow, e.state);
openbox->bindings()->fireEvent(&data);
}
unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask |
Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
openbox->bindings()->
- fireKey(otk::Display::findScreen(e.root)->screen(),
- state, e.keycode, e.time);
+ fireKey(otk::display->findScreen(e.root)->screen(),
+ state, e.keycode, e.time, KeyAction::Press);
+}
+
+
+void Actions::keyReleaseHandler(const XKeyEvent &e)
+{
+ otk::EventHandler::keyReleaseHandler(e);
+
+ // kill off the Button1Mask etc, only want the modifiers
+ unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask |
+ Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
+
+ // remove from the state the mask of the modifier being released, if it is
+ // a modifier key being released (this is a little ugly..)
+ const XModifierKeymap *map = otk::display->modifierMap();
+ const int mask_table[] = {
+ ShiftMask, LockMask, ControlMask, Mod1Mask,
+ Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
+ };
+ KeyCode *kp = map->modifiermap;
+ for (int i = 0, n = sizeof(mask_table)/sizeof(mask_table[0]); i < n; ++i) {
+ for (int k = 0; k < map->max_keypermod; ++k) {
+ if (*kp == e.keycode) { // found the keycode
+ state &= ~mask_table[i]; // remove the mask for it
+ i = n; // cause the first loop to break;
+ break; // get outta here!
+ }
+ ++kp;
+ }
+ }
+
+ openbox->bindings()->
+ fireKey(otk::display->findScreen(e.root)->screen(),
+ state, e.keycode, e.time, KeyAction::Release);
}
// compress changes to a window into a single change
XEvent ce;
- while (XCheckTypedEvent(otk::Display::display, e.type, &ce)) {
+ while (XCheckTypedEvent(**otk::display, e.type, &ce)) {
if (ce.xmotion.window != e.window) {
- XPutBackEvent(otk::Display::display, &ce);
+ XPutBackEvent(**otk::display, &ce);
break;
} else {
x_root = e.x_root;
WidgetBase *w = dynamic_cast<WidgetBase*>
(openbox->findHandler(e.window));
- assert(w); // everything should be a widget
+ if (!w) return;
+
+ if (!_dragging) {
+ long threshold;
+ int dx = x_root - _posqueue[0]->pos.x();
+ int dy = y_root - _posqueue[0]->pos.y();
+ // XXX: dont get this from python every time!
+ if (!python_get_long("DRAG_THRESHOLD", &threshold))
+ threshold = 0;
+ if (!(std::abs(dx) >= threshold || std::abs(dy) >= threshold))
+ return; // not at the threshold yet
+ }
+ _dragging = true; // in a drag now
+
+ // check if the movement is more than the threshold
// run the MOTION python hook
// kill off the Button1Mask etc, only want the modifiers
if (c)
screen = c->screen();
else
- screen = otk::Display::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);
+ screen = otk::display->findScreen(e.root)->screen();
+ MouseData data(screen, c, e.time, state, button, w->mcontext(),
+ MouseAction::Motion, x_root, y_root,
+ _posqueue[0]->pos, _posqueue[0]->clientarea);
openbox->bindings()->fireButton(&data);
}
-void Actions::mapRequestHandler(const XMapRequestEvent &e)
-{
- otk::EventHandler::mapRequestHandler(e);
- // do this in Screen::manageWindow
-}
-
-void Actions::unmapHandler(const XUnmapEvent &e)
-{
- otk::EventHandler::unmapHandler(e);
- // do this in Screen::unmanageWindow
-}
-
-void Actions::destroyHandler(const XDestroyWindowEvent &e)
-{
- otk::EventHandler::destroyHandler(e);
- // do this in Screen::unmanageWindow
-}
-
#ifdef XKB
void Actions::xkbHandler(const XkbEvent &e)
{
screen = c->screen();
else
screen = openbox->focusedScreen()->number();
- EventData data(screen, c, EventBell, 0);
+ EventData data(screen, c, EventAction::Bell, 0);
openbox->bindings()->fireEvent(&data);
break;
}
projects / chaz / openbox / blobdiff