From b66ceda525f1c116d9bd708e781dc654e06e119e Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 6 Mar 2024 09:27:09 +0100 Subject: [PATCH] Revert "attempt at exclusive fullscreen mode" This reverts commit 19f1d8b8477a41d6fc36f0cc3429a17751708166. --- src/screen.c | 3 +-- src/sdl/i_video.c | 31 +++++-------------------------- 2 files changed, 6 insertions(+), 28 deletions(-) diff --git a/src/screen.c b/src/screen.c index 1a6f0e48f..9594e876f 100644 --- a/src/screen.c +++ b/src/screen.c @@ -70,8 +70,7 @@ consvar_t cv_shittyscreen = {"televisionsignal", "Okay", CV_NOSHOWHELP, shittysc static void SCR_ChangeFullscreen (void); -static CV_PossibleValue_t fullscreen_cons_t[] = {{0, "Off"}, {1, "Normal"}, {2, "Exclusive"}, {0, NULL}}; -consvar_t cv_fullscreen = {"fullscreen", "Normal", CV_SAVE|CV_CALL, fullscreen_cons_t, SCR_ChangeFullscreen, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_fullscreen = {"fullscreen", "Yes", CV_SAVE|CV_CALL, CV_YesNo, SCR_ChangeFullscreen, 0, NULL, NULL, 0, 0, NULL}; // ========================================================================= // SCREEN VARIABLES diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c index 5f49e62b2..70a9361a4 100644 --- a/src/sdl/i_video.c +++ b/src/sdl/i_video.c @@ -233,17 +233,11 @@ static void SDLSetMode(INT32 width, INT32 height, SDL_bool fullscreen) if (window) { - if (fullscreen && cv_fullscreen.value == 1) + if (fullscreen) { wasfullscreen = SDL_TRUE; SDL_SetWindowFullscreen(window, SDL_WINDOW_FULLSCREEN_DESKTOP); } - else if (fullscreen && cv_fullscreen.value == 2) - { - wasfullscreen = SDL_TRUE; - SDL_SetWindowSize(window, realwidth, realheight); - SDL_SetWindowFullscreen(window, SDL_WINDOW_FULLSCREEN); - } else // windowed mode { if (wasfullscreen) @@ -264,20 +258,11 @@ static void SDLSetMode(INT32 width, INT32 height, SDL_bool fullscreen) Impl_CreateWindow(fullscreen); Impl_SetWindowIcon(); wasfullscreen = fullscreen; - if (!fullscreen) - SDL_SetWindowSize(window, width, height); - else if (fullscreen && cv_fullscreen.value == 1) + SDL_SetWindowSize(window, width, height); + if (fullscreen) { - wasfullscreen = SDL_TRUE; - SDL_SetWindowSize(window, width, height); SDL_SetWindowFullscreen(window, SDL_WINDOW_FULLSCREEN_DESKTOP); } - else if (fullscreen && cv_fullscreen.value == 2) - { - wasfullscreen = SDL_TRUE; - SDL_SetWindowSize(window, realwidth, realheight); - SDL_SetWindowFullscreen(window, SDL_WINDOW_FULLSCREEN); - } } #ifdef HWRENDER @@ -1961,10 +1946,8 @@ static SDL_bool Impl_CreateWindow(SDL_bool fullscreen) if (window != NULL) return SDL_FALSE; - if (fullscreen && cv_fullscreen.value == 1) + if (fullscreen) flags |= SDL_WINDOW_FULLSCREEN_DESKTOP; - else if (fullscreen && cv_fullscreen.value == 2) - flags |= SDL_WINDOW_FULLSCREEN; if (borderlesswindow) flags |= SDL_WINDOW_BORDERLESS; @@ -1991,11 +1974,7 @@ static SDL_bool Impl_CreateWindow(SDL_bool fullscreen) #endif // Create a window - if (cv_fullscreen.value == 2) - window = SDL_CreateWindow("SRB2Kart "VERSIONSTRING, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, - vid.width, vid.height, flags); - else - window = SDL_CreateWindow("SRB2Kart "VERSIONSTRING, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, + window = SDL_CreateWindow("SRB2Kart "VERSIONSTRING, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, realwidth, realheight, flags); if (window == NULL)