// -*- 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 "bindings.hh"
#include "otk/display.hh"
-#include <stdio.h>
+#include <cstdio>
#include <algorithm>
namespace ob {
-const int Actions::BUTTONS;
-
Actions::Actions()
- : _button(0),
- _dragging(false)
+ : _dragging(false)
{
- for (int i=0; i<BUTTONS; ++i)
- _posqueue[i] = new ButtonPressAction();
}
Actions::~Actions()
{
- for (int i=0; i<BUTTONS; ++i)
- delete _posqueue[i];
}
-void Actions::insertPress(const XButtonEvent &e)
-{
- ButtonPressAction *a = _posqueue[BUTTONS - 1];
- // rm'd the last one, shift them all down one
- for (int i = BUTTONS-1; i > 0; --i) {
- _posqueue[i] = _posqueue[i-1];
- }
- _posqueue[0] = a;
- 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; i<BUTTONS-1; ++i)
- if (_posqueue[i]->button == 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 Actions::buttonPressHandler(const XButtonEvent &e)
{
otk::EventHandler::buttonPressHandler(e);
- insertPress(e);
MouseContext::MC context;
EventHandler *h = openbox->findHandler(e.window);
else
return; // not a valid mouse context
+ if (_press.button) {
+ unsigned int mask;
+ switch(_press.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: mask = 0; // on other buttons we have to assume its not pressed...
+ }
+ // was the button released but we didnt get the event? (pointergrabs cause
+ // this)
+ if (!(e.state & mask))
+ _press.button = 0;
+ }
+
// run the PRESS python hook
// kill off the Button1Mask etc, only want the modifiers
unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask |
MouseAction::Press);
openbox->bindings()->fireButton(&data);
- if (_button) return; // won't count toward CLICK events
+ if (_press.button) return; // won't count toward CLICK events
+
+ _press.win = e.window;
+ _press.button = e.button;
+ _press.pos = otk::Point(e.x_root, e.y_root);
+ if (c)
+ _press.clientarea = c->area();
- _button = e.button;
+ printf("press queue %u pressed %u\n", _press.button, e.button);
if (context == MouseContext::Window) {
/*
void Actions::buttonReleaseHandler(const XButtonEvent &e)
{
otk::EventHandler::buttonReleaseHandler(e);
- removePress(e);
MouseContext::MC context;
EventHandler *h = openbox->findHandler(e.window);
openbox->bindings()->fireButton(&data);
// not for the button we're watching?
- if (_button != e.button) return;
+ if (_press.button != e.button) return;
- _button = 0;
+ _press.button = 0;
_dragging = false;
// find the area of the 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 = 0;
+ python_get_long("double_click_delay", &dblclick);
if (e.time - _release.time < (unsigned)dblclick &&
_release.win == e.window && _release.button == e.button) {
// 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);
if (!e.same_screen) return; // this just gets stupid
+ if (e.window != _press.win) return;
+
MouseContext::MC context;
EventHandler *h = openbox->findHandler(e.window);
Frame *f = dynamic_cast<Frame*>(h);
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;
+ x_root = ce.x_root;
+ y_root = ce.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;
+ int dx = x_root - _press.pos.x();
+ int dy = y_root - _press.pos.y();
+ long threshold = 0;
+ python_get_long("drag_threshold", &threshold);
if (!(std::abs(dx) >= threshold || std::abs(dy) >= threshold))
return; // not at the threshold yet
}
// 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();
+ unsigned int button = _press.button;
MouseData data(screen, c, e.time, state, button, context,
MouseAction::Motion, x_root, y_root,
- _posqueue[0]->pos, _posqueue[0]->clientarea);
+ _press.pos, _press.clientarea);
openbox->bindings()->fireButton(&data);
}
projects / chaz / openbox / blobdiff