From eb69b2fce4acb5f5cfd21b4de68a102374ee81e0 Mon Sep 17 00:00:00 2001
From: Rico Tiongson <thericotiongson@gmail.com>
Date: Fri, 17 Apr 2020 23:48:58 +0800
Subject: [PATCH] Modify mouse move update

---
 lib/gesture/mouse_swipe_gesture.cpp | 34 ++++++++++++++++++++++-------
 lib/gesture/mouse_swipe_gesture.h   |  7 +++---
 lib/gesture/swipe_gesture.cpp       |  5 +++++
 lib/gesture/swipe_gesture.h         |  7 +++++-
 4 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/lib/gesture/mouse_swipe_gesture.cpp b/lib/gesture/mouse_swipe_gesture.cpp
index d9553de..82d328d 100644
--- a/lib/gesture/mouse_swipe_gesture.cpp
+++ b/lib/gesture/mouse_swipe_gesture.cpp
@@ -21,6 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <iostream> // std::cout, std::endl
 #include <cstdio> // std::sscanf
+#include <cstdlib> // strncmp
 #include "mouse_swipe_gesture.h"
 
 extern "C"
@@ -60,7 +61,8 @@ namespace comfortable_swipe::gesture
         int mouse = this->parse_mouse_input(mouseinput);
         if (mouse != -1)
         {
-            std::cout << "MOUSE DOWN " << mouse << std::endl;
+            // eg. MOUSE DOWN hold3 mouse1
+            std::printf("MOUSE DOWN hold%d %s\n", this->fingers, mouseinput);
             this->flag_mousedown = true;
         }
     }
@@ -73,7 +75,7 @@ namespace comfortable_swipe::gesture
         int mouse = this->parse_mouse_input(mouseinput);
         if (mouse != -1)
         {
-            std::cout << "MOUSE UP " << mouse << std::endl;
+            std::printf("MOUSE UP hold%d %s\n", this->fingers, mouseinput);
             this->flag_mousedown = false;
         }
     }
@@ -84,12 +86,22 @@ namespace comfortable_swipe::gesture
      */
     int mouse_swipe_gesture::parse_mouse_input(const char *input)
     {
-        // parse mouse number
-        int mouseno;
-        if (std::sscanf(input, "mouse%d", &mouseno) == 1)
+        // check if "mouse" is prefix
+        if (strncmp(input, "mouse", 5) == 0)
         {
-            return mouseno;
+            if (input[5] == '\0')
+            {
+                // just "mouse" without a number
+                return 0;
+            }
+            int mouseno;
+            if (std::sscanf(input + 5, "%d", &mouseno) == 1)
+            {
+                // parse the number after "mouse"
+                return mouseno;
+            }
         }
+
         return -1;
     }
 
@@ -120,8 +132,14 @@ namespace comfortable_swipe::gesture
         swipe_gesture::update();
         if (this->is_mousedown())
         {
-            // TODO: drag mouse while it's updating
-            std::cout << this->dx << " " << this->dy << std::endl;
+            // ix, iy: mouse location on begin
+            // ux, uy: integral of mouse accelerations
+            xdo_move_mouse(
+                this->xdo,
+                this->ix + this->ux,
+                this->iy + this->uy,
+                this->screen_num
+            );
         }
 
     }
diff --git a/lib/gesture/mouse_swipe_gesture.h b/lib/gesture/mouse_swipe_gesture.h
index fa1b0a8..d2c35fd 100644
--- a/lib/gesture/mouse_swipe_gesture.h
+++ b/lib/gesture/mouse_swipe_gesture.h
@@ -48,6 +48,9 @@ namespace comfortable_swipe::gesture
         virtual void do_mouseup(const char*);
         virtual bool is_mousedown();
 
+        // utility method to parse mouse input given config characters
+        virtual int parse_mouse_input(const char*);
+
     protected:
         // command holders
         const char * hold3;
@@ -55,10 +58,6 @@ namespace comfortable_swipe::gesture
 
         // flag we can use to check if mouse is down
         bool flag_mousedown;
-
-    private:
-        // utility method to parse mouse input given config characters
-        int parse_mouse_input(const char*);
     };
 }
 
diff --git a/lib/gesture/swipe_gesture.cpp b/lib/gesture/swipe_gesture.cpp
index e91d440..837759b 100644
--- a/lib/gesture/swipe_gesture.cpp
+++ b/lib/gesture/swipe_gesture.cpp
@@ -58,10 +58,13 @@ namespace comfortable_swipe::gesture
      */
     void swipe_gesture::begin()
     {
+        // save current screen location for gestured mouse movement
         xdo_get_mouse_location(this->xdo, &this->ix, &this->iy,
             &this->screen_num);
         this->x = 0;
         this->y = 0;
+        this->ux = 0;
+        this->uy = 0;
     }
 
     /**
@@ -71,6 +74,8 @@ namespace comfortable_swipe::gesture
     {
         this->x += this->dx;
         this->y += this->dy;
+        this->ux += this->udx;
+        this->uy += this->udy;
     }
 
     /**
diff --git a/lib/gesture/swipe_gesture.h b/lib/gesture/swipe_gesture.h
index ea435c1..36a0744 100644
--- a/lib/gesture/swipe_gesture.h
+++ b/lib/gesture/swipe_gesture.h
@@ -38,7 +38,12 @@ namespace comfortable_swipe::gesture
 
         // fields for xdo
         int fingers;
-        float x, y, dx, dy, udx, udy;
+
+        // normal values (for touchpad mapping)
+        float x, y, dx, dy;
+
+        // unaccelerated values (for screen mapping)
+        float ux, uy, udx, udy;
 
         // hooks that we can override (mark as virtual)
         virtual void begin();