github/FreeRDP
7
0
Fork 0
mirror of https://github.com/FreeRDP/FreeRDP.git synced 2025-06-03 00:00:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #8054: multimonitor settings

Browse Source
This commit is contained in:
Armin Novak 2022-07-07 16:06:54 +02:00 committed by akallabeth
parent 3478051f15
commit b2df9207e4
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/X11/xf_monitor.c
View File

@ -372,6 +372,9 @@ BOOL xf_detect_monitors(xfContext* xfc, UINT32* pMaxWidth, UINT32* pMaxHeight)
* command-line */ * command-line */
{ {
int i; int i;
UINT32 nr = 0;
if (settings->MonitorIds)
nr = settings->MonitorIds[0];
for (i = 0; i < vscreen->nmonitors; i++) for (i = 0; i < vscreen->nmonitors; i++)
{ {
@ -414,7 +417,7 @@ BOOL xf_detect_monitors(xfContext* xfc, UINT32* pMaxWidth, UINT32* pMaxHeight)
#endif #endif
if ((UINT32)i == settings->MonitorIds[0]) if ((UINT32)i == nr)
{ {
settings->MonitorDefArray[nmonitors].is_primary = TRUE; settings->MonitorDefArray[nmonitors].is_primary = TRUE;
settings->MonitorLocalShiftX = settings->MonitorDefArray[nmonitors].x; settings->MonitorLocalShiftX = settings->MonitorDefArray[nmonitors].x;
@ -512,7 +515,8 @@ BOOL xf_detect_monitors(xfContext* xfc, UINT32* pMaxWidth, UINT32* pMaxHeight)
if (settings->NumMonitorIds) if (settings->NumMonitorIds)
{ {
/* The first monitor is the first in the setting which should be used */ /* The first monitor is the first in the setting which should be used */
monitor_index = settings->MonitorIds[0]; if (settings->MonitorIds)
monitor_index = settings->MonitorIds[0];
} }
else else
{ {

2
libfreerdp/core/settings.c
View File

@ -430,7 +430,7 @@ rdpSettings* freerdp_settings_new(DWORD flags)
if (!freerdp_settings_set_uint32(settings, FreeRDP_MonitorLocalShiftY, 0)) if (!freerdp_settings_set_uint32(settings, FreeRDP_MonitorLocalShiftY, 0))
goto out_fail; goto out_fail;
if (!freerdp_settings_set_pointer_len(settings, FreeRDP_MonitorIds, NULL, 16)) if (!freerdp_settings_set_pointer_len(settings, FreeRDP_MonitorIds, NULL, 0))
goto out_fail; goto out_fail;
if (!settings_get_computer_name(settings)) if (!settings_get_computer_name(settings))