Merge pull request #1895 from Nexarian/unify_monitor_description_processing_resize_sec

Unify monitor processing logic.

Author: matt335672

common/ms-rdpbcgr.h

@@ -83,10 +83,24 @@
 #define RDPSND_SVC_CHANNEL_NAME         "rdpsnd"
 #define RDPDR_SVC_CHANNEL_NAME          "rdpdr"
 
-/* 2.2.1.3.6 Client Monitor Data - */
+/* 2.2.1.3.6 Client Monitor Data */
 /* monitorCount (4 bytes): A 32-bit, unsigned integer. The number of display */
 /* monitor definitions in the monitorDefArray field (the maximum allowed is 16). */
-#define CLIENT_MONITOR_DATA_MAXIMUM_MONITORS 16
+#define CLIENT_MONITOR_DATA_MAXIMUM_MONITORS               16
+
+/* 2.2.1.3.6 Client Monitor Data */
+/* The maximum width of the virtual desktop resulting from the union of the monitors */
+/* contained in the monitorDefArray field MUST NOT exceed 32,766 pixels. Similarly, */
+/* the maximum height of the virtual desktop resulting from the union of the monitors  */
+/* contained in the monitorDefArray field MUST NOT exceed 32,766 pixels. */
+/* The minimum permitted size of the virtual desktop is 200 x 200 pixels. */
+#define CLIENT_MONITOR_DATA_MINIMUM_VIRTUAL_DESKTOP_WIDTH  0xC8
+#define CLIENT_MONITOR_DATA_MINIMUM_VIRTUAL_DESKTOP_HEIGHT 0xC8
+#define CLIENT_MONITOR_DATA_MAXIMUM_VIRTUAL_DESKTOP_WIDTH  0x7FFE
+#define CLIENT_MONITOR_DATA_MAXIMUM_VIRTUAL_DESKTOP_HEIGHT 0x7FFE
+
+/* 2.2.1.3.6.1 Monitor Definition (TS_MONITOR_DEF) */
+#define TS_MONITOR_PRIMARY 0x00000001
 
 /* Options field */
 /* NOTE: XR_ prefixed to avoid conflict with FreeRDP */

common/ms-rdpedisp.h

@@ -23,7 +23,19 @@
 #define MS_RDPEDISP_H
 
 /* Display Control Messages: Display Virtual Channel Extension (2.2.2) */
-#define DISPLAYCONTROL_PDU_TYPE_MONITOR_LAYOUT 0x00000002
-#define DISPLAYCONTROL_PDU_TYPE_CAPS           0x00000005
+#define DISPLAYCONTROL_PDU_TYPE_MONITOR_LAYOUT             0x00000002
+#define DISPLAYCONTROL_PDU_TYPE_CAPS                       0x00000005
+
+/* Display Control Monitor Layout (2.2.2.2.1) */
+#define DISPLAYCONTROL_MONITOR_PRIMARY                     0x00000001
+#define CLIENT_MONITOR_DATA_MINIMUM_VIRTUAL_MONITOR_WIDTH  0xC8
+#define CLIENT_MONITOR_DATA_MINIMUM_VIRTUAL_MONITOR_HEIGHT 0xC8
+#define CLIENT_MONITOR_DATA_MAXIMUM_VIRTUAL_MONITOR_WIDTH  0x2000
+#define CLIENT_MONITOR_DATA_MAXIMUM_VIRTUAL_MONITOR_HEIGHT 0x2000
+
+#define ORIENTATION_LANDSCAPE                              0
+#define ORIENTATION_PORTRAIT                               90
+#define ORIENTATION_LANDSCAPE_FLIPPED                      180
+#define ORIENTATION_PORTRAIT_FLIPPED                       270
 
 #endif /* MS_RDPEDISP_H */

common/xrdp_client_info.h

@@ -24,13 +24,29 @@
 #if !defined(XRDP_CLIENT_INFO_H)
 #define XRDP_CLIENT_INFO_H
 
+/*
+ * 2.2.1.3.6.1 Monitor Definition (TS_MONITOR_DEF)
+ * 2.2.1.3.9.1 Monitor Attributes (TS_MONITOR_ATTRIBUTES)
+ * 2.2.2.2.1 DISPLAYCONTROL_MONITOR_LAYOUT
+ */
 struct monitor_info
 {
+    /* From 2.2.1.3.6.1 Monitor Definition (TS_MONITOR_DEF) */
     int left;
     int top;
     int right;
     int bottom;
-    int is_primary;
+    int flags;
+
+    /* From 2.2.2.2.1 DISPLAYCONTROL_MONITOR_LAYOUT */
+    unsigned int physical_width;
+    unsigned int physical_height;
+    unsigned int orientation;
+    unsigned int desktop_scale_factor;
+    unsigned int device_scale_factor;
+
+    /* Derived setting */
+    unsigned int is_primary;
 };
 
 /* xrdp keyboard overrids */
@@ -41,6 +57,15 @@ struct xrdp_keyboard_overrides
     int layout;
 };
 
+struct display_size_description
+{
+    unsigned int monitorCount; /* 2.2.2.2 DISPLAYCONTROL_MONITOR_LAYOUT_PDU: number of monitors detected (max = 16) */
+    struct monitor_info minfo[CLIENT_MONITOR_DATA_MAXIMUM_MONITORS]; /* client monitor data */
+    struct monitor_info minfo_wm[CLIENT_MONITOR_DATA_MAXIMUM_MONITORS]; /* client monitor data, non-negative values */
+    unsigned int session_width;
+    unsigned int session_height;
+};
+
 /**
  * Information about the xrdp client
  *
@@ -54,8 +79,6 @@ struct xrdp_client_info
     int size; /* bytes for this structure */
     int version; /* Should be CLIENT_INFO_CURRENT_VERSION */
     int bpp;
-    int width;
-    int height;
     /* bitmap cache info */
     int cache1_entries;
     int cache1_size;
@@ -128,9 +151,7 @@ struct xrdp_client_info
 
     int security_layer; /* 0 = rdp, 1 = tls , 2 = hybrid */
     int multimon; /* 0 = deny , 1 = allow */
-    int monitorCount; /* number of monitors detected (max = 16) */
-    struct monitor_info minfo[CLIENT_MONITOR_DATA_MAXIMUM_MONITORS]; /* client monitor data */
-    struct monitor_info minfo_wm[CLIENT_MONITOR_DATA_MAXIMUM_MONITORS]; /* client monitor data, non-negative values */
+    struct display_size_description display_sizes;
 
     int keyboard_type;
     int keyboard_subtype;
@@ -186,6 +207,6 @@ struct xrdp_client_info
 };
 
 /* yyyymmdd of last incompatible change to xrdp_client_info */
-#define CLIENT_INFO_CURRENT_VERSION 20210723
+#define CLIENT_INFO_CURRENT_VERSION 20220320
 
 #endif