Update for unification of monitor processing

Related to neutrinolabs/xrdp#1895
Nexarian · Mar 27, 2022 · a4a9224 · a4a9224
1 parent 2856e3c
commit a4a9224
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/module/rdpClientCon.c b/module/rdpClientCon.c
@@ -971,14 +971,27 @@ rdpClientConProcessMsgClientInfo(rdpPtr dev, rdpClientCon *clientCon)
     {
         LLOGLN(0, ("  client can not do new(color) cursor"));
     }
+#if CLIENT_INFO_CURRENT_VERSION == 20210723
     if (clientCon->client_info.monitorCount > 0)
+#else
+    if (clientCon->client_info.display_sizes.monitorCount > 0)
+#endif
     {
         LLOGLN(0, ("  client can do multimon"));
+#if CLIENT_INFO_CURRENT_VERSION == 20210723
         LLOGLN(0, ("  client monitor data, monitorCount=%d", clientCon->client_info.monitorCount));
+#else
+        LLOGLN(0, ("  client monitor data, monitorCount=%d", clientCon->client_info.display_sizes.monitorCount));
+#endif
         clientCon->doMultimon = 1;
         dev->doMultimon = 1;
+#if CLIENT_INFO_CURRENT_VERSION == 20210723
         memcpy(dev->minfo, clientCon->client_info.minfo, sizeof(dev->minfo));
         dev->monitorCount = clientCon->client_info.monitorCount;
+#else
+        memcpy(dev->minfo, clientCon->client_info.display_sizes.minfo, sizeof(dev->minfo));
+        dev->monitorCount = clientCon->client_info.display_sizes.monitorCount;
+#endif
 
         box.x1 = dev->minfo[0].left;
         box.y1 = dev->minfo[0].top;