AnarchistGamers/woof
1
0
Fork 0
mirror of https://github.com/fabiangreffrath/woof.git synced 2025-09-22 19:38:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

add exclusive fullscreen to the menu (#1011)

Browse Source 
Enable exclusive fullscreen only in fullscreen mode, because switch between
exclusive fullscreen and windowed mode is glitchy on my Windows 10 system.

* fix and simplify widow position saving

* save position of borderless fullscreen window

Required for a multi-monitor setup. Not sure if this is a useful feature.

* remove workaround in SDL 2.0.14 and 2.0.16 as we require SDL 2.0.18
This commit is contained in:
Roman Fomin 2023-04-25 14:36:37 +07:00 committed by GitHub
parent 88f2350296
commit dc4182d6d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 113 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

127
src/i_video.c
View File

@ -58,10 +58,10 @@ static SDL_Texture *texture;
static SDL_Rect blit_rect = {0};
int window_width, window_height;
int window_position_x, window_position_y;
static int window_x, window_y;
char *window_position;
int video_display = 0;
int fullscreen_width = 0, fullscreen_height = 0; // [FG] exclusive fullscreen
static int fullscreen_width, fullscreen_height; // [FG] exclusive fullscreen
void *I_GetSDLWindow(void)
{
@ -279,6 +279,7 @@ int grabmouse = 1;
boolean screenvisible = true;
static boolean window_focused = true;
boolean fullscreen;
boolean exclusive_fullscreen;
//
// MouseShouldBeGrabbed
@ -631,18 +632,10 @@ static boolean ToggleFullScreenKeyShortcut(SDL_Keysym *sym)
sym->scancode == SDL_SCANCODE_KP_ENTER) && (sym->mod & flags) != 0;
}
static void I_ToggleFullScreen(void)
void I_ToggleFullScreen(void)
{
unsigned int flags = 0;
// [FG] exclusive fullscreen
if (fullscreen_width != 0 || fullscreen_height != 0)
{
return;
}
fullscreen = !fullscreen;
if (fullscreen)
{
SDL_GetWindowSize(screen, &window_width, &window_height);
@ -662,20 +655,22 @@ static void I_ToggleFullScreen(void)
}
}
// [FG] the fullscreen variable gets toggled once by the menu code, so we
// toggle it back here, it is then toggled again in I_ToggleFullScreen()
void I_ToggleToggleFullScreen(void)
void I_ToggleExclusiveFullScreen(void)
{
// [FG] exclusive fullscreen
if (fullscreen_width != 0 || fullscreen_height != 0)
if (!fullscreen)
{
return;
}
fullscreen = !fullscreen;
I_ToggleFullScreen();
if (exclusive_fullscreen)
{
SDL_SetWindowSize(screen, fullscreen_width, fullscreen_height);
SDL_SetWindowFullscreen(screen, SDL_WINDOW_FULLSCREEN);
}
else
{
SDL_SetWindowFullscreen(screen, SDL_WINDOW_FULLSCREEN_DESKTOP);
}
}
void I_ToggleVsync(void)
@ -698,9 +693,13 @@ void I_GetEvent(void)
case SDL_KEYDOWN:
if (ToggleFullScreenKeyShortcut(&sdlevent.key.keysym))
{
I_ToggleFullScreen();
if (!exclusive_fullscreen)
{
fullscreen = !fullscreen;
M_ToggleFullScreen();
break;
}
}
// deliberate fall-though
case SDL_KEYUP:
@ -1163,19 +1162,7 @@ void I_ShutdownGraphics(void)
{
if (in_graphics_mode) // killough 10/98
{
char buf[16];
int buflen;
// Store the (x, y) coordinates of the window
// in the "window_position" config parameter
SDL_GetWindowPosition(screen, &window_x, &window_y);
M_snprintf(buf, sizeof(buf), "%i,%i", window_x, window_y);
buflen = strlen(buf) + 1;
if (strlen(window_position) < buflen)
{
window_position = I_Realloc(window_position, buflen);
}
M_StringCopy(window_position, buf, buflen);
SDL_GetWindowPosition(screen, &window_position_x, &window_position_y);
UpdateGrab();
in_graphics_mode = false;
@ -1300,6 +1287,13 @@ static void CenterWindow(int *x, int *y, int w, int h)
*x = bounds.x + SDL_max((bounds.w - w) / 2, 0);
*y = bounds.y + SDL_max((bounds.h - h) / 2, 0);
// Fix exclusive fullscreen mode.
if (*x == 0 && *y == 0)
{
*x = SDL_WINDOWPOS_CENTERED;
*y = SDL_WINDOWPOS_CENTERED;
}
}
static void I_GetWindowPosition(int *x, int *y, int w, int h)
@ -1324,25 +1318,18 @@ static void I_GetWindowPosition(int *x, int *y, int w, int h)
return;
}
// in windowed mode, the desired window position can be specified
// in the configuration file.
if (window_position == NULL || !strcmp(window_position, ""))
// center
if (window_position_x == 0 && window_position_y == 0)
{
*x = *y = SDL_WINDOWPOS_UNDEFINED;
}
else if (!strcmp(window_position, "center"))
{
// Note: SDL has a SDL_WINDOWPOS_CENTER, but this is useless for our
// Note: SDL has a SDL_WINDOWPOS_CENTERED, but this is useless for our
// purposes, since we also want to control which display we appear on.
// So we have to do this ourselves.
CenterWindow(x, y, w, h);
}
else if (sscanf(window_position, "%i,%i", x, y) != 2)
else
{
// invalid format: revert to default
fprintf(stderr, "I_GetWindowPosition: invalid window_position setting\n");
*x = *y = SDL_WINDOWPOS_UNDEFINED;
*x = window_position_x;
*y = window_position_y;
}
}
@ -1516,8 +1503,7 @@ static void I_InitGraphicsMode(void)
// Run in fullscreen mode.
//
else if (M_CheckParm("-fullscreen") || fullscreen ||
fullscreen_width != 0 || fullscreen_height != 0)
else if (M_CheckParm("-fullscreen"))
{
fullscreen = true;
}
@ -1527,19 +1513,34 @@ static void I_InitGraphicsMode(void)
flags |= SDL_WINDOW_RESIZABLE;
flags |= SDL_WINDOW_ALLOW_HIGHDPI;
if (SDL_GetCurrentDisplayMode(video_display, &mode) != 0)
{
I_Error("Could not get display mode for video display #%d: %s",
video_display, SDL_GetError());
}
fullscreen_width = mode.w;
fullscreen_height = mode.h;
if (fullscreen)
{
if (fullscreen_width == 0 && fullscreen_height == 0)
{
flags |= SDL_WINDOW_FULLSCREEN_DESKTOP;
}
else
if (exclusive_fullscreen)
{
v_w = fullscreen_width;
v_h = fullscreen_height;
// [FG] exclusive fullscreen
flags |= SDL_WINDOW_FULLSCREEN;
}
else
{
flags |= SDL_WINDOW_FULLSCREEN_DESKTOP;
}
}
// Exclusive fullscreen only works in fullscreen mode.
if (exclusive_fullscreen && !fullscreen)
{
exclusive_fullscreen = false;
}
if (M_CheckParm("-borderless"))
@ -1626,12 +1627,6 @@ static void I_InitGraphicsMode(void)
// [FG] renderer flags
flags = 0;
if (SDL_GetCurrentDisplayMode(video_display, &mode) != 0)
{
I_Error("Could not get display mode for video display #%d: %s",
video_display, SDL_GetError());
}
if (use_vsync && !timingdemo && mode.refresh_rate > 0)
{
flags |= SDL_RENDERER_PRESENTVSYNC;
@ -1729,18 +1724,6 @@ static void I_InitGraphicsMode(void)
SDL_TEXTUREACCESS_STREAMING,
v_w, v_h);
// Workaround for SDL 2.0.14 (and 2.0.16) alt-tab bug (taken from Doom Retro)
#if defined(_WIN32)
{
SDL_version ver;
SDL_GetVersion(&ver);
if (ver.major == 2 && ver.minor == 0 && (ver.patch == 14 || ver.patch == 16))
{
SDL_SetHintWithPriority(SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS, "1", SDL_HINT_OVERRIDE);
}
}
#endif
V_Init();
UpdateGrab();

