Merge pull request neutrinolabs#2951 from metalefty/v0.10-monitor-hot…

…plug [v0.10] Fixes some problems with monitor hotplug
metalefty · Feb 20, 2024 · c3cb855 · c3cb855
2 parents 12ff5d4 + d769b40
commit c3cb855
Show file tree

Hide file tree

Showing 20 changed files with 752 additions and 570 deletions.
diff --git a/common/ms-rdpbcgr.h b/common/ms-rdpbcgr.h
@@ -74,6 +74,7 @@
 
 /* Client Core Data: earlyCapabilityFlags (2.2.1.3.2) */
 #define RNS_UD_CS_WANT_32BPP_SESSION         0x0002
+#define RNS_UD_CS_SUPPORT_MONITOR_LAYOUT_PDU 0x0040
 #define RNS_UD_CS_SUPPORT_DYNVC_GFX_PROTOCOL 0x0100
 
 /* Client Core Data: connectionType  (2.2.1.3.2) */
@@ -448,6 +449,7 @@
 #define RDP_DATA_PDU_LOGON             38
 #define RDP_DATA_PDU_FONT2             39
 #define RDP_DATA_PDU_DISCONNECT        47
+#define PDUTYPE2_MONITOR_LAYOUT_PDU    55
 
 /* TS_SECURITY_HEADER: flags (2.2.8.1.1.2.1) */
 /* TODO: to be renamed */

diff --git a/common/xrdp_client_info.h b/common/xrdp_client_info.h
@@ -67,6 +67,13 @@ struct display_size_description
     unsigned int session_height;
 };
 
+enum client_resize_mode
+{
+    CRMODE_NONE,
+    CRMODE_SINGLE_SCREEN,
+    CRMODE_MULTI_SCREEN
+};
+
 /**
  * Information about the xrdp client
  *
@@ -218,6 +225,9 @@ struct xrdp_client_info
 
     int large_pointer_support_flags;
     int gfx;
+
+    // Can we resize the desktop by using a Deactivation-Reactivation Sequence?
+    enum client_resize_mode client_resize_mode;
 };
 
 enum xrdp_encoder_flags