Merge branch 'v0.9' into v0.9-cherry-pick

NEWS.md

@@ -1,3 +1,47 @@
+# Release notes for xrdp v0.9.25.1 (2024/03/13)
+
+This release fixes a bug that occurred in v0.9.25 where scrolling did not work in the Xvnc backend.
+
+Thanks to @bsmojver reporting the issue and testing!
+
+## General announcements
+_This is the last v0.9.x version which is released regularly. v0.9.x will be maintained for a while but less actively. New releases will happen only when severe security vulnerabilities or critical bugs are found._
+
+We have created a fund on [Open Collective](https://opencollective.com/xrdp-project). Support us if you like xrdp!  Direct donations to each developer via GitHub Sponsors are also welcomed.
+
+## Bug fixes
+*  Mouse wheel scrolling in Xvnc session no longer works in 0.9.25 (#2993 #2994)
+
+-----------------------
+
+# Release notes for xrdp v0.9.25 (2024/03/11)
+* Running xrdp and xrdp-sesman on separate hosts is still supported by this release, but is now deprecated. This is not secure. A future v1.0 release will replace the TCP socket used between these processes with a Unix Domain Socket, and then cross-host running will not be possible.
+
+## General announcements
+
+_This is the last v0.9.x version which is released regularly. v0.9.x will be maintained for a while but less actively. New releases will happen only when severe security vulnerabilities or critical bugs are found._
+
+We have created a fund on [Open Collective](https://opencollective.com/xrdp-project). Support us if you like xrdp!  Direct donations to each developer via GitHub Sponsors are also welcomed.
+
+## Security fixes
+No new security fixes in this release.
+
+## Bug fixes
+* Backport touchpad inertial scrolling (#2364  #2424 #2948).
+
+## New features
+* If the client announces support for the Image RemoteFX codec it is logged (back-port of #2946)
+
+## Internal changes
+* FreeBSD CI version bumped to 13.2 from 12.4 (#2897)
+* Some test timeouts have been increased for slow CI machines (#2903)
+
+## Known issues
+* On-the-fly resolution change requires the Microsoft Store version of Remote Desktop client but sometimes crashes on connect (#1869)
+* xrdp's login dialog is not relocated at the center of the new resolution after on-the-fly resolution change happens (#1867)
+
+-----------------------
+
 # Release notes for xrdp v0.9.24 (2023/12/30)
 * Running xrdp and xrdp-sesman on separate hosts is still supported by this release, but is now deprecated. This is not secure. A future v1.0 release will replace the TCP socket used between these processes with a Unix Domain Socket, and then cross-host running will not be possible.
 

configure.ac

@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script
 
 AC_PREREQ(2.65)
-AC_INIT([xrdp], [0.9.24], [[email protected]])
+AC_INIT([xrdp], [0.9.25.1], [[email protected]])
 AC_DEFINE([VERSION_YEAR], 2024, [Copyright year])
 AC_CONFIG_HEADERS(config_ac.h:config_ac-h.in)
 AM_INIT_AUTOMAKE([1.7.2 foreign])

xrdp/xrdp_mm.c

@@ -55,7 +55,6 @@ xrdp_mm_chansrv_connect(struct xrdp_mm *self, const char *ip, const char *port);
 static void
 xrdp_mm_connect_sm(struct xrdp_mm *self);
 
-
 /*****************************************************************************/
 struct xrdp_mm *
 xrdp_mm_create(struct xrdp_wm *owner)

xrdp/xrdp_types.h

@@ -32,6 +32,13 @@
 #define MAX_NR_CHANNELS 16
 #define MAX_CHANNEL_NAME 16
 
+/* Code values used in 'xrdp_mm->code=' settings */
+#define XVNC_SESSION_CODE 0
+#define XORG_SESSION_CODE 20
+
+/* To check whether touch events has been implemented on session type 'mm' */
+#define XRDP_MM_IMPLEMENTS_TOUCH(mm) ((mm)->code != XVNC_SESSION_CODE)
+
 struct source_info;
 
 /* lib */

xrdp/xrdp_wm.c

@@ -29,8 +29,6 @@
 #include "log.h"
 #include "string_calls.h"
 
-
-
 /*****************************************************************************/
 struct xrdp_wm *
 xrdp_wm_create(struct xrdp_process *owner,
@@ -1806,7 +1804,7 @@ xrdp_wm_process_input_mouse(struct xrdp_wm *self, int device_flags,
              * The negative number is represented by complement.
              */
             delta = (device_flags & WheelRotationMask) | ~WheelRotationMask;
-            if (delta != 0)
+            if (delta != 0 && XRDP_MM_IMPLEMENTS_TOUCH(self->mm))
             {
                 // Use nature scrolling, up direction is negative.
                 xrdp_wm_mouse_touch(self, TOUCH_TWO_FINGERS_UP, delta);
@@ -1819,7 +1817,7 @@ xrdp_wm_process_input_mouse(struct xrdp_wm *self, int device_flags,
         else
         {
             delta = device_flags & WheelRotationMask;
-            if (delta != 0)
+            if (delta != 0 && XRDP_MM_IMPLEMENTS_TOUCH(self->mm))
             {
                 xrdp_wm_mouse_touch(self, TOUCH_TWO_FINGERS_DOWN, delta);
             }
@@ -1852,7 +1850,7 @@ xrdp_wm_process_input_mouse(struct xrdp_wm *self, int device_flags,
              * The negative number is represented by complement.
              */
             delta = (device_flags & WheelRotationMask) | ~WheelRotationMask;
-            if (delta != 0)
+            if (delta != 0 && XRDP_MM_IMPLEMENTS_TOUCH(self->mm))
             {
                 // Use nature scrolling, right direction is negative.
                 xrdp_wm_mouse_touch(self, TOUCH_TWO_FINGERS_RIGHT, delta);
@@ -1865,7 +1863,7 @@ xrdp_wm_process_input_mouse(struct xrdp_wm *self, int device_flags,
         else
         {
             delta = device_flags & WheelRotationMask;
-            if (delta != 0)
+            if (delta != 0 && XRDP_MM_IMPLEMENTS_TOUCH(self->mm))
             {
                 xrdp_wm_mouse_touch(self, TOUCH_TWO_FINGERS_LEFT, delta);
             }