X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Factions.hh;h=4165dd2ef310e7ba844b1c157ae7c578f9625111;hb=7d215bd255d0744101b9ceb52c235bdc985fa034;hp=4c001be716aab2feb49745f896bcffa55f0aac14;hpb=4f01802c8cd0e0efc26896cf80e69dd9b6c06ec1;p=chaz%2Fopenbox

diff --git a/src/actions.hh b/src/actions.hh
index 4c001be7..4165dd2e 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
 
@@ -6,9 +6,16 @@
   @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>
+#include <Python.h>
+}
+
+#include <map>
 
 namespace ob {
 
@@ -17,86 +24,54 @@ namespace ob {
   When these actions are fired, hooks to the guile engine are fired so that
   guile code is run.
 */
-class OBActions {
+class Actions : public otk::EventHandler {
 public:
-  struct MousePressAction {
+#ifndef   SWIG // get rid of a swig warning
+  struct ButtonReleaseAction {
     Window win;
     unsigned int button;
     Time time;
-    MousePressAction() { win = 0; button = 0; time = 0; }
+    ButtonReleaseAction() { win = 0; button = 0; time = 0; }
   };
   
+  struct ButtonPressAction {
+    Window win;
+    unsigned int button;
+    otk::Point pos;
+    otk::Rect clientarea;
+    ButtonPressAction() { button = 0; }
+  };
+#endif // SWIG
 private:
-  // milliseconds XXX: config option
-  static const unsigned int DOUBLECLICKDELAY = 200;
-  
-  //! The last 2 button presses processed for CLICKs
-  /*!
-    Inserted such that index 0 is the latest action.
-  */
-  MousePressAction *_presses[2];
-  //! 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;
+  //! The last button press processed for CLICKs
+  ButtonPressAction _press;
+  //! This is set to true once a drag has started and false when done to make
+  //! sure the threshold isnt checked anymore once a drag is underway
+  bool _dragging;
 
-  void insertPress(Window win, unsigned int button, Time time);
-  
 public:
-  OBActions();
-  virtual ~OBActions();
+  //! Constructs an Actions object
+  Actions();
+  //! Destroys the Actions object
+  virtual ~Actions();
 
-  //! Notify that a mouse button press has occured on a window.
-  /*!
-    @param win The window on which the action was performed.
-    @param modifiers The modifier state for the action.
-    @param button The mouse button the action is for.
-    @param time The time at which the event occured (from the XEvent).
-  */
-  void bpress(Window win, unsigned int modifiers, unsigned int button,
-              Time time);
-
-  //! Notify that a mouse button release has occured on a window.
-  /*!
-    @param win The window on which the action was performed.
-    @param area The area of the window on which the action was performed.
-    @param mpos The position of the mouse pointer relative to the root window.
-    @param modifiers The modifier state for the action.
-    @param button The mouse button the action is for.
-    @param time The time at which the event occured (from the XEvent).
-  */
-  void brelease(Window win, const otk::Rect &area, const otk::Point &mpos,
-                unsigned int modifiers, unsigned int button, Time time);
+  virtual void buttonPressHandler(const XButtonEvent &e);
+  virtual void buttonReleaseHandler(const XButtonEvent &e);
+  
+  virtual void enterHandler(const XCrossingEvent &e);
+  virtual void leaveHandler(const XCrossingEvent &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);
+  virtual void keyPressHandler(const XKeyEvent &e);
+  virtual void keyReleaseHandler(const XKeyEvent &e);
 
-  //! Notify that a mouse leave action has occured on a window.
-  /*!
-    @param modifiers The modifier state for the action.
-  */
-  void leave(unsigned int modifiers);
+  virtual void motionHandler(const XMotionEvent &e);
 
-  //! 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);
+#ifdef    XKB
+  virtual void xkbHandler(const XkbEvent &e);
+#endif // XKB
 
-  //! 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);
 };
 
 }