global python scripts. client motion/resizing is all done via python now

[chaz/openbox] / src / actions.hh

diff --git a/src/actions.hh b/src/actions.hh
index 35e8e313445270f6fa8afd4a895ef36eebde3c81..4cf37ef1c5117bab919442118754a4e6cac82e12 100644 (file)
--- 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,65 +23,50 @@ 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 window the last enter action occured on (where the mouse is located)
-  Window _enter_win;
+  //! 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);
   virtual void buttonReleaseHandler(const XButtonEvent &e);
   
+  virtual void enterHandler(const XCrossingEvent &e);
+  virtual void leaveHandler(const XCrossingEvent &e);
 
+  virtual void keyPressHandler(const XKeyEvent &e);
 
-
-  //! Notify that a mouse enter action has occured on a window.
-  /*!
-    @param win The window on which the action was performed.
-    @param modifiers The modifier state for the action.
-  */
-  void enter(Window win, unsigned int modifiers);
-
-  //! Notify that a mouse leave action has occured on a window.
-  /*!
-    @param modifiers The modifier state for the action.
-  */
-  void leave(unsigned int modifiers);
-
-  //! Notify that a mouse drag is taking place.
-  /*!
-    @param win The window the drag is on
-    @param delta The change in position of the mouse pointer
-    @param modifiers The modifier state during the drag.
-  */
-  void drag(Window win, otk::Point delta, unsigned int modifiers,
-            unsigned int button, Time time);
-
-  //! Notify that a key press has occured on a window.
-  /*!
-    @param win The window the key press was on
-    @param modifiers The modifier state for the action.
-    @param keycode The keycode of the key pressed.
-  */
-  void key(Window win, unsigned int modifiers, unsigned int keycode);
+  virtual void motionHandler(const XMotionEvent &e);
 };
 
 }