add 'grab_server' for grabbing .. the .. server!

[chaz/openbox] / src / actions.hh

diff --git a/src/actions.hh b/src/actions.hh
index 98325e874e93d0560650949eddee96df9eb5974c..4165dd2ef310e7ba844b1c157ae7c578f9625111 100644 (file)
--- a/src/actions.hh
+++ b/src/actions.hh
@@ -6,7 +6,6 @@
   @brief The action interface for user-available actions
 */
 
-#include "widget.hh"
 #include "otk/point.hh"
 #include "otk/rect.hh"
 #include "otk/eventhandler.hh"
@@ -25,51 +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_Click,
-    Action_DoubleClick,
-    Action_EnterWindow,
-    Action_LeaveWindow,
-    Action_KeyPress,
-    Action_MouseMotion,
-    Action_NewWindow,
-    Action_CloseWindow,
-    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;
 
-  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();
-  //! 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);
@@ -78,26 +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);
 
-  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);
+#ifdef    XKB
+  virtual void xkbHandler(const XkbEvent &e);
+#endif // XKB
 
-  //! Remove all callback functions from the hook list
-  bool unregisterAllCallbacks(ActionType action);
 };
 
 }