8
src/i_video.h
View File

@ -59,7 +59,8 @@ void I_FinishUpdate (void);
void I_ReadScreen (byte* scr);
void I_ResetScreen(void); // killough 10/98
void I_ToggleToggleFullScreen(void); // [FG] fullscreen mode menu toggle
void I_ToggleFullScreen(void); // [FG] fullscreen mode menu toggle
void I_ToggleExclusiveFullScreen(void);
void I_ToggleVsync(void); // [JN] Calls native SDL vsync toggle
extern int use_vsync; // killough 2/8/98: controls whether vsync is called
@ -69,14 +70,13 @@ extern int hires; // killough 11/98
extern int useaspect;
extern int uncapped; // [FG] uncapped rendering frame rate
extern boolean fullscreen;
extern boolean exclusive_fullscreen;
extern int fpslimit; // when uncapped, limit framerate to this value
extern int integer_scaling; // [FG] force integer scales
extern int vga_porch_flash; // emulate VGA "porch" behaviour
extern int widescreen; // widescreen mode
extern int video_display; // display index
extern int window_width, window_height;
extern char *window_position;
extern int fullscreen_width, fullscreen_height; // [FG] exclusive fullscreen
extern boolean screenvisible;
extern int gamma2;

26
src/m_menu.c
View File

