X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Factions.cc;h=65931fc6b7380fad54a3262f85d776faac07c764;hb=7c32ac2b3f0bfd02a1efea1d67e5ad1c3c5be93f;hp=6059f00d830a3e51df13ca8d86be03dab04b371a;hpb=997f94cf8657201ea9d1f2497e4ec4f56342e22f;p=chaz%2Fopenbox diff --git a/src/actions.cc b/src/actions.cc index 6059f00d..65931fc6 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,20 @@ void Actions::buttonPressHandler(const XButtonEvent &e) { otk::EventHandler::buttonPressHandler(e); insertPress(e); - - // run the PRESS python hook - 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 PRESS python hook // kill off the Button1Mask etc, only want the modifiers unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask | Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask); @@ -87,7 +94,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 +102,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 @@ -113,9 +120,31 @@ void Actions::buttonReleaseHandler(const XButtonEvent &e) otk::EventHandler::buttonReleaseHandler(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 + 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, context, + MouseAction::Release); + openbox->bindings()->fireButton(&data); // not for the button we're watching? if (_button != e.button) return; @@ -133,23 +162,13 @@ void Actions::buttonReleaseHandler(const XButtonEvent &e) 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(), - MouseAction::Click); + 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 && @@ -211,6 +230,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); @@ -226,7 +265,7 @@ void Actions::keyReleaseHandler(const XKeyEvent &e) 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, @@ -256,30 +295,35 @@ 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; - 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)) + if (!python_get_long("DRAG_THRESHOLD", &threshold)) threshold = 0; if (!(std::abs(dx) >= threshold || std::abs(dy) >= threshold)) return; // not at the threshold yet @@ -299,7 +343,7 @@ void Actions::motionHandler(const XMotionEvent &e) 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);