RomkaZVO/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs.git synced 2026-08-09 21:52:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

engine: platform: sdl2: refactor VID_RestoreScreenResolution to accept window_mode_t instead of reading cvar value

Browse Source
This commit is contained in:
Alibek Omarov
2025-12-08 18:57:31 +05:00
parent a4431b5cfd
commit c844cf7ec1
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/platform/sdl2/host_sdl2.c
+2 -2
View File
@@ -263,7 +263,7 @@ static void SDLash_ActiveEvent( int gain )
}
host.force_draw_version_time = host.realtime + 2.0;
VID_RestoreScreenResolution();
VID_RestoreScreenResolution( (window_mode_t)vid_fullscreen.value );
}
}
@@ -401,7 +401,7 @@ static void SDLash_EventHandler( SDL_Event *event )
case SDL_WINDOWEVENT_MINIMIZED:
host.status = HOST_SLEEP;
Cvar_DirectSet( &vid_maximized, "0" );
VID_RestoreScreenResolution( );
VID_RestoreScreenResolution( (window_mode_t)vid_fullscreen.value );
break;
case SDL_WINDOWEVENT_RESTORED:
host.status = HOST_FRAME;
engine/platform/sdl2/platform_sdl2.h
+1 -1
View File
@@ -21,7 +21,7 @@ GNU General Public License for more details.
#include "platform.h"
// window management
void VID_RestoreScreenResolution( void );
void VID_RestoreScreenResolution( window_mode_t window_mode );
qboolean VID_CreateWindow( int width, int height, window_mode_t window_mode );
void VID_DestroyWindow( void );
void GL_InitExtensions( void );
engine/platform/sdl2/vid_sdl2.c
+9 -6
View File
@@ -494,13 +494,13 @@ static qboolean VID_SetScreenResolution( int width, int height, window_mode_t wi
return true;
}
void VID_RestoreScreenResolution( void )
void VID_RestoreScreenResolution( window_mode_t window_mode )
{
// on mobile platform fullscreen is designed to be always on
// and code below minimizes our window if we're in full screen
// don't do that on mobile devices
#if !XASH_MOBILE_PLATFORM
switch((window_mode_t)vid_fullscreen.value )
switch( window_mode )
{
case WINDOW_MODE_WINDOWED:
// TODO: this line is from very old SDL video backend
@@ -711,7 +711,7 @@ qboolean VID_CreateWindow( int width, int height, window_mode_t window_mode )
if( !VID_SetScreenResolution( width, height, window_mode ))
return false;
}
else VID_RestoreScreenResolution();
else VID_RestoreScreenResolution( window_mode );
VID_SetWindowIcon( host.hWnd );
SDL_ShowWindow( host.hWnd );
@@ -765,7 +765,7 @@ void VID_DestroyWindow( void )
{
GL_DeleteContext();
VID_RestoreScreenResolution();
VID_RestoreScreenResolution( (window_mode_t)vid_fullscreen.value );
if( host.hWnd )
{
SDL_DestroyWindow ( host.hWnd );
@@ -986,7 +986,10 @@ rserr_t R_ChangeDisplaySettings( int width, int height, window_mode_t window_mod
}
refState.fullScreen = window_mode != WINDOW_MODE_WINDOWED;
Con_Reportf( "%s: Setting video mode to %dx%d %s\n", __func__, width, height, refState.fullScreen ? "fullscreen" : "windowed" );
Con_Reportf( "%s: Setting video mode to %dx%d %s\n", __func__, width, height,
window_mode == WINDOW_MODE_BORDERLESS ? "borderless" :
window_mode == WINDOW_MODE_WINDOWED ? "windowed" :
"fullscreen" );
if( !host.hWnd )
{
@@ -1000,7 +1003,7 @@ rserr_t R_ChangeDisplaySettings( int width, int height, window_mode_t window_mod
}
else
{
VID_RestoreScreenResolution();
VID_RestoreScreenResolution( window_mode );
if( SDL_SetWindowFullscreen( host.hWnd, 0 ) < 0 )
{