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

diff --git a/src/actions.hh b/src/actions.hh
index 3df4fe4a..4cf37ef1 100644
--- a/src/actions.hh
+++ b/src/actions.hh
@@ -6,11 +6,14 @@
   @brief The action interface for user-available actions
 */
 
-#include "otk/display.hh"
 #include "otk/point.hh"
 #include "otk/rect.hh"
 #include "otk/eventhandler.hh"
 
+extern "C" {
+#include <X11/Xlib.h>
+}
+
 namespace ob {
 
 //! The action interface for user-available actions
@@ -20,26 +23,39 @@ namespace ob {
 */
 class OBActions : public otk::OtkEventHandler {
 public:
-  struct MouseButtonAction {
+  // 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;
     Time time;
-    MouseButtonAction() { win = 0; button = 0; time = 0; }
+    ButtonReleaseAction() { win = 0; button = 0; time = 0; }
   };
-  
+
 private:
   // milliseconds XXX: config option
   static const unsigned int DOUBLECLICKDELAY;
   
-  //! The last 2 button release processed for CLICKs
-  MouseButtonAction _release;
   //! The mouse button currently being watched from a press for a CLICK
   unsigned int _button;
+  //! The last button release processed for CLICKs
+  ButtonReleaseAction _release;
 
-  void insertPress(Window win, unsigned int button, Time time);
-  
 public:
+  //! Constructs an OBActions object
   OBActions();
+  //! Destroys the OBActions object
   virtual ~OBActions();
 
   virtual void buttonPressHandler(const XButtonEvent &e);