X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Factions.cc;h=59aa1a19a20e2af7a22fb61f36723866dd597dab;hb=a765df7fa67ec4346179ade2cfb8f337286c88d7;hp=73f6317bac1d48e3bd80513a64f37b1ee56acdf5;hpb=77ab46d1e35d48e73c201e6de88b26f48bb06425;p=chaz%2Fopenbox diff --git a/src/actions.cc b/src/actions.cc index 73f6317b..59aa1a19 100644 --- a/src/actions.cc +++ b/src/actions.cc @@ -14,13 +14,15 @@ #include "otk/display.hh" #include +#include namespace ob { const int Actions::BUTTONS; Actions::Actions() - : _button(0) + : _button(0), + _dragging(false) { for (int i=0; ibutton = e.button; a->pos.setPoint(e.x_root, e.y_root); - Client *c = Openbox::instance->findClient(e.window); + Client *c = openbox->findClient(e.window); if (c) a->clientarea = c->area(); } @@ -73,27 +75,27 @@ void Actions::buttonPressHandler(const XButtonEvent &e) // run the PRESS python hook WidgetBase *w = dynamic_cast - (Openbox::instance->findHandler(e.window)); - assert(w); // everything should be a widget + (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); int screen; - Client *c = Openbox::instance->findClient(e.window); + Client *c = openbox->findClient(e.window); 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); - Openbox::instance->bindings()->fireButton(&data); + 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 @@ -112,17 +114,32 @@ void Actions::buttonReleaseHandler(const XButtonEvent &e) removePress(e); WidgetBase *w = dynamic_cast - (Openbox::instance->findHandler(e.window)); - assert(w); // everything should be a widget + (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; _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 && @@ -130,18 +147,8 @@ 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::instance->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); - Openbox::instance->bindings()->fireButton(&data); + data.action = MouseAction::Click; + openbox->bindings()->fireButton(&data); // XXX: dont load this every time!!@* @@ -153,8 +160,8 @@ void Actions::buttonReleaseHandler(const XButtonEvent &e) _release.win == e.window && _release.button == e.button) { // run the DOUBLECLICK python hook - data.action = MouseDoubleClick; - Openbox::instance->bindings()->fireButton(&data); + data.action = MouseAction::DoubleClick; + openbox->bindings()->fireButton(&data); // reset so you cant triple click for 2 doubleclicks _release.win = 0; @@ -175,13 +182,13 @@ void Actions::enterHandler(const XCrossingEvent &e) // run the ENTER python hook int screen; - Client *c = Openbox::instance->findClient(e.window); + Client *c = openbox->findClient(e.window); if (c) screen = c->screen(); else - screen = otk::Display::findScreen(e.root)->screen(); - EventData data(screen, c, EventEnterWindow, e.state); - Openbox::instance->bindings()->fireEvent(&data); + screen = otk::display->findScreen(e.root)->screen(); + EventData data(screen, c, EventAction::EnterWindow, e.state); + openbox->bindings()->fireEvent(&data); } @@ -191,13 +198,13 @@ void Actions::leaveHandler(const XCrossingEvent &e) // run the LEAVE python hook int screen; - Client *c = Openbox::instance->findClient(e.window); + Client *c = openbox->findClient(e.window); if (c) screen = c->screen(); else - screen = otk::Display::findScreen(e.root)->screen(); - EventData data(screen, c, EventLeaveWindow, e.state); - Openbox::instance->bindings()->fireEvent(&data); + screen = otk::display->findScreen(e.root)->screen(); + EventData data(screen, c, EventAction::LeaveWindow, e.state); + openbox->bindings()->fireEvent(&data); } @@ -208,9 +215,42 @@ 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); - Openbox::instance->bindings()-> - fireKey(otk::Display::findScreen(e.root)->screen(), - state, e.keycode, e.time); + openbox->bindings()-> + 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); } @@ -224,9 +264,9 @@ void Actions::motionHandler(const XMotionEvent &e) // 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; @@ -235,8 +275,22 @@ void Actions::motionHandler(const XMotionEvent &e) } WidgetBase *w = dynamic_cast - (Openbox::instance->findHandler(e.window)); - assert(w); // everything should be a widget + (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)) + 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 @@ -244,32 +298,15 @@ void Actions::motionHandler(const XMotionEvent &e) Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask); unsigned int button = _posqueue[0]->button; int screen; - Client *c = Openbox::instance->findClient(e.window); + 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(), MouseMotion, - x_root, y_root, _posqueue[0]->pos, _posqueue[0]->clientarea); - Openbox::instance->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 + 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); } #ifdef XKB @@ -283,13 +320,13 @@ void Actions::xkbHandler(const XkbEvent &e) switch (((XkbAnyEvent*)&e)->xkb_type) { case XkbBellNotify: w = ((XkbBellNotifyEvent*)&e)->window; - Client *c = Openbox::instance->findClient(w); + Client *c = openbox->findClient(w); if (c) screen = c->screen(); else - screen = Openbox::instance->focusedScreen()->number(); - EventData data(screen, c, EventBell, 0); - Openbox::instance->bindings()->fireEvent(&data); + screen = openbox->focusedScreen()->number(); + EventData data(screen, c, EventAction::Bell, 0); + openbox->bindings()->fireEvent(&data); break; } }