X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Factions.cc;h=e2999b768360776d8d7ac7f599eadf6ab8f7ca94;hb=b760c466567dc06fa41dfb5a301192c251a5fc85;hp=10edeec2420a722a4a175167e04ce03c89786ba0;hpb=cdcc526a0274cace9f542960fe4eee4ddcc23d31;p=chaz%2Fopenbox

diff --git a/src/actions.cc b/src/actions.cc
index 10edeec2..e2999b76 100644
--- a/src/actions.cc
+++ b/src/actions.cc
@@ -14,13 +14,15 @@
 #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();
@@ -74,7 +76,7 @@ void Actions::buttonPressHandler(const XButtonEvent &e)
   // 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 |
@@ -113,12 +115,13 @@ void Actions::buttonReleaseHandler(const XButtonEvent &e)
   
   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;
@@ -203,6 +206,7 @@ void Actions::leaveHandler(const XCrossingEvent &e)
 
 void Actions::keyPressHandler(const XKeyEvent &e)
 {
+  printf("press\n");
   otk::EventHandler::keyPressHandler(e);
 
   // kill off the Button1Mask etc, only want the modifiers
@@ -210,7 +214,41 @@ void Actions::keyPressHandler(const XKeyEvent &e)
                                   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);
 }
 
 
@@ -236,7 +274,21 @@ void Actions::motionHandler(const XMotionEvent &e)
 
   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
@@ -254,24 +306,6 @@ void Actions::motionHandler(const XMotionEvent &e)
   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)
 {