From 772ff27864b724c884ca5681fedc42711c63ec82 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Wed, 4 Dec 2002 10:06:35 +0000
Subject: [PATCH] keep a queue of press/releases and the positions, so that the
 first motion event already has a position to base off of, so it is not lost!!

---
 src/actions.cc | 36 +++++++++++++++++++++++++++++++++++-
 src/actions.hh | 31 ++++++++++++++++++++++++-------
 2 files changed, 59 insertions(+), 8 deletions(-)

diff --git a/src/actions.cc b/src/actions.cc
index 3f2e79f8..af33f51c 100644
--- a/src/actions.cc
+++ b/src/actions.cc
@@ -5,16 +5,20 @@
 #endif
 
 #include "actions.hh"
+#include "otk/display.hh"
 
 #include <stdio.h>
 
 namespace ob {
 
 const unsigned int OBActions::DOUBLECLICKDELAY = 300;
+const int OBActions::BUTTONS;
 
 OBActions::OBActions()
   : _button(0)
 {
+  for (int i=0; i<BUTTONS; ++i)
+    _posqueue[i] = new ButtonPressAction();
 
   // XXX: load a configuration out of somewhere
 
@@ -23,12 +27,40 @@ OBActions::OBActions()
 
 OBActions::~OBActions()
 {
+  for (int i=0; i<BUTTONS; ++i)
+    delete _posqueue[i];
 }
 
 
+void OBActions::insertPress(const XButtonEvent &e)
+{
+  ButtonPressAction *a = _posqueue[BUTTONS - 1];
+  for (int i=BUTTONS-1; i>0;)
+    _posqueue[i] = _posqueue[--i];
+  _posqueue[0] = a;
+  a->button = e.button;
+  a->pos.setPoint(e.x, e.y);
+}
+
+void OBActions::removePress(const XButtonEvent &e)
+{
+  ButtonPressAction *a = 0;
+  for (int i=0; i<BUTTONS; ++i) {
+    if (_posqueue[i]->button == e.button)
+      a = _posqueue[i];
+    if (a) // found one and removed it
+      _posqueue[i] = _posqueue[i+1];
+  }
+  if (a) { // found one
+    _posqueue[BUTTONS-1] = a;
+    a->button = 0;
+  }
+}
+
 void OBActions::buttonPressHandler(const XButtonEvent &e)
 {
   OtkEventHandler::buttonPressHandler(e);
+  insertPress(e);
   
   // XXX: run the PRESS guile hook
   printf("GUILE: PRESS: win %lx modifiers %u button %u time %lx\n",
@@ -43,6 +75,7 @@ void OBActions::buttonPressHandler(const XButtonEvent &e)
 void OBActions::buttonReleaseHandler(const XButtonEvent &e)
 {
   OtkEventHandler::buttonReleaseHandler(e);
+  removePress(e);
   
   // XXX: run the RELEASE guile hook
   printf("GUILE: RELEASE: win %lx modifiers %u button %u time %lx\n",
@@ -116,7 +149,8 @@ void OBActions::motionHandler(const XMotionEvent &e)
 {
   // XXX: i can envision all sorts of crazy shit with this.. gestures, etc
   printf("GUILE: MOTION: win %lx modifiers %u x %d y %d\n",
-         (long)e.window, e.state, e.x, e.y);
+         (long)e.window, e.state,
+         e.x - _posqueue[0]->pos.x(), e.y - _posqueue[0]->pos.y());
 }
 
 
diff --git a/src/actions.hh b/src/actions.hh
index 3df4fe4a..3d45966e 100644
--- a/src/actions.hh
+++ b/src/actions.hh
@@ -6,11 +6,13 @@
   @brief The action interface for user-available actions
 */
 
-#include "otk/display.hh"
 #include "otk/point.hh"
-#include "otk/rect.hh"
 #include "otk/eventhandler.hh"
 
+extern "C" {
+#include <X11/Xlib.h>
+}
+
 namespace ob {
 
 //! The action interface for user-available actions
@@ -20,23 +22,38 @@ namespace ob {
 */
 class OBActions : public otk::OtkEventHandler {
 public:
-  struct MouseButtonAction {
+  struct ButtonReleaseAction {
     Window win;
     unsigned int button;
     Time time;
-    MouseButtonAction() { win = 0; button = 0; time = 0; }
+    ButtonReleaseAction() { win = 0; button = 0; time = 0; }
+  };
+
+  struct ButtonPressAction {
+    unsigned int button;
+    otk::Point pos;
+    ButtonPressAction() { button = 0; }
   };
   
 private:
   // milliseconds XXX: config option
   static const unsigned int DOUBLECLICKDELAY;
+  static const int BUTTONS = 5;
   
-  //! The last 2 button release processed for CLICKs
-  MouseButtonAction _release;
   //! 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];
 
-  void insertPress(Window win, unsigned int button, Time time);
+  //! 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:
   OBActions();
-- 
2.39.2