Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-11-22 05:27:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[client] main: make activation requests optional

Browse Source
This commit is contained in:
Geoffrey McRae 2023-09-13 14:07:42 +10:00
parent 82607a7d6f
commit 9cadb64942
3 changed files with 34 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
client/src/config.c
View File

@ -295,6 +295,13 @@ static struct Option options[] =
.type = OPTION_TYPE_BOOL, .type = OPTION_TYPE_BOOL,
.value.x_bool = false, .value.x_bool = false,
}, },
{
.module = "win",
.name = "requestActivation",
.description = "Request activation when attention is needed",
.type = OPTION_TYPE_BOOL,
.value.x_bool = true
},
// input options // input options
{ {
@ -634,27 +641,28 @@ bool config_load(int argc, char * argv[])
g_params.framePollInterval = option_get_int ("app" , "framePollInterval" ); g_params.framePollInterval = option_get_int ("app" , "framePollInterval" );
g_params.allowDMA = option_get_bool ("app" , "allowDMA" ); g_params.allowDMA = option_get_bool ("app" , "allowDMA" );
g_params.windowTitle = option_get_string("win", "title" ); g_params.windowTitle = option_get_string("win", "title" );
g_params.autoResize = option_get_bool ("win", "autoResize" ); g_params.autoResize = option_get_bool ("win", "autoResize" );
g_params.allowResize = option_get_bool ("win", "allowResize" ); g_params.allowResize = option_get_bool ("win", "allowResize" );
g_params.keepAspect = option_get_bool ("win", "keepAspect" ); g_params.keepAspect = option_get_bool ("win", "keepAspect" );
g_params.forceAspect = option_get_bool ("win", "forceAspect" ); g_params.forceAspect = option_get_bool ("win", "forceAspect" );
g_params.dontUpscale = option_get_bool ("win", "dontUpscale" ); g_params.dontUpscale = option_get_bool ("win", "dontUpscale" );
g_params.intUpscale = option_get_bool ("win", "intUpscale" ); g_params.intUpscale = option_get_bool ("win", "intUpscale" );
g_params.shrinkOnUpscale = option_get_bool ("win", "shrinkOnUpscale" ); g_params.shrinkOnUpscale = option_get_bool ("win", "shrinkOnUpscale" );
g_params.borderless = option_get_bool ("win", "borderless" ); g_params.borderless = option_get_bool ("win", "borderless" );
g_params.fullscreen = option_get_bool ("win", "fullScreen" ); g_params.fullscreen = option_get_bool ("win", "fullScreen" );
g_params.maximize = option_get_bool ("win", "maximize" ); g_params.maximize = option_get_bool ("win", "maximize" );
g_params.fpsMin = option_get_int ("win", "fpsMin" ); g_params.fpsMin = option_get_int ("win", "fpsMin" );
g_params.ignoreQuit = option_get_bool ("win", "ignoreQuit" ); g_params.ignoreQuit = option_get_bool ("win", "ignoreQuit" );
g_params.noScreensaver = option_get_bool ("win", "noScreensaver" ); g_params.noScreensaver = option_get_bool ("win", "noScreensaver" );
g_params.autoScreensaver = option_get_bool ("win", "autoScreensaver" ); g_params.autoScreensaver = option_get_bool ("win", "autoScreensaver" );
g_params.showAlerts = option_get_bool ("win", "alerts" ); g_params.showAlerts = option_get_bool ("win", "alerts" );
g_params.quickSplash = option_get_bool ("win", "quickSplash" ); g_params.quickSplash = option_get_bool ("win", "quickSplash" );
g_params.overlayDim = option_get_bool ("win", "overlayDimsDesktop"); g_params.overlayDim = option_get_bool ("win", "overlayDimsDesktop");
g_params.uiFont = option_get_string("win", "uiFont" ); g_params.uiFont = option_get_string("win", "uiFont" );
g_params.uiSize = option_get_int ("win", "uiSize" ); g_params.uiSize = option_get_int ("win", "uiSize" );
g_params.jitRender = option_get_bool ("win", "jitRender" ); g_params.jitRender = option_get_bool ("win", "jitRender" );
g_params.requestActivation = option_get_bool ("win", "requestActivation" );
if (g_params.noScreensaver && g_params.autoScreensaver) if (g_params.noScreensaver && g_params.autoScreensaver)
{ {

6
client/src/main.c
View File

@ -569,7 +569,8 @@ int main_frameThread(void * unused)
break; break;
} }
g_state.ds->requestActivation(); if (g_params.requestActivation)
g_state.ds->requestActivation();
while(g_state.state == APP_STATE_RUNNING && !g_state.stopVideo) while(g_state.state == APP_STATE_RUNNING && !g_state.stopVideo)
{ {
@ -782,7 +783,8 @@ int main_frameThread(void * unused)
overlaySplash_show(false); overlaySplash_show(false);
if (frame->flags & FRAME_FLAG_REQUEST_ACTIVATION) if (frame->flags & FRAME_FLAG_REQUEST_ACTIVATION &&
g_params.requestActivation)
g_state.ds->requestActivation(); g_state.ds->requestActivation();
const bool blockScreensaver = frame->flags & FRAME_FLAG_BLOCK_SCREENSAVER; const bool blockScreensaver = frame->flags & FRAME_FLAG_BLOCK_SCREENSAVER;

1
client/src/main.h
View File

@ -201,6 +201,7 @@ struct AppParams
const char * uiFont; const char * uiFont;
int uiSize; int uiSize;
bool jitRender; bool jitRender;
bool requestActivation;
unsigned int cursorPollInterval; unsigned int cursorPollInterval;
unsigned int framePollInterval; unsigned int framePollInterval;