Skip to content

Commit 8d4fe02

Browse files
committed
Update for unification of monitor processing
Related to neutrinolabs/xrdp#1895
1 parent 2856e3c commit 8d4fe02

File tree

1 file changed

+13
-0
lines changed

1 file changed

+13
-0
lines changed

module/rdpClientCon.c

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -971,14 +971,27 @@ rdpClientConProcessMsgClientInfo(rdpPtr dev, rdpClientCon *clientCon)
971971
{
972972
LLOGLN(0, (" client can not do new(color) cursor"));
973973
}
974+
#if CLIENT_INFO_CURRENT_VERSION = 20210723
974975
if (clientCon->client_info.monitorCount > 0)
976+
#else
977+
if (clientCon->client_info.display_sizes.monitorCount > 0)
978+
#endif
975979
{
976980
LLOGLN(0, (" client can do multimon"));
981+
#if CLIENT_INFO_CURRENT_VERSION = 20210723
977982
LLOGLN(0, (" client monitor data, monitorCount=%d", clientCon->client_info.monitorCount));
983+
#else
984+
LLOGLN(0, (" client monitor data, monitorCount=%d", clientCon->client_info.display_sizes.monitorCount));
985+
#endif
978986
clientCon->doMultimon = 1;
979987
dev->doMultimon = 1;
988+
#if CLIENT_INFO_CURRENT_VERSION = 20210723
980989
memcpy(dev->minfo, clientCon->client_info.minfo, sizeof(dev->minfo));
981990
dev->monitorCount = clientCon->client_info.monitorCount;
991+
#else
992+
memcpy(dev->minfo, clientCon->client_info.display_sizes.minfo, sizeof(dev->minfo));
993+
dev->monitorCount = clientCon->client_info.display_sizes.monitorCount;
994+
#endif
982995

983996
box.x1 = dev->minfo[0].left;
984997
box.y1 = dev->minfo[0].top;

0 commit comments

Comments
 (0)