X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Factions.hh;h=4cf37ef1c5117bab919442118754a4e6cac82e12;hb=3c61812e588fb3c34d0713d7f82ccbf21091f032;hp=3d45966e171125e7483c35cbbc58e95d915c5e57;hpb=772ff27864b724c884ca5681fedc42711c63ec82;p=chaz%2Fopenbox

diff --git a/src/actions.hh b/src/actions.hh
index 3d45966e..4cf37ef1 100644
--- a/src/actions.hh
+++ b/src/actions.hh
@@ -7,6 +7,7 @@
 */
 
 #include "otk/point.hh"
+#include "otk/rect.hh"
 #include "otk/eventhandler.hh"
 
 extern "C" {
@@ -22,6 +23,19 @@ 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,
+    NUM_ACTIONS
+  };
+  
   struct ButtonReleaseAction {
     Window win;
     unsigned int button;
@@ -29,34 +43,19 @@ public:
     ButtonReleaseAction() { win = 0; button = 0; time = 0; }
   };
 
-  struct ButtonPressAction {
-    unsigned int button;
-    otk::Point pos;
-    ButtonPressAction() { button = 0; }
-  };
-  
 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];
 
-  //! Insert a button/position in the _posqueue
-  void insertPress(const XButtonEvent &e);
-  //! Remove a button/position from the _posqueue
-  void removePress(const XButtonEvent &e);
-  
 public:
+  //! Constructs an OBActions object
   OBActions();
+  //! Destroys the OBActions object
   virtual ~OBActions();
 
   virtual void buttonPressHandler(const XButtonEvent &e);