yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-22 20:51:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Port PrintDisplayModes() to SDL 3.

Browse source
This commit is contained in:
Yamagi 2024-03-29 10:44:35 +01:00
parent 55a1e38717
commit cbc46009fd
1 changed files with 13 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/client/vid/glimp_sdl3.c
View file

@ -33,6 +33,7 @@
* * `fullscreen` should be an enum to make the code more readable. * * `fullscreen` should be an enum to make the code more readable.
* * Debug fullscreen handling, maybe refactor it further. * * Debug fullscreen handling, maybe refactor it further.
* * Check if window size handling is correct. * * Check if window size handling is correct.
* * Check pointers returned by SDL functions for memory leaks.
*/ */
#include "../../common/header/common.h" #include "../../common/header/common.h"
@ -272,32 +273,27 @@ PrintDisplayModes(void)
{ {
int curdisplay = window ? SDL_GetDisplayForWindow(window) : 0; int curdisplay = window ? SDL_GetDisplayForWindow(window) : 0;
// On X11 (at least for me) /* Might get called without a window */
// curdisplay is always -1.
// DG: probably because window was NULL?
if (curdisplay < 0) { if (curdisplay < 0) {
curdisplay = 0; curdisplay = 0;
} }
int nummodes = SDL_GetNumDisplayModes(curdisplay); int nummodes = 0;
const SDL_DisplayMode **modes = SDL_GetFullscreenDisplayModes(curdisplay, &nummodes);
if (nummodes < 1) if (modes)
{ {
Com_Printf("Can't get display modes: %s\n", SDL_GetError()); for (int i = 0; i < nummodes; ++i)
return;
}
for (int i = 0; i < nummodes; i++)
{
SDL_DisplayMode mode;
if (SDL_GetDisplayMode(curdisplay, i, &mode) != 0)
{ {
Com_Printf("Can't get display mode: %s\n", SDL_GetError()); const SDL_DisplayMode *mode = modes[i];
return; Com_Printf(" - Mode %2i: %ix%i@%f\n", i, mode->w, mode->h, mode->refresh_rate);
} }
Com_Printf(" - Mode %2i: %ix%i@%i\n", i, mode.w, mode.h, mode.refresh_rate); SDL_free(modes);
}
else
{
Com_Printf("Couldn't get display modes: %s\n", SDL_GetError());
} }
} }