diff --git a/AUTHORS b/AUTHORS index f1e205abb..f3caccf27 100644 --- a/AUTHORS +++ b/AUTHORS @@ -70,4 +70,5 @@ Zenithal (ZenithalHourlyRate) Kamplom <6284968128@protonmail.ch> (kamplom) Jacob McNamee (jacobmcnamee) Marco Antonio J. Costa (majcosta) -rs189 <35667100+rs189@users.noreply.github.com> (rs189) \ No newline at end of file +rs189 <35667100+rs189@users.noreply.github.com> (rs189) +Marco Rodolfi (RodoMa92) \ No newline at end of file diff --git a/client/src/config.c b/client/src/config.c index f941e5fe7..4bcac5eb5 100644 --- a/client/src/config.c +++ b/client/src/config.c @@ -309,6 +309,13 @@ static struct Option options[] = .type = OPTION_TYPE_BOOL, .value.x_bool = true }, + { + .module = "win", + .name = "disableWaitingMessage", + .description = "Disable the waiting for host message during startup", + .type = OPTION_TYPE_BOOL, + .value.x_bool = false + }, // input options { @@ -651,33 +658,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.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.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.disableWaitingMessage = option_get_bool ("win", "disableWaitingMessage"); if (g_params.noScreensaver && g_params.autoScreensaver) { diff --git a/client/src/main.c b/client/src/main.c index e2df89b85..3459d6a6e 100644 --- a/client/src/main.c +++ b/client/src/main.c @@ -1497,18 +1497,21 @@ static int lg_run(void) 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..."); - - msgs[msgsCount++] = showSpiceInputHelp(); + 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(); + } DEBUG_INFO("Check the host log in your guest at %%ProgramData%%\\Looking Glass (host)\\looking-glass-host.txt"); DEBUG_INFO("Continuing to wait..."); diff --git a/client/src/main.h b/client/src/main.h index a51b5b3f0..a75c8bb53 100644 --- a/client/src/main.h +++ b/client/src/main.h @@ -202,6 +202,7 @@ struct AppParams int uiSize; bool jitRender; bool requestActivation; + bool disableWaitingMessage; unsigned int cursorPollInterval; unsigned int framePollInterval; diff --git a/doc/usage.rst b/doc/usage.rst index eb28a0f9a..1f5de67e4 100644 --- a/doc/usage.rst +++ b/doc/usage.rst @@ -237,63 +237,65 @@ All command line options | app:shmFile | -f | /dev/kvmfr0 | The path to the shared memory file, or the name of the kvmfr device to use, e.g. kvmfr0 | +------------------------+-------+-------------+-----------------------------------------------------------------------------------------+ - +-------------------------+-------+------------------------+----------------------------------------------------------------------+ - | Long | Short | Value | Description | - +=========================+=======+========================+======================================================================+ - | win:title | | Looking Glass (client) | The window title | - +-------------------------+-------+------------------------+----------------------------------------------------------------------+ - | win:position | | center | Initial window position at startup | - +-------------------------+-------+------------------------+----------------------------------------------------------------------+ - | win:size | | 1024x768 | Initial window size at startup | - +-------------------------+-------+------------------------+----------------------------------------------------------------------+ - | win:autoResize | -a | no | Auto resize the window to the guest | - +-------------------------+-------+------------------------+----------------------------------------------------------------------+ - | win:allowResize | -n | yes | Allow the window to be manually resized | - +-------------------------+-------+------------------------+----------------------------------------------------------------------+ - | win:keepAspect | -r | yes | Maintain the correct aspect ratio | - +-------------------------+-------+------------------------+----------------------------------------------------------------------+ - | win:forceAspect | | yes | Force the window to maintain the aspect ratio | - +-------------------------+-------+------------------------+----------------------------------------------------------------------+ - | win:dontUpscale | | no | Never try to upscale the window | - +-------------------------+-------+------------------------+----------------------------------------------------------------------+ - | win:intUpscale | | no | Allow only integer upscaling | - +-------------------------+-------+------------------------+----------------------------------------------------------------------+ - | win:shrinkOnUpscale | | no | Limit the window dimensions when dontUpscale is enabled | - +-------------------------+-------+------------------------+----------------------------------------------------------------------+ - | win:borderless | -d | no | Borderless mode | - +-------------------------+-------+------------------------+----------------------------------------------------------------------+ - | win:fullScreen | -F | no | Launch in fullscreen borderless mode | - +-------------------------+-------+------------------------+----------------------------------------------------------------------+ - | win:maximize | -T | no | Launch window maximized | - +-------------------------+-------+------------------------+----------------------------------------------------------------------+ - | win:minimizeOnFocusLoss | | no | Minimize window on focus loss | - +-------------------------+-------+------------------------+----------------------------------------------------------------------+ - | win:fpsMin | -K | -1 | Frame rate minimum (0 = disable - not recommended, -1 = auto detect) | - +-------------------------+-------+------------------------+----------------------------------------------------------------------+ - | win:ignoreQuit | -Q | no | Ignore requests to quit (i.e. Alt+F4) | - +-------------------------+-------+------------------------+----------------------------------------------------------------------+ - | win:noScreensaver | -S | yes | Prevent the screensaver from starting | - +-------------------------+-------+------------------------+----------------------------------------------------------------------+ - | win:autoScreensaver | | no | Prevent the screensaver from starting when guest requests it | - +-------------------------+-------+------------------------+----------------------------------------------------------------------+ - | win:alerts | -q | yes | Show on screen alert messages | - +-------------------------+-------+------------------------+----------------------------------------------------------------------+ - | win:quickSplash | | no | Skip fading out the splash screen when a connection is established | - +-------------------------+-------+------------------------+----------------------------------------------------------------------+ - | win:overlayDimsDesktop | | no | Dim the desktop when in interactive overlay mode | - +-------------------------+-------+------------------------+----------------------------------------------------------------------+ - | win:rotate | | 0 | Rotate the displayed image (0, 90, 180, 270) | - +-------------------------+-------+------------------------+----------------------------------------------------------------------+ - | win:uiFont | | DejaVu Sans Mono | The font to use when rendering on-screen UI | - +-------------------------+-------+------------------------+----------------------------------------------------------------------+ - | win:uiSize | | 14 | The font size to use when rendering on-screen UI | - +-------------------------+-------+------------------------+----------------------------------------------------------------------+ - | win:jitRender | | no | Enable just-in-time rendering | - +-------------------------+-------+------------------------+----------------------------------------------------------------------+ - | win:requestActivation | | yes | Request activation when attention is needed | - +-------------------------+-------+------------------------+----------------------------------------------------------------------+ - | win:showFPS | -k | no | Enable the FPS & UPS display | - +-------------------------+-------+------------------------+----------------------------------------------------------------------+ + +----------------------------+-------+------------------------+----------------------------------------------------------------------+ + | Long | Short | Value | Description | + +============================+=======+========================+======================================================================+ + | win:title | | Looking Glass (client) | The window title | + +----------------------------+-------+------------------------+----------------------------------------------------------------------+ + | win:position | | center | Initial window position at startup | + +----------------------------+-------+------------------------+----------------------------------------------------------------------+ + | win:size | | 1024x768 | Initial window size at startup | + +----------------------------+-------+------------------------+----------------------------------------------------------------------+ + | win:autoResize | -a | no | Auto resize the window to the guest | + +----------------------------+-------+------------------------+----------------------------------------------------------------------+ + | win:allowResize | -n | yes | Allow the window to be manually resized | + +----------------------------+-------+------------------------+----------------------------------------------------------------------+ + | win:keepAspect | -r | yes | Maintain the correct aspect ratio | + +----------------------------+-------+------------------------+----------------------------------------------------------------------+ + | win:forceAspect | | yes | Force the window to maintain the aspect ratio | + +----------------------------+-------+------------------------+----------------------------------------------------------------------+ + | win:dontUpscale | | no | Never try to upscale the window | + +----------------------------+-------+------------------------+----------------------------------------------------------------------+ + | win:intUpscale | | no | Allow only integer upscaling | + +----------------------------+-------+------------------------+----------------------------------------------------------------------+ + | win:shrinkOnUpscale | | no | Limit the window dimensions when dontUpscale is enabled | + +----------------------------+-------+------------------------+----------------------------------------------------------------------+ + | win:borderless | -d | no | Borderless mode | + +----------------------------+-------+------------------------+----------------------------------------------------------------------+ + | win:fullScreen | -F | no | Launch in fullscreen borderless mode | + +----------------------------+-------+------------------------+----------------------------------------------------------------------+ + | win:maximize | -T | no | Launch window maximized | + +----------------------------+-------+------------------------+----------------------------------------------------------------------+ + | win:minimizeOnFocusLoss | | no | Minimize window on focus loss | + +----------------------------+-------+------------------------+----------------------------------------------------------------------+ + | win:fpsMin | -K | -1 | Frame rate minimum (0 = disable - not recommended, -1 = auto detect) | + +----------------------------+-------+------------------------+----------------------------------------------------------------------+ + | win:ignoreQuit | -Q | no | Ignore requests to quit (i.e. Alt+F4) | + +----------------------------+-------+------------------------+----------------------------------------------------------------------+ + | win:noScreensaver | -S | yes | Prevent the screensaver from starting | + +----------------------------+-------+------------------------+----------------------------------------------------------------------+ + | win:autoScreensaver | | no | Prevent the screensaver from starting when guest requests it | + +----------------------------+-------+------------------------+----------------------------------------------------------------------+ + | win:alerts | -q | yes | Show on screen alert messages | + +----------------------------+-------+------------------------+----------------------------------------------------------------------+ + | win:quickSplash | | no | Skip fading out the splash screen when a connection is established | + +----------------------------+-------+------------------------+----------------------------------------------------------------------+ + | win:overlayDimsDesktop | | no | Dim the desktop when in interactive overlay mode | + +----------------------------+-------+------------------------+----------------------------------------------------------------------+ + | win:rotate | | 0 | Rotate the displayed image (0, 90, 180, 270) | + +----------------------------+-------+------------------------+----------------------------------------------------------------------+ + | win:uiFont | | DejaVu Sans Mono | The font to use when rendering on-screen UI | + +----------------------------+-------+------------------------+----------------------------------------------------------------------+ + | win:uiSize | | 14 | The font size to use when rendering on-screen UI | + +----------------------------+-------+------------------------+----------------------------------------------------------------------+ + | win:jitRender | | no | Enable just-in-time rendering | + +----------------------------+-------+------------------------+----------------------------------------------------------------------+ + | win:requestActivation | | yes | Request activation when attention is needed | + +----------------------------+-------+------------------------+----------------------------------------------------------------------+ + | win:showFPS | -k | no | Enable the FPS & UPS display | + +----------------------------+-------+------------------------+----------------------------------------------------------------------+ + | win:disableWaitingMessage | | no | This disable the confirmation message for a cleaner UI | + +----------------------------+-------+------------------------+----------------------------------------------------------------------+ +------------------------------+-------+---------------------+----------------------------------------------------------------------------------+ | Long | Short | Value | Description |