X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Factions.hh;h=f210f6ce9fa74ca6a74e3d327dfe8ceff9991964;hb=3661e55fba3b5f3be246b3f65d650460282018ac;hp=9f65f7ed3ef284c055cacc6a6b6d0af0c556a692;hpb=699de0368cded603bc40e66b0d65a1001e8ec494;p=chaz%2Fopenbox

diff --git a/src/actions.hh b/src/actions.hh
index 9f65f7ed..f210f6ce 100644
--- a/src/actions.hh
+++ b/src/actions.hh
@@ -1,4 +1,4 @@
-// -*- mode: C++; indent-tabs-mode: nil; -*-
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 #ifndef __actions_hh
 #define __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,15 @@ 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];
-  //! The delta x/y of the last motion sequence
-  int _dx, _dy;
 
-  //! 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();