}
_posqueue[0] = a;
a->button = e.button;
- a->pos.setPoint(e.x_root, e.y_root);
+ a->pos = otk::Point(e.x_root, e.y_root);
Client *c = openbox->findClient(e.window);
if (c) a->clientarea = c->area();
else
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
(openbox->findHandler(e.window));
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;
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
screen = c->screen();
else
screen = otk::display->findScreen(e.root)->screen();
- EventData data(screen, c, EventEnterWindow, e.state);
+ EventData data(screen, c, EventAction::EnterWindow, e.state);
openbox->bindings()->fireEvent(&data);
}
screen = c->screen();
else
screen = otk::display->findScreen(e.root)->screen();
- EventData data(screen, c, EventLeaveWindow, e.state);
+ EventData data(screen, c, EventAction::LeaveWindow, e.state);
openbox->bindings()->fireEvent(&data);
}
void Actions::keyPressHandler(const XKeyEvent &e)
{
- printf("press\n");
otk::EventHandler::keyPressHandler(e);
// kill off the Button1Mask etc, only want the modifiers
Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
openbox->bindings()->
fireKey(otk::display->findScreen(e.root)->screen(),
- state, e.keycode, e.time, EventKeyPress);
+ state, e.keycode, e.time, KeyAction::Press);
}
void Actions::keyReleaseHandler(const XKeyEvent &e)
{
- printf("release\n");
otk::EventHandler::keyReleaseHandler(e);
// kill off the Button1Mask etc, only want the modifiers
Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
// remove from the state the mask of the modifier being released, if it is
- // a modifier key being released (XXX this is a little ugly..)
+ // a modifier key being released (this is a little ugly..)
const XModifierKeymap *map = otk::display->modifierMap();
const int mask_table[] = {
ShiftMask, LockMask, ControlMask, Mod1Mask,
openbox->bindings()->
fireKey(otk::display->findScreen(e.root)->screen(),
- state, e.keycode, e.time, EventKeyRelease);
+ state, e.keycode, e.time, KeyAction::Release);
}
// compress changes to a window into a single change
XEvent ce;
- while (XCheckTypedEvent(**otk::display, e.type, &ce)) {
- if (ce.xmotion.window != e.window) {
- XPutBackEvent(**otk::display, &ce);
- break;
- } else {
- x_root = e.x_root;
- y_root = e.y_root;
- }
+ while (XCheckTypedWindowEvent(**otk::display, e.window, e.type, &ce)) {
+ x_root = e.x_root;
+ y_root = e.y_root;
}
WidgetBase *w = dynamic_cast<WidgetBase*>
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))
+ if (!python_get_long("DRAG_THRESHOLD", &threshold))
threshold = 0;
if (!(std::abs(dx) >= threshold || std::abs(dy) >= threshold))
return; // not at the threshold yet
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);
+ 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);
}
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;
}