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

diff --git a/src/actions.hh b/src/actions.hh
index 4cf37ef1..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
 
@@ -12,8 +12,11 @@
 
 extern "C" {
 #include <X11/Xlib.h>
+#include <Python.h>
 }
 
+#include <map>
+
 namespace ob {
 
 //! The action interface for user-available actions
@@ -21,42 +24,38 @@ 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:
-  // 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
-  };
-  
+#ifndef   SWIG // get rid of a swig warning
   struct ButtonReleaseAction {
     Window win;
     unsigned int button;
     Time time;
     ButtonReleaseAction() { win = 0; button = 0; time = 0; }
   };
-
-private:
-  // milliseconds XXX: config option
-  static const unsigned int DOUBLECLICKDELAY;
   
-  //! The mouse button currently being watched from a press for a CLICK
-  unsigned int _button;
+  struct ButtonPressAction {
+    Window win;
+    unsigned int button;
+    otk::Point pos;
+    otk::Rect clientarea;
+    ButtonPressAction() { button = 0; }
+  };
+#endif // SWIG
+private:
   //! 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;
 
 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);
@@ -65,8 +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);
+
+#ifdef    XKB
+  virtual void xkbHandler(const XkbEvent &e);
+#endif // XKB
+
 };
 
 }