3 files changed, 12 insertions, 5 deletions
diff --git a/core/input/input_map.cpp b/core/input/input_map.cpp
index a17faafc0c..c6db7be53a 100644
--- a/core/input/input_map.cpp
+++ b/core/input/input_map.cpp
@@ -703,11 +703,11 @@ void InputMap::load_default() {
 	OrderedHashMap<String, List<Ref<InputEvent>>> builtins = get_builtins();
 
 	// List of Builtins which have an override for macOS.
-	Vector<String> osx_builtins;
+	Vector<String> macos_builtins;
 	for (OrderedHashMap<String, List<Ref<InputEvent>>>::Element E = builtins.front(); E; E = E.next()) {
 		if (String(E.key()).ends_with(".macos")) {
 			// Strip .macos from name: some_input_name.macos -> some_input_name
-			osx_builtins.push_back(String(E.key()).split(".")[0]);
+			macos_builtins.push_back(String(E.key()).split(".")[0]);
 		}
 	}
 
@@ -717,12 +717,12 @@ void InputMap::load_default() {
 		String override_for = fullname.split(".").size() > 1 ? fullname.split(".")[1] : "";
 
 #ifdef APPLE_STYLE_KEYS
-		if (osx_builtins.has(name) && override_for != "osx") {
-			// Name has `osx` builtin but this particular one is for non-macOS systems - so skip.
+		if (macos_builtins.has(name) && override_for != "macos") {
+			// Name has `macos` builtin but this particular one is for non-macOS systems - so skip.
 			continue;
 		}
 #else
-		if (override_for == "osx") {
+		if (override_for == "macos") {
 			// Override for macOS - not needed on non-macOS platforms.
 			continue;
 		}
diff --git a/core/os/os.cpp b/core/os/os.cpp
index 89ba73b35e..dc3fe29dca 100644
--- a/core/os/os.cpp
+++ b/core/os/os.cpp
@@ -146,6 +146,10 @@ bool OS::is_stdout_verbose() const {
 	return _verbose_stdout;
 }
 
+bool OS::is_single_window() const {
+	return _single_window;
+}
+
 bool OS::is_stdout_debug_enabled() const {
 	return _debug_stdout;
 }
diff --git a/core/os/os.h b/core/os/os.h
index 55b21266fc..f585483300 100644
--- a/core/os/os.h
+++ b/core/os/os.h
@@ -52,6 +52,7 @@ class OS {
 	int low_processor_usage_mode_sleep_usec = 10000;
 	bool _verbose_stdout = false;
 	bool _debug_stdout = false;
+	bool _single_window = false;
 	String _local_clipboard;
 	int _exit_code = EXIT_FAILURE; // unexpected exit is marked as failure
 	int _orientation;
@@ -224,6 +225,8 @@ public:
 	void set_stdout_enabled(bool p_enabled);
 	void set_stderr_enabled(bool p_enabled);
 
+	bool is_single_window() const;
+
 	virtual void disable_crash_handler() {}
 	virtual bool is_disable_crash_handler() const { return false; }
 	virtual void initialize_debugging() {}