mirror of
				https://github.com/gnif/LookingGlass.git
				synced 2025-10-30 20:21:56 +00:00 
			
		
		
		
	[client] app: add option to disable waiting for host message
This commit is contained in:
		 Marco Rodolfi
					Marco Rodolfi
				
			
				
					committed by
					
						 Geoffrey McRae
						Geoffrey McRae
					
				
			
			
				
	
			
			
			 Geoffrey McRae
						Geoffrey McRae
					
				
			
						parent
						
							f15d72cdfe
						
					
				
				
					commit
					add45347b5
				
			| @@ -317,6 +317,13 @@ static struct Option options[] = | ||||
|     .type           = OPTION_TYPE_BOOL, | ||||
|     .value.x_bool   = true | ||||
|   }, | ||||
|   { | ||||
|     .module         = "win", | ||||
|     .name           = "disableWaitingMessage", | ||||
|     .description    = "Disables the confirmation message for a cleaner UI", | ||||
|     .type           = OPTION_TYPE_BOOL, | ||||
|     .value.x_bool   = false | ||||
|   }, | ||||
|  | ||||
|   // input options | ||||
|   { | ||||
| @@ -659,33 +666,34 @@ bool config_load(int argc, char * argv[]) | ||||
|   } | ||||
|  | ||||
|   // setup the application params for the basic types | ||||
|   g_params.cursorPollInterval = option_get_int   ("app"  , "cursorPollInterval"); | ||||
|   g_params.framePollInterval  = option_get_int   ("app"  , "framePollInterval" ); | ||||
|   g_params.allowDMA           = option_get_bool  ("app"  , "allowDMA"          ); | ||||
|   g_params.cursorPollInterval   = option_get_int   ("app"  , "cursorPollInterval"); | ||||
|   g_params.framePollInterval    = option_get_int   ("app"  , "framePollInterval" ); | ||||
|   g_params.allowDMA             = option_get_bool  ("app"  , "allowDMA"          ); | ||||
|  | ||||
|   g_params.windowTitle       = option_get_string("win", "title"             ); | ||||
|   g_params.appId             = option_get_string("win", "appId"             ); | ||||
|   g_params.autoResize        = option_get_bool  ("win", "autoResize"        ); | ||||
|   g_params.allowResize       = option_get_bool  ("win", "allowResize"       ); | ||||
|   g_params.keepAspect        = option_get_bool  ("win", "keepAspect"        ); | ||||
|   g_params.forceAspect       = option_get_bool  ("win", "forceAspect"       ); | ||||
|   g_params.dontUpscale       = option_get_bool  ("win", "dontUpscale"       ); | ||||
|   g_params.intUpscale        = option_get_bool  ("win", "intUpscale"        ); | ||||
|   g_params.shrinkOnUpscale   = option_get_bool  ("win", "shrinkOnUpscale"   ); | ||||
|   g_params.borderless        = option_get_bool  ("win", "borderless"        ); | ||||
|   g_params.fullscreen        = option_get_bool  ("win", "fullScreen"        ); | ||||
|   g_params.maximize          = option_get_bool  ("win", "maximize"          ); | ||||
|   g_params.fpsMin            = option_get_int   ("win", "fpsMin"            ); | ||||
|   g_params.ignoreQuit        = option_get_bool  ("win", "ignoreQuit"        ); | ||||
|   g_params.noScreensaver     = option_get_bool  ("win", "noScreensaver"     ); | ||||
|   g_params.autoScreensaver   = option_get_bool  ("win", "autoScreensaver"   ); | ||||
|   g_params.showAlerts        = option_get_bool  ("win", "alerts"            ); | ||||
|   g_params.quickSplash       = option_get_bool  ("win", "quickSplash"       ); | ||||
|   g_params.overlayDim        = option_get_bool  ("win", "overlayDimsDesktop"); | ||||
|   g_params.uiFont            = option_get_string("win", "uiFont"            ); | ||||
|   g_params.uiSize            = option_get_int   ("win", "uiSize"            ); | ||||
|   g_params.jitRender         = option_get_bool  ("win", "jitRender"         ); | ||||
|   g_params.requestActivation = option_get_bool  ("win", "requestActivation" ); | ||||
|   g_params.windowTitle            = option_get_string("win", "title"             ); | ||||
|   g_params.appId                  = option_get_string("win", "appId"             ); | ||||
|   g_params.autoResize             = option_get_bool  ("win", "autoResize"        ); | ||||
|   g_params.allowResize            = option_get_bool  ("win", "allowResize"       ); | ||||
|   g_params.keepAspect             = option_get_bool  ("win", "keepAspect"        ); | ||||
|   g_params.forceAspect            = option_get_bool  ("win", "forceAspect"       ); | ||||
|   g_params.dontUpscale            = option_get_bool  ("win", "dontUpscale"       ); | ||||
|   g_params.intUpscale             = option_get_bool  ("win", "intUpscale"        ); | ||||
|   g_params.shrinkOnUpscale        = option_get_bool  ("win", "shrinkOnUpscale"   ); | ||||
|   g_params.borderless             = option_get_bool  ("win", "borderless"        ); | ||||
|   g_params.fullscreen             = option_get_bool  ("win", "fullScreen"        ); | ||||
|   g_params.maximize               = option_get_bool  ("win", "maximize"          ); | ||||
|   g_params.fpsMin                 = option_get_int   ("win", "fpsMin"            ); | ||||
|   g_params.ignoreQuit             = option_get_bool  ("win", "ignoreQuit"        ); | ||||
|   g_params.noScreensaver          = option_get_bool  ("win", "noScreensaver"     ); | ||||
|   g_params.autoScreensaver        = option_get_bool  ("win", "autoScreensaver"   ); | ||||
|   g_params.showAlerts             = option_get_bool  ("win", "alerts"            ); | ||||
|   g_params.quickSplash            = option_get_bool  ("win", "quickSplash"       ); | ||||
|   g_params.overlayDim             = option_get_bool  ("win", "overlayDimsDesktop"); | ||||
|   g_params.uiFont                 = option_get_string("win", "uiFont"            ); | ||||
|   g_params.uiSize                 = option_get_int   ("win", "uiSize"            ); | ||||
|   g_params.jitRender              = option_get_bool  ("win", "jitRender"         ); | ||||
|   g_params.requestActivation      = option_get_bool  ("win", "requestActivation" ); | ||||
|   g_params.disableWaitingMessage  = option_get_bool  ("win", "disableWaitingMessage"); | ||||
|  | ||||
|   if (g_params.noScreensaver && g_params.autoScreensaver) | ||||
|   { | ||||
|   | ||||
| @@ -1500,18 +1500,21 @@ restart: | ||||
|         if (waitCount == 30) | ||||
|         { | ||||
|           DEBUG_BREAK(); | ||||
|           msgs[msgsCount++] = app_msgBox( | ||||
|               "Host Application Not Running", | ||||
|               "It seems the host application is not running or your\n" | ||||
|               "virtual machine is still starting up\n" | ||||
|               "\n" | ||||
|               "If the the VM is running and booted please check the\n" | ||||
|               "host application log for errors. You can find the\n" | ||||
|               "log through the shortcut in your start menu\n" | ||||
|               "\n" | ||||
|               "Continuing to wait..."); | ||||
|           if (!g_params.disableWaitingMessage)  | ||||
|           { | ||||
|             msgs[msgsCount++] = app_msgBox( | ||||
|                 "Host Application Not Running", | ||||
|                 "It seems the host application is not running or your\n" | ||||
|                 "virtual machine is still starting up\n" | ||||
|                 "\n" | ||||
|                 "If the the VM is running and booted please check the\n" | ||||
|                 "host application log for errors. You can find the\n" | ||||
|                 "log through the shortcut in your start menu\n" | ||||
|                 "\n" | ||||
|                 "Continuing to wait..."); | ||||
|  | ||||
|           msgs[msgsCount++] = showSpiceInputHelp(); | ||||
|             msgs[msgsCount++] = showSpiceInputHelp(); | ||||
|           } | ||||
|  | ||||
|           DEBUG_INFO("Check the host log in your guest at %%ProgramData%%\\Looking Glass (host)\\looking-glass-host.txt"); | ||||
|           DEBUG_INFO("Continuing to wait..."); | ||||
|   | ||||
| @@ -204,6 +204,7 @@ struct AppParams | ||||
|   int                  uiSize; | ||||
|   bool                 jitRender; | ||||
|   bool                 requestActivation; | ||||
|   bool                 disableWaitingMessage; | ||||
|  | ||||
|   unsigned int         cursorPollInterval; | ||||
|   unsigned int         framePollInterval; | ||||
|   | ||||
		Reference in New Issue
	
	Block a user