From e315a93f876d7333d26132db1419ac964135d848 Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Wed, 12 May 2021 03:12:59 +0200 Subject: [PATCH] Expose the "restart on exit" OS functionality This can be used to restart a project with specific command line arguments applied. This can work in tandem with `OS.get_cmdline_args()` to restart with the same command line arguments as used to originally run the project. Example use cases: - Restart to apply an user setting change that requires a restart to work. - Restart with a Godot command line argument to change the video driver, audio driver, etc. --- core/bind/core_bind.cpp | 27 +++++++++++++++++++++++++++ core/bind/core_bind.h | 4 ++++ doc/classes/OS.xml | 23 +++++++++++++++++++++++ 3 files changed, 54 insertions(+) diff --git a/core/bind/core_bind.cpp b/core/bind/core_bind.cpp index 96d65f068..890871151 100644 --- a/core/bind/core_bind.cpp +++ b/core/bind/core_bind.cpp @@ -540,6 +540,29 @@ Vector _OS::get_cmdline_args() { return cmdlinev; } +void _OS::set_restart_on_exit(bool p_restart, const Vector &p_restart_arguments) { + List args_list; + for (int i = 0; i < p_restart_arguments.size(); i++) { + args_list.push_back(p_restart_arguments[i]); + } + + ::OS::get_singleton()->set_restart_on_exit(p_restart, args_list); +} + +bool _OS::is_restart_on_exit_set() const { + return ::OS::get_singleton()->is_restart_on_exit_set(); +} + +Vector _OS::get_restart_on_exit_arguments() const { + List args = ::OS::get_singleton()->get_restart_on_exit_arguments(); + Vector args_vector; + for (List::Element *E = args.front(); E; E = E->next()) { + args_vector.push_back(E->get()); + } + + return args_vector; +} + String _OS::get_locale() const { return OS::get_singleton()->get_locale(); } @@ -1357,6 +1380,10 @@ void _OS::_bind_methods() { ClassDB::bind_method(D_METHOD("get_name"), &_OS::get_name); ClassDB::bind_method(D_METHOD("get_cmdline_args"), &_OS::get_cmdline_args); + ClassDB::bind_method(D_METHOD("set_restart_on_exit", "restart", "arguments"), &_OS::set_restart_on_exit, DEFVAL(Vector())); + ClassDB::bind_method(D_METHOD("is_restart_on_exit_set"), &_OS::is_restart_on_exit_set); + ClassDB::bind_method(D_METHOD("get_restart_on_exit_arguments"), &_OS::get_restart_on_exit_arguments); + ClassDB::bind_method(D_METHOD("get_datetime", "utc"), &_OS::get_datetime, DEFVAL(false)); ClassDB::bind_method(D_METHOD("get_date", "utc"), &_OS::get_date, DEFVAL(false)); ClassDB::bind_method(D_METHOD("get_time", "utc"), &_OS::get_time, DEFVAL(false)); diff --git a/core/bind/core_bind.h b/core/bind/core_bind.h index b9637af84..5c56febaa 100644 --- a/core/bind/core_bind.h +++ b/core/bind/core_bind.h @@ -250,6 +250,10 @@ public: bool is_process_running(int p_pid) const; int get_process_id() const; + void set_restart_on_exit(bool p_restart, const Vector &p_restart_arguments = Vector()); + bool is_restart_on_exit_set() const; + Vector get_restart_on_exit_arguments() const; + bool has_environment(const String &p_var) const; String get_environment(const String &p_var) const; bool set_environment(const String &p_var, const String &p_value) const; diff --git a/doc/classes/OS.xml b/doc/classes/OS.xml index 0a0f560f2..7d7f4d093 100644 --- a/doc/classes/OS.xml +++ b/doc/classes/OS.xml @@ -372,6 +372,12 @@ Returns the window size including decorations like window borders. + + + + Returns the list of command line arguments that will be used when the project automatically restarts using [method set_restart_on_exit]. See also [method is_restart_on_exit_set]. + + @@ -699,6 +705,12 @@ [b]Note:[/b] This method is implemented on Android, iOS, Linux, macOS and Windows. + + + + Returns [code]true[/code] if the project will automatically restart when it exits for any reason, [code]false[/code] otherwise. See also [method set_restart_on_exit] and [method get_restart_on_exit_arguments]. + + @@ -946,6 +958,17 @@ [b]Note:[/b] This method is implemented on macOS and Windows. + + + + + + If [code]restart[/code] is [code]true[/code], restarts the project automatically when it is exited with [method SceneTree.quit] or [constant Node.NOTIFICATION_WM_QUIT_REQUEST]. Command line [code]arguments[/code] can be supplied. To restart the project with the same command line arguments as originally used to run the project, pass [method get_cmdline_args] as the value for [code]arguments[/code]. + [method set_restart_on_exit] can be used to apply setting changes that require a restart. See also [method is_restart_on_exit_set] and [method get_restart_on_exit_arguments]. + [b]Note:[/b] This method is only effective on desktop platforms, and only when the project isn't started from the editor. It will have no effect on mobile and Web platforms, or when the project is started from the editor. + [b]Note:[/b] If the project process crashes or is [i]killed[/i] by the user (by sending [code]SIGKILL[/code] instead of the usual [code]SIGTERM[/code]), the project won't restart automatically. + +