mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[core,settings] enforce fullscreen monitor requirements

Browse Source 
* Monitor must start at 0/0
* Monitor must be primary
This commit is contained in:
akallabeth 2024-10-24 11:15:43 +02:00
parent 7ab30a1b18
commit 392a085728
No known key found for this signature in database
GPG Key ID: A49454A3FC909FD5
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libfreerdp/core/settings.c
View File

@ -1680,8 +1680,9 @@ BOOL freerdp_settings_enforce_monitor_exists(rdpSettings* settings)
{
const UINT32 nrIds = freerdp_settings_get_uint32(settings, FreeRDP_NumMonitorIds);
const UINT32 count = freerdp_settings_get_uint32(settings, FreeRDP_MonitorCount);
const BOOL useMonitors = freerdp_settings_get_bool(settings, FreeRDP_Fullscreen) ||
freerdp_settings_get_bool(settings, FreeRDP_UseMultimon);
const BOOL fullscreen = freerdp_settings_get_bool(settings, FreeRDP_Fullscreen);
const BOOL multimon = freerdp_settings_get_bool(settings, FreeRDP_UseMultimon);
const BOOL useMonitors = fullscreen || multimon;
if (nrIds == 0)
{
@ -1722,6 +1723,19 @@ BOOL freerdp_settings_enforce_monitor_exists(rdpSettings* settings)
monitor->attributes.desktopScaleFactor = desktopScaleFactor;
monitor->attributes.deviceScaleFactor = deviceScaleFactor;
}
else if (fullscreen || (multimon && (count == 1)))
{
/* not all platforms start primary monitor at 0/0, so enforce this to avoid issues with
* fullscreen mode */
rdpMonitor* monitor =
freerdp_settings_get_pointer_array_writable(settings, FreeRDP_MonitorDefArray, 0);
if (!monitor)
return FALSE;
monitor->x = 0;
monitor->y = 0;
monitor->is_primary = TRUE;
}
return TRUE;
}