add 'grab_server' for grabbing .. the .. server!

[chaz/openbox] / src / actions.hh

diff --git a/src/actions.hh b/src/actions.hh
index 8fb728df84a2c79afc7a4d811f4b8936eed07a03..4165dd2ef310e7ba844b1c157ae7c578f9625111 100644 (file)
--- a/src/actions.hh
+++ b/src/actions.hh
@@ -6,7 +6,6 @@
   @brief The action interface for user-available actions
 */
 
-#include "widget.hh"
 #include "otk/point.hh"
 #include "otk/rect.hh"
 #include "otk/eventhandler.hh"
@@ -36,6 +35,7 @@ public:
   };
   
   struct ButtonPressAction {
+    Window win;
     unsigned int button;
     otk::Point pos;
     otk::Rect clientarea;
@@ -43,26 +43,14 @@ public:
   };
 #endif // SWIG
 private:
-  // milliseconds XXX: config option
-  static const int BUTTONS = 5;
-  
-  //! The mouse button currently being watched from a press for a CLICK
-  unsigned int _button;
   //! The last button release processed for CLICKs
   ButtonReleaseAction _release;
-  //! The point where the mouse was when each mouse button was pressed
-  /*!
-    Used for motion events as the starting position.
-  */
-  ButtonPressAction *_posqueue[BUTTONS];
+  //! The last button press processed for CLICKs
+  ButtonPressAction _press;
   //! This is set to true once a drag has started and false when done to make
   //! sure the threshold isnt checked anymore once a drag is underway
   bool _dragging;
 
-  
-  void insertPress(const XButtonEvent &e);
-  void removePress(const XButtonEvent &e);
-
 public:
   //! Constructs an Actions object
   Actions();
@@ -76,6 +64,7 @@ public:
   virtual void leaveHandler(const XCrossingEvent &e);
 
   virtual void keyPressHandler(const XKeyEvent &e);
+  virtual void keyReleaseHandler(const XKeyEvent &e);
 
   virtual void motionHandler(const XMotionEvent &e);