#include "otk/display.hh"
#include <stdio.h>
+#include <algorithm>
namespace ob {
const int Actions::BUTTONS;
Actions::Actions()
- : _button(0)
+ : _button(0),
+ _dragging(false)
{
for (int i=0; i<BUTTONS; ++i)
_posqueue[i] = new ButtonPressAction();
// run the PRESS python hook
WidgetBase *w = dynamic_cast<WidgetBase*>
(openbox->findHandler(e.window));
- assert(w); // everything should be a widget
+ if (!w) return;
// kill off the Button1Mask etc, only want the modifiers
unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask |
WidgetBase *w = dynamic_cast<WidgetBase*>
(openbox->findHandler(e.window));
- assert(w); // everything should be a widget
+ if (!w) return;
// not for the button we're watching?
if (_button != e.button) return;
_button = 0;
+ _dragging = false;
// find the area of the window
XWindowAttributes attr;
void Actions::keyPressHandler(const XKeyEvent &e)
{
+ printf("press\n");
otk::EventHandler::keyPressHandler(e);
// kill off the Button1Mask etc, only want the modifiers
Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
openbox->bindings()->
fireKey(otk::display->findScreen(e.root)->screen(),
- state, e.keycode, e.time);
+ state, e.keycode, e.time, EventKeyPress);
+}
+
+
+void Actions::keyReleaseHandler(const XKeyEvent &e)
+{
+ printf("release\n");
+ 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 (XXX 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, EventKeyRelease);
}
WidgetBase *w = dynamic_cast<WidgetBase*>
(openbox->findHandler(e.window));
- assert(w); // everything should be a widget
+ 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
openbox->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
-}
-
#ifdef XKB
void Actions::xkbHandler(const XkbEvent &e)
{