diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-08-22 21:48:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-22 21:48:28 +0200 |
| commit | 7c85c4a27ee230f6e863169e754ca3a883a57d02 (patch) | |
| tree | 86124a9c4d731d7107f95af295bb445a30e41fbb /main/main.cpp | |
| parent | 85cb22bd919290be8ad6349edc34e5d39102f244 (diff) | |
| parent | e886d662ec2580c9b19c44296d0bb64fbf635ecf (diff) | |
Merge pull request #64374 from RandomShaper/inheritable_cl_args
Diffstat (limited to 'main/main.cpp')
| -rw-r--r-- | main/main.cpp | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/main/main.cpp b/main/main.cpp index 1ed71927c3..8a25827e02 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -143,6 +143,7 @@ static int audio_driver_idx = -1; // Engine config/tools +static bool single_window = false; static bool editor = false; static bool project_manager = false; static bool cmdline_tool = false; @@ -153,6 +154,8 @@ static OS::ProcessID editor_pid = 0; #ifdef TOOLS_ENABLED static bool auto_build_solutions = false; static String debug_server_uri; + +HashMap<Main::CLIScope, Vector<String>> forwardable_cli_arguments; #endif bool use_startup_benchmark = false; String startup_benchmark_file; @@ -198,6 +201,12 @@ bool Main::is_cmdline_tool() { return cmdline_tool; } +#ifdef TOOLS_ENABLED +const Vector<String> &Main::get_forwardable_cli_arguments(Main::CLIScope p_scope) { + return forwardable_cli_arguments[p_scope]; +} +#endif + static String unescape_cmdline(const String &p_str) { return p_str.replace("%20", " "); } @@ -709,6 +718,21 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph List<String>::Element *N = I->next(); +#ifdef TOOLS_ENABLED + if (I->get() == "--debug" || + I->get() == "--verbose" || + I->get() == "--disable-crash-handler") { + forwardable_cli_arguments[CLI_SCOPE_TOOL].push_back(I->get()); + forwardable_cli_arguments[CLI_SCOPE_PROJECT].push_back(I->get()); + } + if (I->get() == "--single-window" || + I->get() == "--audio-driver" || + I->get() == "--display-driver" || + I->get() == "--rendering-driver") { + forwardable_cli_arguments[CLI_SCOPE_TOOL].push_back(I->get()); + } +#endif + if (adding_user_args) { user_args.push_back(I->get()); } else if (I->get() == "-h" || I->get() == "--help" || I->get() == "/?") { // display help @@ -887,7 +911,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph } } else if (I->get() == "--single-window") { // force single window - OS::get_singleton()->_single_window = true; + single_window = true; } else if (I->get() == "-t" || I->get() == "--always-on-top") { // force always-on-top window init_always_on_top = true; @@ -2469,7 +2493,7 @@ bool Main::start() { bool embed_subwindows = GLOBAL_DEF("display/window/subwindows/embed_subwindows", true); - if (OS::get_singleton()->is_single_window() || (!project_manager && !editor && embed_subwindows) || !DisplayServer::get_singleton()->has_feature(DisplayServer::Feature::FEATURE_SUBWINDOWS)) { + if (single_window || (!project_manager && !editor && embed_subwindows) || !DisplayServer::get_singleton()->has_feature(DisplayServer::Feature::FEATURE_SUBWINDOWS)) { sml->get_root()->set_embedding_subwindows(true); } |