X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Factions.hh;h=1da6e278c6afab4dc9c75d79b56e537290659f9f;hb=58cd3958a331e55699b3c1f640c0d2da907cdf22;hp=8b6633be5e66d1a861fc0d1c4d612ee986a9e925;hpb=1161a90a70b21d3064a9dee62c72dd4be3025ada;p=chaz%2Fopenbox

diff --git a/src/actions.hh b/src/actions.hh
index 8b6633be..1da6e278 100644
--- a/src/actions.hh
+++ b/src/actions.hh
@@ -6,14 +6,18 @@
   @brief The action interface for user-available actions
 */
 
+#include "widget.hh"
 #include "otk/point.hh"
 #include "otk/rect.hh"
 #include "otk/eventhandler.hh"
 
 extern "C" {
 #include <X11/Xlib.h>
+#include <Python.h>
 }
 
+#include <map>
+
 namespace ob {
 
 //! The action interface for user-available actions
@@ -23,36 +27,38 @@ namespace ob {
 */
 class OBActions : public otk::OtkEventHandler {
 public:
-  // update the same enum in openbox.i when making changes to this
-  enum ActionType {
-    Action_ButtonPress,
-    Action_ButtonRelease,
-    Action_Click,
-    Action_DoubleClick,
-    Action_EnterWindow,
-    Action_LeaveWindow,
-    Action_KeyPress,
-    Action_MouseMotion,
-    Action_NewWindow,
-    Action_CloseWindow,
-    NUM_ACTIONS
-  };
-  
+#ifndef   SWIG // get rid of a swig warning
   struct ButtonReleaseAction {
     Window win;
     unsigned int button;
     Time time;
     ButtonReleaseAction() { win = 0; button = 0; time = 0; }
   };
-
+  
+  struct ButtonPressAction {
+    unsigned int button;
+    otk::Point pos;
+    otk::Rect clientarea;
+    ButtonPressAction() { button = 0; }
+  };
+#endif // SWIG
 private:
   // milliseconds XXX: config option
-  static const unsigned int DOUBLECLICKDELAY;
+  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];
+
+  
+  void insertPress(const XButtonEvent &e);
+  void removePress(const XButtonEvent &e);
 
 public:
   //! Constructs an OBActions object
@@ -73,6 +79,7 @@ public:
   virtual void mapRequestHandler(const XMapRequestEvent &e);
   virtual void unmapHandler(const XUnmapEvent &e);
   virtual void destroyHandler(const XDestroyWindowEvent &e);
+
 };
 
 }