@ -3876,6 +3876,7 @@ enum {
gen1_uncapped,
gen1_fpslimit,
gen1_vsync,
gen1_exclusive_fullscreen,
gen1_gamma,
gen1_end1,
@ -3941,6 +3942,20 @@ static void M_EnableDisableFPSLimit(void)
}
}
void M_ToggleFullScreen(void)
{
DISABLE_ITEM(!fullscreen, gen_settings1[gen1_exclusive_fullscreen]);
I_ToggleFullScreen();
}
static void M_ToggleExclusiveFullScreen(void)
{
DISABLE_ITEM(exclusive_fullscreen, gen_settings1[gen1_fullscreen]);
I_ToggleExclusiveFullScreen();
}
static void M_CoerceFPSLimit(void)
{
if (fpslimit < TICRATE)
@ -3956,7 +3971,7 @@ setup_menu_t gen_settings1[] = { // General Settings screen1
// [FG] fullscreen mode menu toggle
{"Fullscreen Mode", S_YESNO, m_null, M_X, M_Y+ gen1_fullscreen*M_SPC,
{"fullscreen"}, 0, I_ToggleToggleFullScreen},
{"fullscreen"}, 0, M_ToggleFullScreen},
{"Widescreen Rendering", S_YESNO, m_null, M_X, M_Y+ gen1_widescreen*M_SPC,
{"widescreen"}, 0, I_ResetScreen},
@ -3971,6 +3986,9 @@ setup_menu_t gen_settings1[] = { // General Settings screen1
{"Vertical Sync", S_YESNO, m_null, M_X,
M_Y+ gen1_vsync*M_SPC, {"use_vsync"}, 0, I_ToggleVsync},
{"Exclusive Fullscreen", S_YESNO, m_null, M_X, M_Y+ gen1_exclusive_fullscreen*M_SPC,
{"exclusive_fullscreen"}, 0, M_ToggleExclusiveFullScreen},
{"Gamma Correction", S_THERMO, m_null, M_X_THRM,
M_Y+ gen1_gamma*M_SPC, {"gamma2"}, 0, M_ResetGamma, gamma_strings},
@ -7121,7 +7139,11 @@ void M_ResetSetupMenu(void)
extern boolean deh_set_blood_color;
// [FG] exclusive fullscreen
if (fullscreen_width != 0 || fullscreen_height != 0)
if (!fullscreen)
{
gen_settings1[gen1_exclusive_fullscreen].m_flags |= S_DISABLE;
}
if (fullscreen && exclusive_fullscreen)
{
gen_settings1[gen1_fullscreen].m_flags |= S_DISABLE;
}

2
src/m_menu.h
View File

@ -72,6 +72,8 @@ void M_DrawCredits(void); // killough 11/98
void M_SetMenuFontSpacing(void);
void M_ToggleFullScreen(void);
// killough 8/15/98: warn about changes not being committed until next game
#define warn_about_changes(x) (warning_about_changes=(x), \
print_warning_about_changes = 2)

41
src/m_misc.c
View File

@ -74,8 +74,9 @@ extern int tran_filter_pct; // killough 2/21/98
extern int showMessages;
extern int forceFlipPan;
extern int window_width, window_height;
extern int window_position_x, window_position_y;
extern int grabmouse;
extern int fullscreen; // [FG] save fullscren mode
extern boolean flipcorpses; // [crispy] randomly flip corpse, blood and death animation sprites
extern boolean ghost_monsters; // [crispy] resurrected pools of gore ("ghost monsters") are translucent
extern int mouse_acceleration;
@ -153,6 +154,13 @@ default_t defaults[] = {
"1 to enable fullscreen mode"
},
{
"exclusive_fullscreen",
(config_t *) &exclusive_fullscreen, NULL,
{1}, {0, 1}, number, ss_none, wad_no,
"1 to enable exclusive fullscreen mode"
},
{
"use_vsync",
(config_t *) &use_vsync, NULL,
@ -202,10 +210,17 @@ default_t defaults[] = {
// window position
{
"window_position",
(config_t *) &window_position, NULL,
{.s = "center"}, {0}, string, ss_none, wad_no,
"window position \"x,y\""
"window_position_x",
(config_t *) &window_position_x, NULL,
{0}, {UL, UL}, number, ss_none, wad_no,
"window position x"
},
{
"window_position_y",
(config_t *) &window_position_y, NULL,
{0}, {UL, UL}, number, ss_none, wad_no,
"window position y"
},
// window width
@ -224,22 +239,6 @@ default_t defaults[] = {
"window height"
},
// [FG] exclusive fullscreen width
{
"fullscreen_width",
(config_t *) &fullscreen_width, NULL,
{0}, {0, UL}, number, ss_none, wad_no,
"exclusive fullscreen width"
},
// [FG] exclusive fullscreen height
{
"fullscreen_height",
(config_t *) &fullscreen_height, NULL,
{0}, {0, UL}, number, ss_none, wad_no,
"exclusive fullscreen height"
},
{
"gamma2",
(config_t *) &gamma2, NULL,