X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Factions.cc;h=c340d64b7c4918a417011470b15d2a29a5c8c29e;hb=d2a1ecb1b50902d262a74e347203a36a961e1d92;hp=28a5756b6ad8433e278b99475fd1f0a170c995e1;hpb=220b5c40f91c6509951ccd0d506a9bd77d9d6bac;p=chaz%2Fopenbox diff --git a/src/actions.cc b/src/actions.cc index 28a5756b..c340d64b 100644 --- a/src/actions.cc +++ b/src/actions.cc @@ -1,19 +1,17 @@ // -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*- -#ifdef HAVE_CONFIG_H -# include "../config.h" -#endif +#include "config.h" #include "actions.hh" -#include "widgetbase.hh" #include "openbox.hh" #include "client.hh" +#include "frame.hh" #include "screen.hh" #include "python.hh" #include "bindings.hh" #include "otk/display.hh" -#include +#include #include namespace ob { @@ -44,8 +42,9 @@ void Actions::insertPress(const XButtonEvent &e) _posqueue[i] = _posqueue[i-1]; } _posqueue[0] = a; + a->win = e.window; 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(); @@ -72,12 +71,38 @@ void Actions::buttonPressHandler(const XButtonEvent &e) { 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(h); + if (f) + context= f->mouseContext(e.window); + else if (dynamic_cast(h)) + context = MouseContext::Window; + else if (dynamic_cast(h)) + context = MouseContext::Root; + 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 - WidgetBase *w = dynamic_cast - (openbox->findHandler(e.window)); - if (!w) return; - // kill off the Button1Mask etc, only want the modifiers unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask | Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask); @@ -87,7 +112,7 @@ void Actions::buttonPressHandler(const XButtonEvent &e) screen = c->screen(); else screen = otk::display->findScreen(e.root)->screen(); - MouseData data(screen, c, e.time, state, e.button, w->mcontext(), + MouseData data(screen, c, e.time, state, e.button, context, MouseAction::Press); openbox->bindings()->fireButton(&data); @@ -95,7 +120,7 @@ void Actions::buttonPressHandler(const XButtonEvent &e) _button = e.button; - if (w->mcontext() == MouseContext::Window) { + if (context == 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 @@ -111,11 +136,19 @@ void Actions::buttonPressHandler(const XButtonEvent &e) void Actions::buttonReleaseHandler(const XButtonEvent &e) { otk::EventHandler::buttonReleaseHandler(e); - removePress(e); + //removePress(e); - WidgetBase *w = dynamic_cast - (openbox->findHandler(e.window)); - if (!w) return; + MouseContext::MC context; + EventHandler *h = openbox->findHandler(e.window); + Frame *f = dynamic_cast(h); + if (f) + context= f->mouseContext(e.window); + else if (dynamic_cast(h)) + context = MouseContext::Window; + else if (dynamic_cast(h)) + context = MouseContext::Root; + else + return; // not a valid mouse context // run the RELEASE python hook // kill off the Button1Mask etc, only want the modifiers @@ -127,7 +160,7 @@ void Actions::buttonReleaseHandler(const XButtonEvent &e) screen = c->screen(); else screen = otk::display->findScreen(e.root)->screen(); - MouseData data(screen, c, e.time, state, e.button, w->mcontext(), + MouseData data(screen, c, e.time, state, e.button, context, MouseAction::Release); openbox->bindings()->fireButton(&data); @@ -150,12 +183,7 @@ void Actions::buttonReleaseHandler(const XButtonEvent &e) 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) { @@ -215,6 +243,26 @@ void Actions::keyPressHandler(const XKeyEvent &e) // kill off the Button1Mask etc, only want the modifiers unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask | Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask); + + // add to the state the mask of the modifier being pressed, if it is + // a modifier key being pressed (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]; // add 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::Press); @@ -260,31 +308,40 @@ void Actions::motionHandler(const XMotionEvent &e) if (!e.same_screen) return; // this just gets stupid - int x_root = e.x_root, y_root = e.y_root; + if (e.window != _posqueue[0]->win) return; + MouseContext::MC context; + EventHandler *h = openbox->findHandler(e.window); + Frame *f = dynamic_cast(h); + if (f) + context= f->mouseContext(e.window); + else if (dynamic_cast(h)) + context = MouseContext::Window; + else if (dynamic_cast(h)) + context = MouseContext::Root; + else + return; // not a valid mouse context + + int x_root = e.x_root, y_root = e.y_root; + // 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 - (openbox->findHandler(e.window)); - if (!w) return; + 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 } @@ -297,13 +354,7 @@ void Actions::motionHandler(const XMotionEvent &e) 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, w->mcontext(), + MouseData data(screen, c, e.time, state, button, context, MouseAction::Motion, x_root, y_root, _posqueue[0]->pos, _posqueue[0]->clientarea); openbox->bindings()->fireButton(&data);