X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Factions.hh;h=f98c91d9a17fbce204ef1b4f0dac74923d4ca063;hb=bc88d310fea71823fb2c61d071ff499579bffaba;hp=3d45966e171125e7483c35cbbc58e95d915c5e57;hpb=772ff27864b724c884ca5681fedc42711c63ec82;p=chaz%2Fopenbox

diff --git a/src/actions.hh b/src/actions.hh
index 3d45966e..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,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
@@ -50,13 +56,14 @@ private:
   */
   ButtonPressAction *_posqueue[BUTTONS];
 
-  //! 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();
+  //! Destroys the OBActions object
   virtual ~OBActions();
 
   virtual void buttonPressHandler(const XButtonEvent &e);
@@ -68,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
+
 };
 
 }