X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Factions.cc;h=65931fc6b7380fad54a3262f85d776faac07c764;hb=7c32ac2b3f0bfd02a1efea1d67e5ad1c3c5be93f;hp=1b5e9c14fcc50ae50abe406e5f673826461ec09c;hpb=a21c0c55ca06fed3882f2417a8e0862f314dd434;p=chaz%2Fopenbox diff --git a/src/actions.cc b/src/actions.cc index 1b5e9c14..65931fc6 100644 --- a/src/actions.cc +++ b/src/actions.cc @@ -1,78 +1,183 @@ -// -*- mode: C++; indent-tabs-mode: nil; -*- +// -*- 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 "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 { -const unsigned int OBActions::DOUBLECLICKDELAY = 300; +const int Actions::BUTTONS; -OBActions::OBActions() - : _button(0) +Actions::Actions() + : _button(0), + _dragging(false) { + for (int i=0; i 0; --i) { + _posqueue[i] = _posqueue[i-1]; + } + _posqueue[0] = a; + a->win = e.window; + a->button = e.button; + a->pos = otk::Point(e.x_root, e.y_root); + + Client *c = openbox->findClient(e.window); + if (c) a->clientarea = c->area(); } +void Actions::removePress(const XButtonEvent &e) +{ + int i; + ButtonPressAction *a = 0; + for (i=0; ibutton == e.button) { + a = _posqueue[i]; + break; + } + if (a) { // found one, remove it and shift the rest up one + for (; i < BUTTONS-1; ++i) + _posqueue[i] = _posqueue[i+1]; + _posqueue[BUTTONS-1] = a; + } + _posqueue[BUTTONS-1]->button = 0; +} -void OBActions::buttonPressHandler(const XButtonEvent &e) +void Actions::buttonPressHandler(const XButtonEvent &e) { - OtkEventHandler::buttonPressHandler(e); - - // XXX: run the PRESS guile hook - printf("GUILE: PRESS: win %lx modifiers %u button %u time %lx\n", - (long)e.window, e.state, e.button, e.time); + otk::EventHandler::buttonPressHandler(e); + insertPress(e); + + 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); + 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::Press); + openbox->bindings()->fireButton(&data); if (_button) return; // won't count toward CLICK events _button = e.button; + + 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 + clicks/doubleclicks etc still work. + */ + //XButtonEvent ev = e; + //ev.type = ButtonRelease; + buttonReleaseHandler(e); + } } -void OBActions::buttonReleaseHandler(const XButtonEvent &e) +void Actions::buttonReleaseHandler(const XButtonEvent &e) { - OtkEventHandler::buttonReleaseHandler(e); + otk::EventHandler::buttonReleaseHandler(e); + removePress(e); - // XXX: run the RELEASE guile hook - printf("GUILE: RELEASE: win %lx modifiers %u button %u time %lx\n", - (long)e.window, e.state, e.button, e.time); + 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; _button = 0; + _dragging = false; // find the area of the window XWindowAttributes attr; - if (!XGetWindowAttributes(otk::OBDisplay::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 && e.x < attr.width && e.y < attr.height)) return; - // XXX: run the CLICK guile hook - printf("GUILE: CLICK: win %lx modifiers %u button %u time %lx\n", - (long)e.window, e.state, e.button, e.time); + // run the CLICK python hook + data.action = MouseAction::Click; + openbox->bindings()->fireButton(&data); + - if (e.time - _release.time < DOUBLECLICKDELAY && - _release.win == e.window && _release.button == e.button) { + // XXX: dont load this every time!!@* + long dblclick; + if (!python_get_long("DOUBLE_CLICK_DELAY", &dblclick)) + dblclick = 300; - // XXX: run the DOUBLECLICK guile hook - printf("GUILE: DOUBLECLICK: win %lx modifiers %u button %u time %lx\n", - (long)e.window, e.state, e.button, e.time); + if (e.time - _release.time < (unsigned)dblclick && + _release.win == e.window && _release.button == e.button) { + // run the DOUBLECLICK python hook + data.action = MouseAction::DoubleClick; + openbox->bindings()->fireButton(&data); + // reset so you cant triple click for 2 doubleclicks _release.win = 0; _release.button = 0; @@ -86,39 +191,186 @@ void OBActions::buttonReleaseHandler(const XButtonEvent &e) } -void OBActions::enterHandler(const XCrossingEvent &e) +void Actions::enterHandler(const XCrossingEvent &e) { - OtkEventHandler::enterHandler(e); + otk::EventHandler::enterHandler(e); - // XXX: run the ENTER guile hook - printf("GUILE: ENTER: win %lx modifiers %u\n", (long)e.window, e.state); + // run the ENTER python hook + int screen; + Client *c = openbox->findClient(e.window); + if (c) + screen = c->screen(); + else + screen = otk::display->findScreen(e.root)->screen(); + EventData data(screen, c, EventAction::EnterWindow, e.state); + openbox->bindings()->fireEvent(&data); } -void OBActions::leaveHandler(const XCrossingEvent &e) +void Actions::leaveHandler(const XCrossingEvent &e) { - OtkEventHandler::leaveHandler(e); + otk::EventHandler::leaveHandler(e); + + // run the LEAVE python hook + int screen; + Client *c = openbox->findClient(e.window); + if (c) + screen = c->screen(); + else + screen = otk::display->findScreen(e.root)->screen(); + EventData data(screen, c, EventAction::LeaveWindow, e.state); + openbox->bindings()->fireEvent(&data); +} + - // XXX: run the LEAVE guile hook - printf("GUILE: LEAVE: win %lx modifiers %u\n", (long)e.window, e.state); +void Actions::keyPressHandler(const XKeyEvent &e) +{ + otk::EventHandler::keyPressHandler(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); } -void OBActions::keyPressHandler(const XKeyEvent &e) +void Actions::keyReleaseHandler(const XKeyEvent &e) { - // XXX: run the KEY guile hook - printf("GUILE: KEY: win %lx modifiers %u keycode %u\n", - (long)e.window, e.state, e.keycode); + 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); } -void OBActions::drag(Window win, otk::Point delta, unsigned int modifiers, - unsigned int button, Time time) +void Actions::motionHandler(const XMotionEvent &e) { - (void)win;(void)delta;(void)modifiers;(void)button;(void)time; + otk::EventHandler::motionHandler(e); + + if (!e.same_screen) return; // this just gets stupid + + 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 (XCheckTypedWindowEvent(**otk::display, e.window, e.type, &ce)) { + x_root = e.x_root; + y_root = e.y_root; + } - // XXX: some guile shit... + 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 + 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); + openbox->bindings()->fireButton(&data); } +#ifdef XKB +void Actions::xkbHandler(const XkbEvent &e) +{ + Window w; + int screen; + + otk::EventHandler::xkbHandler(e); + + switch (((XkbAnyEvent*)&e)->xkb_type) { + case XkbBellNotify: + w = ((XkbBellNotifyEvent*)&e)->window; + Client *c = openbox->findClient(w); + if (c) + screen = c->screen(); + else + screen = openbox->focusedScreen()->number(); + EventData data(screen, c, EventAction::Bell, 0); + openbox->bindings()->fireEvent(&data); + break; + } +} +#endif // XKB } +