new mouse button code is seeming to work. you can move windows

1 files changed, 19 insertions, 5 deletions

diff --git a/src/actions.hh b/src/actions.hh
index 98325e87..4a658061 100644
--- a/src/actions.hh
+++ b/src/actions.hh
@@ -29,13 +29,8 @@ class OBActions : public otk::OtkEventHandler {
 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
@@ -47,16 +42,35 @@ public:
     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;
+  static const int BUTTONS = 5;
   
   //! The mouse button currently being watched from a press for a CLICK
   unsigned int _button;
   //! 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];
+  //! The delta x/y of the last motion sequence
+  int _dx, _dy;
 
+  
+  void insertPress(const XButtonEvent &e);
+  void removePress(const XButtonEvent &e);
+  
   typedef std::multimap<ActionType, PyObject*> CallbackMap;
   typedef std::pair<ActionType, PyObject*> CallbackMapPair;
   CallbackMap _callbacks;