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

diff --git a/src/actions.hh b/src/actions.hh
index 970a18a4..4165dd2e 100644
--- a/src/actions.hh
+++ b/src/actions.hh
@@ -6,7 +6,6 @@
   @brief The action interface for user-available actions
 */
 
-#include "widget.hh"
 #include "otk/point.hh"
 #include "otk/rect.hh"
 #include "otk/eventhandler.hh"
@@ -25,7 +24,7 @@ namespace ob {
   When these actions are fired, hooks to the guile engine are fired so that
   guile code is run.
 */
-class OBActions : public otk::OtkEventHandler {
+class Actions : public otk::EventHandler {
 public:
 #ifndef   SWIG // get rid of a swig warning
   struct ButtonReleaseAction {
@@ -36,6 +35,7 @@ public:
   };
   
   struct ButtonPressAction {
+    Window win;
     unsigned int button;
     otk::Point pos;
     otk::Rect clientarea;
@@ -43,30 +43,19 @@ public:
   };
 #endif // SWIG
 private:
-  // milliseconds XXX: config option
-  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];
-
-  
-  void insertPress(const XButtonEvent &e);
-  void removePress(const XButtonEvent &e);
-
-  PyObject *_callback[NUM_EVENTS];
+  //! 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;
 
 public:
-  //! Constructs an OBActions object
-  OBActions();
-  //! Destroys the OBActions object
-  virtual ~OBActions();
+  //! Constructs an Actions object
+  Actions();
+  //! Destroys the Actions object
+  virtual ~Actions();
 
   virtual void buttonPressHandler(const XButtonEvent &e);
   virtual void buttonReleaseHandler(const XButtonEvent &e);
@@ -75,21 +64,14 @@ public:
   virtual void leaveHandler(const XCrossingEvent &e);
 
   virtual void keyPressHandler(const XKeyEvent &e);
+  virtual void keyReleaseHandler(const XKeyEvent &e);
 
   virtual void motionHandler(const XMotionEvent &e);
 
-  virtual void mapRequestHandler(const XMapRequestEvent &e);
-  virtual void unmapHandler(const XUnmapEvent &e);
-  virtual void destroyHandler(const XDestroyWindowEvent &e);
-
-  //! Bind a callback for an action
-  bool bind(EventAction action, PyObject *func);
-
-  //! Unbind the callback function from an action
-  bool unbind(EventAction action);
+#ifdef    XKB
+  virtual void xkbHandler(const XkbEvent &e);
+#endif // XKB
 
-  //! Remove all callback functions
-  void unbindAll();
 };
 
 }