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

diff --git a/src/actions.hh b/src/actions.hh
index 3df4fe4a..f98c91d9 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,11 +6,18 @@
   @brief The action interface for user-available actions
 */
 
-#include "otk/display.hh"
+#include "widget.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 {
 
 //! The action interface for user-available actions
@@ -20,26 +27,43 @@ namespace ob {
 */
 class OBActions : public otk::OtkEventHandler {
 public:
-  struct MouseButtonAction {
+#ifndef   SWIG // get rid of a swig warning
+  struct ButtonReleaseAction {
     Window win;
     unsigned int button;
     Time time;
-    MouseButtonAction() { win = 0; button = 0; time = 0; }
+    ButtonReleaseAction() { win = 0; button = 0; time = 0; }
   };
   
+  struct ButtonPressAction {
+    unsigned int button;
+    otk::Point pos;
+    otk::Rect clientarea;
+    ButtonPressAction() { button = 0; }
+  };
+#endif // SWIG
 private:
   // milliseconds XXX: config option
-  static const unsigned int DOUBLECLICKDELAY;
+  static const int BUTTONS = 5;
   
-  //! 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;
+  //! 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(Window win, unsigned int button, Time time);
   
+  void insertPress(const XButtonEvent &e);
+  void removePress(const XButtonEvent &e);
+
 public:
+  //! Constructs an OBActions object
   OBActions();
+  //! Destroys the OBActions object
   virtual ~OBActions();
 
   virtual void buttonPressHandler(const XButtonEvent &e);
@@ -51,6 +75,15 @@ public:
   virtual void keyPressHandler(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);
+
+#ifdef    XKB
+  virtual void xkbHandler(const XkbEvent &e);
+#endif // XKB
+
 };
 
 }