otk::EventHandler::buttonPressHandler(e);
insertPress(e);
+ printf("press queue %u pressed %u\n", _button, e.button);
+
MouseContext::MC context;
EventHandler *h = openbox->findHandler(e.window);
Frame *f = dynamic_cast<Frame*>(h);
else
return; // not a valid mouse context
+ if (_button) {
+ unsigned int mask;
+ switch(_button) {
+ case Button1: mask = Button1Mask; break;
+ case Button2: mask = Button2Mask; break;
+ case Button3: mask = Button3Mask; break;
+ case Button4: mask = Button4Mask; break;
+ case Button5: mask = Button5Mask; break;
+ default: assert(false); return; // unhandled button
+ }
+ // was the button released but we didnt get the event? (pointergrabs cause
+ // this)
+ if (!(e.state & mask))
+ _button = 0;
+ }
+
// run the PRESS python hook
// kill off the Button1Mask etc, only want the modifiers
unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask |
void Actions::buttonReleaseHandler(const XButtonEvent &e)
{
otk::EventHandler::buttonReleaseHandler(e);
- removePress(e);
+ //removePress(e);
MouseContext::MC context;
EventHandler *h = openbox->findHandler(e.window);
data.action = MouseAction::Click;
openbox->bindings()->fireButton(&data);
-
- // XXX: dont load this every time!!@*
- long dblclick;
- if (!python_get_long("DOUBLE_CLICK_DELAY", &dblclick))
- dblclick = 300;
-
+ long dblclick = openbox->screen(screen)->config().double_click_delay;
if (e.time - _release.time < (unsigned)dblclick &&
_release.win == e.window && _release.button == e.button) {
y_root = e.y_root;
}
+ int screen;
+ Client *c = openbox->findClient(e.window);
+ if (c)
+ screen = c->screen();
+ else
+ screen = otk::display->findScreen(e.root)->screen();
+
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;
+ long threshold = openbox->screen(screen)->config().drag_threshold;
if (!(std::abs(dx) >= threshold || std::abs(dy) >= threshold))
return; // not at the threshold yet
}
unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask |
Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
unsigned int button = _posqueue[0]->button;
- 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, button, context,
MouseAction::Motion, x_root, y_root,
_posqueue[0]->pos, _posqueue[0]->clientarea);