Add an option to start in fullscreen if nested

This commit is contained in:
Oschowa 2020-08-28 18:31:04 +02:00 committed by Simon Ser
parent f268c17fb1
commit 5954361cc3
4 changed files with 16 additions and 5 deletions

View file

@ -26,6 +26,8 @@ uint32_t g_nOutputWidth = 1280;
uint32_t g_nOutputHeight = 720;
int g_nOutputRefresh = 60;
bool g_bFullscreen = false;
bool g_bIsNested = false;
bool g_bFilterGameWindow = true;
@ -64,7 +66,7 @@ int main(int argc, char **argv)
bool bSleepAtStartup = false;
while ((o = getopt (argc, argv, ":R:T:w:h:W:H:r:NFSvVecsdlnb")) != -1)
while ((o = getopt (argc, argv, ":R:T:w:h:W:H:r:NFSvVecsdlnbf")) != -1)
{
switch (o) {
case 'w':
@ -97,6 +99,9 @@ int main(int argc, char **argv)
case 'b':
g_bBorderlessOutputWindow = true;
break;
case 'f':
g_bFullscreen = true;
break;
default:
break;
}

View file

@ -16,6 +16,8 @@ extern uint32_t g_nOutputWidth;
extern uint32_t g_nOutputHeight;
extern int g_nOutputRefresh;
extern bool g_bFullscreen;
extern bool g_bFilterGameWindow;
extern bool g_bBorderlessOutputWindow;

View file

@ -68,7 +68,6 @@ void inputSDLThreadRun( void )
SDL_Event event;
SDL_Keymod mod;
uint32_t key;
static bool bFullscreen = false;
SDL_Init( SDL_INIT_VIDEO | SDL_INIT_EVENTS );
@ -84,6 +83,11 @@ void inputSDLThreadRun( void )
nSDLWindowFlags |= SDL_WINDOW_BORDERLESS;
}
if ( g_bFullscreen == true )
{
nSDLWindowFlags |= SDL_WINDOW_FULLSCREEN_DESKTOP;
}
g_SDLWindow = SDL_CreateWindow( "gamescope",
SDL_WINDOWPOS_UNDEFINED,
SDL_WINDOWPOS_UNDEFINED,
@ -141,8 +145,8 @@ void inputSDLThreadRun( void )
switch ( key )
{
case KEY_F:
bFullscreen = !bFullscreen;
SDL_SetWindowFullscreen( g_SDLWindow, bFullscreen ? SDL_WINDOW_FULLSCREEN_DESKTOP : 0 );
g_bFullscreen = !g_bFullscreen;
SDL_SetWindowFullscreen( g_SDLWindow, g_bFullscreen ? SDL_WINDOW_FULLSCREEN_DESKTOP : 0 );
break;
case KEY_N:
g_bFilterGameWindow = !g_bFilterGameWindow;

View file

@ -2464,7 +2464,7 @@ steamcompmgr_main (int argc, char **argv)
// :/
optind = 1;
while ((o = getopt (argc, argv, ":R:T:w:h:W:H:r:NFSvVecsdlnb")) != -1)
while ((o = getopt (argc, argv, ":R:T:w:h:W:H:r:NFSvVecsdlnbf")) != -1)
{
switch (o) {
case 'R':