X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Factions.hh;h=f8f03d0f213d4c724b692d4aaa0945b3022503b6;hb=fc4885a3f4c2a023a6e64cce62fc5cde1667f2e9;hp=924a8dc0c29bfe5307dc65b612334ee80b8cd215;hpb=56d7b547ae156e17c8e03ada3b80468f5a0b2605;p=chaz%2Fopenbox

diff --git a/src/actions.hh b/src/actions.hh
index 924a8dc0..f8f03d0f 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 "widgetbase.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
@@ -18,70 +25,65 @@ 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:
-  struct MousePressAction {
+#ifndef   SWIG // get rid of a swig warning
+  struct ButtonReleaseAction {
     Window win;
     unsigned int button;
     Time time;
-    MousePressAction() { 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 presses processed for CLICKs
-  /*!
-    Inserted such that index 0 is the latest action.
-  */
-  MousePressAction *_presses[2];
   //! The mouse button currently being watched from a press for a CLICK
   unsigned int _button;
-  //! The window the last enter action occured on (where the mouse is located)
-  Window _enter_win;
+  //! 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];
+  //! 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;
 
-  void insertPress(Window win, unsigned int button, Time time);
   
+  void insertPress(const XButtonEvent &e);
+  void removePress(const XButtonEvent &e);
+
 public:
-  OBActions();
-  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);
   
+  virtual void enterHandler(const XCrossingEvent &e);
+  virtual void leaveHandler(const XCrossingEvent &e);
 
+  virtual void keyPressHandler(const XKeyEvent &e);
+  virtual void keyReleaseHandler(const XKeyEvent &e);
 
+  virtual void motionHandler(const XMotionEvent &e);
 
-  //! Notify that a mouse enter action has occured on a window.
-  /*!
-    @param win The window on which the action was performed.
-    @param modifiers The modifier state for the action.
-  */
-  void enter(Window win, unsigned int modifiers);
-
-  //! Notify that a mouse leave action has occured on a window.
-  /*!
-    @param modifiers The modifier state for the action.
-  */
-  void leave(unsigned int modifiers);
+#ifdef    XKB
+  virtual void xkbHandler(const XkbEvent &e);
+#endif // XKB
 
-  //! Notify that a mouse drag is taking place.
-  /*!
-    @param win The window the drag is on
-    @param delta The change in position of the mouse pointer
-    @param modifiers The modifier state during the drag.
-  */
-  void drag(Window win, otk::Point delta, unsigned int modifiers,
-            unsigned int button, Time time);
-
-  //! Notify that a key press has occured on a window.
-  /*!
-    @param win The window the key press was on
-    @param modifiers The modifier state for the action.
-    @param keycode The keycode of the key pressed.
-  */
-  void key(Window win, unsigned int modifiers, unsigned int keycode);
 };
 
 }