Update for unification of monitor processing

Nexarian · Nexarian · commit 27ef6aabbbcd · 2022-03-20T21:00:35.000-04:00
Related to neutrinolabs/xrdp#1895
diff --git a/module/rdpClientCon.c b/module/rdpClientCon.c
@@ -971,14 +971,14 @@ rdpClientConProcessMsgClientInfo(rdpPtr dev, rdpClientCon *clientCon)
     {
         LLOGLN(0, ("  client can not do new(color) cursor"));
     }
-    if (clientCon->client_info.monitorCount > 0)
+    if (clientCon->client_info.display_sizes.monitorCount > 0)
     {
         LLOGLN(0, ("  client can do multimon"));
-        LLOGLN(0, ("  client monitor data, monitorCount=%d", clientCon->client_info.monitorCount));
+        LLOGLN(0, ("  client monitor data, monitorCount=%d", clientCon->client_info.display_sizes.monitorCount));
         clientCon->doMultimon = 1;
         dev->doMultimon = 1;
-        memcpy(dev->minfo, clientCon->client_info.minfo, sizeof(dev->minfo));
-        dev->monitorCount = clientCon->client_info.monitorCount;
+        memcpy(dev->minfo, clientCon->client_info.display_sizes.minfo, sizeof(dev->minfo));
+        dev->monitorCount = clientCon->client_info.display_sizes.monitorCount;
 
         box.x1 = dev->minfo[0].left;
         box.y1 = dev->minfo[0].top;

Original file line number	Diff line number	Diff line change
`@@ -971,14 +971,14 @@ rdpClientConProcessMsgClientInfo(rdpPtr dev, rdpClientCon *clientCon)`
`971`	`971`	`{`
`972`	`972`	`LLOGLN(0, (" client can not do new(color) cursor"));`
`973`	`973`	`}`
`974`		`- if (clientCon->client_info.monitorCount > 0)`
	`974`	`+ if (clientCon->client_info.display_sizes.monitorCount > 0)`
`975`	`975`	`{`
`976`	`976`	`LLOGLN(0, (" client can do multimon"));`
`977`		`- LLOGLN(0, (" client monitor data, monitorCount=%d", clientCon->client_info.monitorCount));`
	`977`	`+ LLOGLN(0, (" client monitor data, monitorCount=%d", clientCon->client_info.display_sizes.monitorCount));`
`978`	`978`	`clientCon->doMultimon = 1;`
`979`	`979`	`dev->doMultimon = 1;`
`980`		`- memcpy(dev->minfo, clientCon->client_info.minfo, sizeof(dev->minfo));`
`981`		`- dev->monitorCount = clientCon->client_info.monitorCount;`
	`980`	`+ memcpy(dev->minfo, clientCon->client_info.display_sizes.minfo, sizeof(dev->minfo));`
	`981`	`+ dev->monitorCount = clientCon->client_info.display_sizes.monitorCount;`
`982`	`982`
`983`	`983`	`box.x1 = dev->minfo[0].left;`
`984`	`984`	`box.y1 = dev->minfo[0].top;`