moving a window is possible once again

[chaz/openbox] / src / actions.hh

diff --git a/src/actions.hh b/src/actions.hh
index e57593f78f6fbecdd1f792dc74bc129b793c92fc..2b68153ab57c3d9c9908283af27a6ec177ccc158 100644 (file)
--- 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,19 +27,29 @@ namespace ob {
 */
 class OBActions : public otk::OtkEventHandler {
 public:
+  // update the same enum in openbox.i when making changes to this
+  enum ActionType {
+    Action_EnterWindow,
+    Action_LeaveWindow,
+    Action_NewWindow,
+    Action_CloseWindow,
+    NUM_ACTIONS
+  };
+  
   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; }
   };
-  
+
 private:
   // milliseconds XXX: config option
   static const unsigned int DOUBLECLICKDELAY;
@@ -50,11 +65,18 @@ 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);
   
+  typedef std::multimap<ActionType, PyObject*> CallbackMap;
+  typedef std::pair<ActionType, PyObject*> CallbackMapPair;
+  CallbackMap _callbacks;
+
+  void doCallback(ActionType action, Window window, OBWidget::WidgetType type,
+                  unsigned int state, unsigned int button,
+                  int xroot, int yroot, Time time);
+  
 public:
   //! Constructs an OBActions object
   OBActions();
@@ -70,6 +92,23 @@ 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);
+
+  //! Add a callback funtion to the back of the hook list
+  /*!
+    Registering functions for KeyPress events is pointless. Use
+    OBSCript::bindKey instead to do this.
+  */
+  bool registerCallback(ActionType action, PyObject *func, bool atfront);
+
+  //! Remove a callback function from the hook list
+  bool unregisterCallback(ActionType action, PyObject *func);
+
+  //! Remove all callback functions from the hook list
+  bool unregisterAllCallbacks(ActionType action);
 };
 
 }