// -*- 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 {
_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);
// 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 != _posqueue[0]->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)) {