Implement reverse touch scroll

neutrinolabs · Jun 1, 2024 · 29be824 · 29be824
1 parent 0e13e5d
commit 29be824
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 2 deletions.
diff --git a/module/rdp.h b/module/rdp.h
@@ -282,6 +282,9 @@ struct _rdpRec
     CARD32 last_event_time_ms;
     CARD32 last_wheel_time_ms;
 
+    int reverse_touch_vscroll; /* boolean */
+    int reverse_touch_hscroll; /* boolean */
+
     int conNumber;
 
     struct _rdpCounts counts;

diff --git a/module/rdpClientCon.c b/module/rdpClientCon.c
@@ -1641,6 +1641,35 @@ rdpClientConInit(rdpPtr dev)
     LLOGLN(0, ("rdpClientConInit: kill disconnected [%d] timeout [%d] sec",
                dev->do_kill_disconnected, dev->disconnect_timeout_s));
 
+    ptext = getenv("XRDP_REVERSE_TOUCH_VSCROLL");
+    if (ptext != 0)
+    {
+        i = atoi(ptext);
+        if (i == 0)
+        {
+            dev->reverse_touch_vscroll = 0;
+        }
+        else
+        {
+            dev->reverse_touch_vscroll = 1;
+        }
+    }
+
+    ptext = getenv("XRDP_REVERSE_TOUCH_HSCROLL");
+    if (ptext != 0)
+    {
+        i = atoi(ptext);
+        if (i == 0)
+        {
+            dev->reverse_touch_hscroll = 0;
+        }
+        else
+        {
+            dev->reverse_touch_hscroll = 1;
+        }
+    }
+    LLOGLN(0, ("rdpClientInit: reverse scroll vertical [%d] horizontal [%d]",
+               dev->reverse_touch_vscroll, dev->reverse_touch_hscroll));
 
     return 0;
 }

diff --git a/xrdpmouse/rdpMouse.c b/xrdpmouse/rdpMouse.c
@@ -194,6 +194,7 @@ rdpInputMouse(rdpPtr dev, int msg,
               long param3, long param4)
 {
     rdpPointer *pointer;
+    int scroll_delta;
 
     LLOGLN(10, ("rdpInputMouse: msg %d param1 %ld param2 %ld param3 %ld param4 %ld",
                 msg, param1, param2, param3, param4));
@@ -280,10 +281,20 @@ rdpInputMouse(rdpPtr dev, int msg,
             PtrAddEvent(pointer);
             break;
         case WM_TOUCH_VSCROLL:
-            PtrAddScrollEvent(pointer, TRUE, param3);
+            scroll_delta = param3;
+            if (dev->reverse_touch_vscroll)
+            {
+                scroll_delta = -scroll_delta;
+            }
+            PtrAddScrollEvent(pointer, TRUE, scroll_delta);
             break;
         case WM_TOUCH_HSCROLL:
-            PtrAddScrollEvent(pointer, FALSE, param3);
+            scroll_delta = param3;
+            if (dev->reverse_touch_hscroll)
+            {
+                scroll_delta = -scroll_delta;
+            }
+            PtrAddScrollEvent(pointer, FALSE, scroll_delta);
             break;
     }
     return 0;