remove unused old handlers

[chaz/openbox] / src / actions.cc

diff --git a/src/actions.cc b/src/actions.cc
index c3675cc3c20f276999e7c79a929fdf2d0afe7ba2..65546167da65e7082e04d75c0d9ea47aac510b6f 100644 (file)
--- 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 |
@@ -84,7 +86,7 @@ void Actions::buttonPressHandler(const XButtonEvent &e)
   if (c)
     screen = c->screen();
   else
-    screen = otk::Display::findScreen(e.root)->screen();
+    screen = otk::display->findScreen(e.root)->screen();
   MouseData data(screen, c, e.time, state, e.button, w->mcontext(),
                  MousePress);
   openbox->bindings()->fireButton(&data);
@@ -113,16 +115,17 @@ 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;
-  if (!XGetWindowAttributes(otk::Display::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 &&
@@ -138,7 +141,7 @@ void Actions::buttonReleaseHandler(const XButtonEvent &e)
   if (c)
     screen = c->screen();
   else
-    screen = otk::Display::findScreen(e.root)->screen();
+    screen = otk::display->findScreen(e.root)->screen();
   MouseData data(screen, c, e.time, state, e.button, w->mcontext(),
                  MouseClick);
   openbox->bindings()->fireButton(&data);
@@ -179,7 +182,7 @@ void Actions::enterHandler(const XCrossingEvent &e)
   if (c)
     screen = c->screen();
   else
-    screen = otk::Display::findScreen(e.root)->screen();
+    screen = otk::display->findScreen(e.root)->screen();
   EventData data(screen, c, EventEnterWindow, e.state);
   openbox->bindings()->fireEvent(&data);
 }
@@ -195,7 +198,7 @@ void Actions::leaveHandler(const XCrossingEvent &e)
   if (c)
     screen = c->screen();
   else
-    screen = otk::Display::findScreen(e.root)->screen();
+    screen = otk::display->findScreen(e.root)->screen();
   EventData data(screen, c, EventLeaveWindow, e.state);
   openbox->bindings()->fireEvent(&data);
 }
@@ -209,7 +212,7 @@ void Actions::keyPressHandler(const XKeyEvent &e)
   unsigned int state = e.state & (ControlMask | ShiftMask | Mod1Mask |
                                   Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask);
   openbox->bindings()->
-    fireKey(otk::Display::findScreen(e.root)->screen(),
+    fireKey(otk::display->findScreen(e.root)->screen(),
             state, e.keycode, e.time);
 }
 
@@ -224,9 +227,9 @@ void Actions::motionHandler(const XMotionEvent &e)
   
   // compress changes to a window into a single change
   XEvent ce;
-  while (XCheckTypedEvent(otk::Display::display, e.type, &ce)) {
+  while (XCheckTypedEvent(**otk::display, e.type, &ce)) {
     if (ce.xmotion.window != e.window) {
-      XPutBackEvent(otk::Display::display, &ce);
+      XPutBackEvent(**otk::display, &ce);
       break;
     } else {
       x_root = e.x_root;
@@ -236,7 +239,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
@@ -248,30 +265,12 @@ void Actions::motionHandler(const XMotionEvent &e)
   if (c)
     screen = c->screen();
   else
-    screen = otk::Display::findScreen(e.root)->screen();
+    screen = otk::display->findScreen(e.root)->screen();
   MouseData data(screen, c, e.time, state, button, w->mcontext(), MouseMotion,
                  x_root, y_root, _posqueue[0]->pos, _posqueue[0]->clientarea);
   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)
 {