incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Switch to calling SDL_GetDesktopDisplayMode in VID_GetRefreshRate

Browse source 
Avoids freezing on SDL3 + X11, otherwise behaves the same on My Machine(tm)
Also remove that annoying useless mouse grab on startup
This commit is contained in:
GenericHeroGuy 2025-08-17 18:06:35 +02:00
parent 4ebbaa7b58
commit 34f7d76aeb
1 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/sdl/i_video.cpp
View file

@ -123,7 +123,6 @@ static INT32 mousemovex = 0, mousemovey = 0;
// SDL vars
static SDL_Surface *vidSurface = NULL;
static UINT32 localPalette[256];
static SDL_bool mousegrabok = SDL_TRUE;
static SDL_bool wrapmouseok = SDL_FALSE;
#define HalfWarpMouse(x,y) if (wrapmouseok) SDL_WarpMouseInWindow(window, (Uint16)(x/2),(Uint16)(y/2))
static SDL_bool usesdl2soft = SDL_FALSE;
@ -419,7 +418,7 @@ static UINT32 VID_GetRefreshRate(void)
return 0;
}
if (SDL_GetCurrentDisplayMode(index, &m) != 0)
if (SDL_GetDesktopDisplayMode(index, &m) != 0)
{
// Error has occurred.
return 0;
@ -1743,17 +1742,11 @@ void I_StartupGraphics(void)
I_ShutdownTTF();
#endif
if (M_CheckParm("-nomousegrab"))
mousegrabok = SDL_FALSE;
VID_Command_Info_f();
SDLdoUngrabMouse();
SDL_RaiseWindow(window);
if (mousegrabok && !disable_mouse)
SDLdoGrabMouse();
graphics_started = true;
}