X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Factions.hh;h=1da6e278c6afab4dc9c75d79b56e537290659f9f;hb=58cd3958a331e55699b3c1f640c0d2da907cdf22;hp=9f65f7ed3ef284c055cacc6a6b6d0af0c556a692;hpb=699de0368cded603bc40e66b0d65a1001e8ec494;p=chaz%2Fopenbox

diff --git a/src/actions.hh b/src/actions.hh
index 9f65f7ed..1da6e278 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,13 +6,18 @@
   @brief The action interface for user-available actions
 */
 
+#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
@@ -22,22 +27,23 @@ namespace ob {
 */
 class OBActions : public otk::OtkEventHandler {
 public:
+#ifndef   SWIG // get rid of a swig warning
   struct ButtonReleaseAction {
     Window win;
     unsigned int button;
     Time time;
     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 mouse button currently being watched from a press for a CLICK
@@ -49,14 +55,11 @@ private:
     Used for motion events as the starting position.
   */
   ButtonPressAction *_posqueue[BUTTONS];
-  //! The delta x/y of the last motion sequence
-  int _dx, _dy;
 
-  //! Insert a button/position in the _posqueue
+  
   void insertPress(const XButtonEvent &e);
-  //! Remove a button/position from the _posqueue
   void removePress(const XButtonEvent &e);
-  
+
 public:
   //! Constructs an OBActions object
   OBActions();
@@ -72,6 +75,11 @@ 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);
+
 };
 
 }