morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-14 00:14:11 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12298 from morgan9e/fix-sdl-smart-sizing

Browse Source 
[client,SDL3] Fix properly handle smart-sizing with fullscreen
This commit is contained in:
akallabeth
2026-02-13 09:24:19 +01:00
committed by GitHub
parent 341b25d508 14c66c8bfc
commit 0cef63776e
2 changed files with 40 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
client/SDL/SDL3/sdl_context.cpp
View File

@@ -173,6 +173,33 @@ BOOL SdlContext::preConnect(freerdp* instance)
if (!freerdp_settings_set_uint32(settings, FreeRDP_DesktopHeight, maxHeight))
return FALSE;
}
/**
* If /f is specified in combination with /smart-sizing:widthxheight then
* we run the session in the /smart-sizing dimensions scaled to full screen
*/
const uint32_t sw = freerdp_settings_get_uint32(settings, FreeRDP_SmartSizingWidth);
const uint32_t sh = freerdp_settings_get_uint32(settings, FreeRDP_SmartSizingHeight);
const BOOL sm = freerdp_settings_get_bool(settings, FreeRDP_SmartSizing);
if (sm && (sw > 0) && (sh > 0))
{
const BOOL mm = freerdp_settings_get_bool(settings, FreeRDP_UseMultimon);
if (mm)
WLog_Print(sdl->getWLog(), WLOG_WARN,
"/smart-sizing and /multimon are currently not supported, ignoring "
"/smart-sizing!");
else
{
sdl->_windowWidth = freerdp_settings_get_uint32(settings, FreeRDP_DesktopWidth);
sdl->_windowHeigth = freerdp_settings_get_uint32(settings, FreeRDP_DesktopHeight);
if (!freerdp_settings_set_uint32(settings, FreeRDP_DesktopWidth, sw))
return FALSE;
if (!freerdp_settings_set_uint32(settings, FreeRDP_DesktopHeight, sh))
return FALSE;
}
}
}
else
{
@@ -387,13 +414,20 @@ bool SdlContext::createWindows()
auto monitor = static_cast<rdpMonitor*>(
freerdp_settings_get_pointer_array_writable(settings, FreeRDP_MonitorDefArray, x));
auto w = WINPR_ASSERTING_INT_CAST(Uint32, monitor->width);
auto h = WINPR_ASSERTING_INT_CAST(Uint32, monitor->height);
Uint32 w = WINPR_ASSERTING_INT_CAST(Uint32, monitor->width);
Uint32 h = WINPR_ASSERTING_INT_CAST(Uint32, monitor->height);
if (!(freerdp_settings_get_bool(settings, FreeRDP_UseMultimon) ||
freerdp_settings_get_bool(settings, FreeRDP_Fullscreen)))
{
w = freerdp_settings_get_uint32(settings, FreeRDP_DesktopWidth);
h = freerdp_settings_get_uint32(settings, FreeRDP_DesktopHeight);
if (_windowWidth > 0)
w = _windowWidth;
else
w = freerdp_settings_get_uint32(settings, FreeRDP_DesktopWidth);
if (_windowHeigth > 0)
h = _windowHeigth;
else
h = freerdp_settings_get_uint32(settings, FreeRDP_DesktopHeight);
}
Uint32 flags = SDL_WINDOW_HIGH_PIXEL_DENSITY;

2
client/SDL/SDL3/sdl_context.hpp
View File

@@ -208,6 +208,8 @@ class SdlContext
std::map<Uint32, SdlWindow> _windows;
uint32_t _windowWidth = 0;
uint32_t _windowHeigth = 0;
WinPREvent _windowsCreatedEvent;
std::thread _thread;
};