kirsle/sm64pc
1
0
Fork 0
Code Releases Wiki Activity

refactor fullscreen into own static function

Browse Source
This commit is contained in:
HengiFettlich 2020-05-08 14:35:38 +02:00
parent c540898c71
commit c4707eb36f
1 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/pc/gfx/gfx_sdl2.c
View File

@ -78,6 +78,22 @@ const SDL_Scancode scancode_rmapping_nonextended[][2] = {
{SDL_SCANCODE_KP_MULTIPLY, SDL_SCANCODE_PRINTSCREEN} {SDL_SCANCODE_KP_MULTIPLY, SDL_SCANCODE_PRINTSCREEN}
}; };
static void gfx_sdl_set_fullscreen(bool fullscreen)
{
if (fullscreen)
{
SDL_SetWindowFullscreen(wnd, SDL_WINDOW_FULLSCREEN_DESKTOP);
SDL_ShowCursor(SDL_DISABLE);
}
else
{
SDL_SetWindowFullscreen(wnd, 0);
SDL_ShowCursor(SDL_ENABLE);
}
configFullscreen = fullscreen;
}
static void gfx_sdl_init(void) { static void gfx_sdl_init(void) {
SDL_Init(SDL_INIT_VIDEO); SDL_Init(SDL_INIT_VIDEO);
@ -101,11 +117,7 @@ static void gfx_sdl_init(void) {
DESIRED_SCREEN_WIDTH, DESIRED_SCREEN_HEIGHT, SDL_WINDOW_OPENGL | SDL_WINDOW_SHOWN | SDL_WINDOW_RESIZABLE); DESIRED_SCREEN_WIDTH, DESIRED_SCREEN_HEIGHT, SDL_WINDOW_OPENGL | SDL_WINDOW_SHOWN | SDL_WINDOW_RESIZABLE);
#endif #endif
if (configFullscreen) gfx_sdl_set_fullscreen(configFullscreen);
{
SDL_SetWindowFullscreen(wnd, SDL_WINDOW_FULLSCREEN_DESKTOP);
SDL_ShowCursor(SDL_DISABLE);
}
SDL_GL_CreateContext(wnd); SDL_GL_CreateContext(wnd);
SDL_GL_SetSwapInterval(2); // TODO 0, 1 or 2 or remove this line SDL_GL_SetSwapInterval(2); // TODO 0, 1 or 2 or remove this line
@ -156,24 +168,11 @@ static void gfx_sdl_onkeydown(int scancode) {
if (state[SDL_SCANCODE_LALT] && state[SDL_SCANCODE_RETURN]) if (state[SDL_SCANCODE_LALT] && state[SDL_SCANCODE_RETURN])
{ {
if (!configFullscreen) gfx_sdl_set_fullscreen(!configFullscreen);
{
SDL_SetWindowFullscreen(wnd, SDL_WINDOW_FULLSCREEN_DESKTOP);
SDL_ShowCursor(SDL_DISABLE);
}
else
{
SDL_SetWindowFullscreen(wnd, 0);
SDL_ShowCursor(SDL_ENABLE);
}
configFullscreen = !configFullscreen;
} }
else if (state[SDL_SCANCODE_ESCAPE] && configFullscreen) else if (state[SDL_SCANCODE_ESCAPE] && configFullscreen)
{ {
SDL_SetWindowFullscreen(wnd, 0); gfx_sdl_set_fullscreen(false);
SDL_ShowCursor(SDL_ENABLE);
configFullscreen = false;
} }
} }