Merge pull request #57305 from bruvzg/macos_cleanup

27 files changed, 3278 insertions, 2541 deletions

diff --git a/platform/osx/SCsub b/platform/osx/SCsub
index 8ba106d1c2..d72a75af04 100644
--- a/platform/osx/SCsub
+++ b/platform/osx/SCsub
@@ -6,14 +6,21 @@ from platform_methods import run_in_subprocess
 import platform_osx_builders
 
 files = [
-    "crash_handler_osx.mm",
     "os_osx.mm",
+    "godot_application.mm",
+    "godot_application_delegate.mm",
+    "crash_handler_osx.mm",
+    "osx_terminal_logger.mm",
     "display_server_osx.mm",
+    "godot_content_view.mm",
+    "godot_window_delegate.mm",
+    "godot_window.mm",
+    "key_mapping_osx.mm",
     "godot_main_osx.mm",
     "dir_access_osx.mm",
     "joypad_osx.cpp",
     "vulkan_context_osx.mm",
-    "gl_manager_osx.mm",
+    "gl_manager_osx_legacy.mm",
 ]
 
 prog = env.add_program("#bin/godot", files)
diff --git a/platform/osx/detect.py b/platform/osx/detect.py
index c67791b340..e7fe37d4b5 100644
--- a/platform/osx/detect.py
+++ b/platform/osx/detect.py
@@ -78,14 +78,16 @@ def configure(env):
         env["osxcross"] = True
 
     if env["arch"] == "arm64":
-        print("Building for macOS 10.15+, platform arm64.")
-        env.Append(CCFLAGS=["-arch", "arm64", "-mmacosx-version-min=10.15"])
-        env.Append(LINKFLAGS=["-arch", "arm64", "-mmacosx-version-min=10.15"])
+        print("Building for macOS 11.00+, platform arm64.")
+        env.Append(CCFLAGS=["-arch", "arm64", "-mmacosx-version-min=11.00"])
+        env.Append(LINKFLAGS=["-arch", "arm64", "-mmacosx-version-min=11.00"])
     else:
         print("Building for macOS 10.12+, platform x86_64.")
         env.Append(CCFLAGS=["-arch", "x86_64", "-mmacosx-version-min=10.12"])
         env.Append(LINKFLAGS=["-arch", "x86_64", "-mmacosx-version-min=10.12"])
 
+    env.Append(CCFLAGS=["-fobjc-arc"])
+
     if not "osxcross" in env:  # regular native build
         if env["macports_clang"] != "no":
             mpprefix = os.environ.get("MACPORTS_PREFIX", "/opt/local")
@@ -188,6 +190,8 @@ def configure(env):
         env.Append(CCFLAGS=["-Wno-deprecated-declarations"])  # Disable deprecation warnings
         env.Append(LINKFLAGS=["-framework", "OpenGL"])
 
+    env.Append(LINKFLAGS=["-rpath", "@executable_path/../Frameworks", "-rpath", "@executable_path"])
+
     if env["vulkan"]:
         env.Append(CPPDEFINES=["VULKAN_ENABLED"])
         env.Append(LINKFLAGS=["-framework", "Metal", "-framework", "QuartzCore", "-framework", "IOSurface"])
diff --git a/platform/osx/display_server_osx.h b/platform/osx/display_server_osx.h
index 4fc733fe2c..eaf03d298e 100644
--- a/platform/osx/display_server_osx.h
+++ b/platform/osx/display_server_osx.h
@@ -37,13 +37,13 @@
 #include "servers/display_server.h"
 
 #if defined(GLES3_ENABLED)
-#include "gl_manager_osx.h"
-#endif
+#include "gl_manager_osx_legacy.h"
+#endif // GLES3_ENABLED
 
 #if defined(VULKAN_ENABLED)
 #include "drivers/vulkan/rendering_device_vulkan.h"
 #include "platform/osx/vulkan_context_osx.h"
-#endif
+#endif // VULKAN_ENABLED
 
 #include <AppKit/AppKit.h>
 #include <AppKit/NSCursor.h>
@@ -59,27 +59,8 @@ class DisplayServerOSX : public DisplayServer {
 	_THREAD_SAFE_CLASS_
 
 public:
-	void _send_event(NSEvent *p_event);
-	NSMenu *_get_dock_menu() const;
-	void _menu_callback(id p_sender);
-
-#if defined(GLES3_ENABLED)
-	GLManager_OSX *gl_manager = nullptr;
-#endif
-#if defined(VULKAN_ENABLED)
-	VulkanContextOSX *context_vulkan = nullptr;
-	RenderingDeviceVulkan *rendering_device_vulkan = nullptr;
-#endif
-
-	const NSMenu *_get_menu_root(const String &p_menu_root) const;
-	NSMenu *_get_menu_root(const String &p_menu_root);
-
-	NSMenu *apple_menu = nullptr;
-	NSMenu *dock_menu = nullptr;
-	Map<String, NSMenu *> submenu;
-
 	struct KeyEvent {
-		WindowID window_id;
+		WindowID window_id = INVALID_WINDOW_ID;
 		unsigned int osx_state = false;
 		bool pressed = false;
 		bool echo = false;
@@ -89,20 +70,6 @@ public:
 		uint32_t unicode = 0;
 	};
 
-	struct WarpEvent {
-		NSTimeInterval timestamp;
-		NSPoint delta;
-	};
-
-	List<WarpEvent> warp_events;
-	NSTimeInterval last_warp = 0;
-	bool ignore_warp = false;
-
-	float display_max_scale = 1.f;
-
-	Vector<KeyEvent> key_event_buffer;
-	int key_event_pos;
-
 	struct WindowData {
 		id window_delegate;
 		id window_object;
@@ -116,8 +83,6 @@ public:
 		Size2i max_size;
 		Size2i size;
 
-		bool mouse_down_control = false;
-
 		bool im_active = false;
 		Size2i im_position;
 
@@ -140,49 +105,102 @@ public:
 		bool no_focus = false;
 	};
 
+private:
+#if defined(GLES3_ENABLED)
+	GLManager_OSX *gl_manager = nullptr;
+#endif
+#if defined(VULKAN_ENABLED)
+	VulkanContextOSX *context_vulkan = nullptr;
+	RenderingDeviceVulkan *rendering_device_vulkan = nullptr;
+#endif
+	String rendering_driver;
+
+	NSMenu *apple_menu = nullptr;
+	NSMenu *dock_menu = nullptr;
+	Map<String, NSMenu *> submenu;
+
+	struct WarpEvent {
+		NSTimeInterval timestamp;
+		NSPoint delta;
+	};
+	List<WarpEvent> warp_events;
+	NSTimeInterval last_warp = 0;
+	bool ignore_warp = false;
+
+	Vector<KeyEvent> key_event_buffer;
+	int key_event_pos = 0;
+
 	Point2i im_selection;
 	String im_text;
 
-	Map<WindowID, WindowData> windows;
+	CGEventSourceRef event_source;
+	MouseMode mouse_mode = MOUSE_MODE_VISIBLE;
+	MouseButton last_button_state = MouseButton::NONE;
 
-	WindowID last_focused_window = INVALID_WINDOW_ID;
+	bool drop_events = false;
+	bool in_dispatch_input_event = false;
+
+	struct LayoutInfo {
+		String name;
+		String code;
+	};
+	Vector<LayoutInfo> kbd_layouts;
+	int current_layout = 0;
+	bool keyboard_layout_dirty = true;
 
+	WindowID last_focused_window = INVALID_WINDOW_ID;
 	WindowID window_id_counter = MAIN_WINDOW_ID;
+	float display_max_scale = 1.f;
+	Point2i origin;
+	bool displays_arrangement_dirty = true;
 
-	WindowID _create_window(WindowMode p_mode, VSyncMode p_vsync_mode, const Rect2i &p_rect);
-	void _update_window(WindowData p_wd);
-	void _send_window_event(const WindowData &wd, WindowEvent p_event);
-	static void _dispatch_input_events(const Ref<InputEvent> &p_event);
-	void _dispatch_input_event(const Ref<InputEvent> &p_event);
-	WindowID _find_window_id(id p_window);
+	CursorShape cursor_shape = CURSOR_ARROW;
+	NSCursor *cursors[CURSOR_MAX];
+	Map<CursorShape, Vector<Variant>> cursors_cache;
+
+	Map<WindowID, WindowData> windows;
+
+	const NSMenu *_get_menu_root(const String &p_menu_root) const;
+	NSMenu *_get_menu_root(const String &p_menu_root);
 
+	WindowID _create_window(WindowMode p_mode, VSyncMode p_vsync_mode, const Rect2i &p_rect);
+	void _update_window_style(WindowData p_wd);
 	void _set_window_per_pixel_transparency_enabled(bool p_enabled, WindowID p_window);
 
+	void _update_displays_arrangement();
 	Point2i _get_screens_origin() const;
 	Point2i _get_native_screen_position(int p_screen) const;
+	static void _displays_arrangement_changed(CGDirectDisplayID display_id, CGDisplayChangeSummaryFlags flags, void *user_info);
 
+	static void _dispatch_input_events(const Ref<InputEvent> &p_event);
+	void _dispatch_input_event(const Ref<InputEvent> &p_event);
 	void _push_input(const Ref<InputEvent> &p_event);
 	void _process_key_events();
-	void _release_pressed_events();
+	void _update_keyboard_layouts();
+	static void _keyboard_layout_changed(CFNotificationCenterRef center, void *observer, CFStringRef name, const void *object, CFDictionaryRef user_info);
 
-	String rendering_driver;
+	static NSCursor *_cursor_from_selector(SEL p_selector, SEL p_fallback = nil);
 
-	id autoreleasePool;
-	CGEventSourceRef eventSource;
+public:
+	NSMenu *get_dock_menu() const;
+	void menu_callback(id p_sender);
 
-	CursorShape cursor_shape;
-	NSCursor *cursors[CURSOR_MAX];
-	Map<CursorShape, Vector<Variant>> cursors_cache;
+	bool has_window(WindowID p_window) const;
+	WindowData &get_window(WindowID p_window);
 
-	MouseMode mouse_mode;
-	Point2i last_mouse_pos;
-	MouseButton last_button_state = MouseButton::NONE;
+	void send_event(NSEvent *p_event);
+	void send_window_event(const WindowData &p_wd, WindowEvent p_event);
+	void release_pressed_events();
+	void get_key_modifier_state(unsigned int p_osx_state, Ref<InputEventWithModifiers> r_state) const;
+	void update_mouse_pos(WindowData &p_wd, NSPoint p_location_in_window);
+	void push_to_key_event_buffer(const KeyEvent &p_event);
+	void update_im_text(const Point2i &p_selection, const String &p_text);
+	void set_last_focused_window(WindowID p_window);
 
-	bool window_focused;
-	bool drop_events;
-	bool in_dispatch_input_event = false;
+	void window_update(WindowID p_window);
+	void window_destroy(WindowID p_window);
+	void window_resize(WindowID p_window, int p_width, int p_height);
 
-public:
 	virtual bool has_feature(Feature p_feature) const override;
 	virtual String get_name() const override;
 
@@ -216,8 +234,10 @@ public:
 	virtual void mouse_set_mode(MouseMode p_mode) override;
 	virtual MouseMode mouse_get_mode() const override;
 
+	bool update_mouse_wrap(WindowData &p_wd, NSPoint &r_delta, NSPoint &r_mpos, NSTimeInterval p_timestamp);
 	virtual void mouse_warp_to_position(const Point2i &p_to) override;
 	virtual Point2i mouse_get_position() const override;
+	void mouse_set_button_state(MouseButton p_state);
 	virtual MouseButton mouse_get_button_state() const override;
 
 	virtual void clipboard_set(const String &p_text) override;
@@ -297,6 +317,7 @@ public:
 	virtual Point2i ime_get_selection() const override;
 	virtual String ime_get_text() const override;
 
+	void cursor_update_shape();
 	virtual void cursor_set_shape(CursorShape p_shape) override;
 	virtual CursorShape cursor_get_shape() const override;
 	virtual void cursor_set_custom_image(const RES &p_cursor, CursorShape p_shape = CURSOR_ARROW, const Vector2 &p_hotspot = Vector2()) override;
diff --git a/platform/osx/display_server_osx.mm b/platform/osx/display_server_osx.mm
index 000be79852..ba10d7593f 100644
--- a/platform/osx/display_server_osx.mm
+++ b/platform/osx/display_server_osx.mm
@@ -30,6 +30,11 @@
 
 #include "display_server_osx.h"
 
+#include "godot_content_view.h"
+#include "godot_menu_item.h"
+#include "godot_window.h"
+#include "godot_window_delegate.h"
+#include "key_mapping_osx.h"
 #include "os_osx.h"
 
 #include "core/io/marshalls.h"
@@ -47,217 +52,121 @@
 
 #if defined(GLES3_ENABLED)
 #include "drivers/gles3/rasterizer_gles3.h"
-
-#import <AppKit/NSOpenGLView.h>
 #endif
 
 #if defined(VULKAN_ENABLED)
 #include "servers/rendering/renderer_rd/renderer_compositor_rd.h"
-
-#include <QuartzCore/CAMetalLayer.h>
-#endif
-
-#ifndef NSAppKitVersionNumber10_14
-#define NSAppKitVersionNumber10_14 1671
 #endif
 
-#define DS_OSX ((DisplayServerOSX *)(DisplayServerOSX::get_singleton()))
-
-static bool ignore_momentum_scroll = false;
-
-static void _get_key_modifier_state(unsigned int p_osx_state, Ref<InputEventWithModifiers> r_state) {
-	r_state->set_shift_pressed((p_osx_state & NSEventModifierFlagShift));
-	r_state->set_ctrl_pressed((p_osx_state & NSEventModifierFlagControl));
-	r_state->set_alt_pressed((p_osx_state & NSEventModifierFlagOption));
-	r_state->set_meta_pressed((p_osx_state & NSEventModifierFlagCommand));
-}
-
-static Vector2i _get_mouse_pos(DisplayServerOSX::WindowData &p_wd, NSPoint p_locationInWindow) {
-	const NSRect contentRect = [p_wd.window_view frame];
-	const float scale = DS_OSX->screen_get_max_scale();
-	p_wd.mouse_pos.x = p_locationInWindow.x * scale;
-	p_wd.mouse_pos.y = (contentRect.size.height - p_locationInWindow.y) * scale;
-	DS_OSX->last_mouse_pos = p_wd.mouse_pos;
-	Input::get_singleton()->set_mouse_position(p_wd.mouse_pos);
-	return p_wd.mouse_pos;
-}
-
-static void _push_to_key_event_buffer(const DisplayServerOSX::KeyEvent &p_event) {
-	Vector<DisplayServerOSX::KeyEvent> &buffer = DS_OSX->key_event_buffer;
-	if (DS_OSX->key_event_pos >= buffer.size()) {
-		buffer.resize(1 + DS_OSX->key_event_pos);
-	}
-	buffer.write[DS_OSX->key_event_pos++] = p_event;
-}
-
-static NSCursor *_cursorFromSelector(SEL selector, SEL fallback = nil) {
-	if ([NSCursor respondsToSelector:selector]) {
-		id object = [NSCursor performSelector:selector];
-		if ([object isKindOfClass:[NSCursor class]]) {
-			return object;
+const NSMenu *DisplayServerOSX::_get_menu_root(const String &p_menu_root) const {
+	const NSMenu *menu = nullptr;
+	if (p_menu_root == "") {
+		// Main menu.
+		menu = [NSApp mainMenu];
+	} else if (p_menu_root.to_lower() == "_dock") {
+		// macOS dock menu.
+		menu = dock_menu;
+	} else {
+		// Submenu.
+		if (submenu.has(p_menu_root)) {
+			menu = submenu[p_menu_root];
 		}
 	}
-	if (fallback) {
-		// Fallback should be a reasonable default, no need to check.
-		return [NSCursor performSelector:fallback];
-	}
-	return [NSCursor arrowCursor];
-}
-
-/*************************************************************************/
-/* GlobalMenuItem                                                       */
-/*************************************************************************/
-
-@interface GlobalMenuItem : NSObject {
-@public
-	Callable callback;
-	Variant meta;
-	bool checkable;
-}
-
-@end
-
-@implementation GlobalMenuItem
-@end
-
-/*************************************************************************/
-/* GodotWindowDelegate                                                   */
-/*************************************************************************/
-
-@interface GodotWindowDelegate : NSObject {
-	DisplayServerOSX::WindowID window_id;
-}
-
-- (void)windowWillClose:(NSNotification *)notification;
-- (void)setWindowID:(DisplayServerOSX::WindowID)wid;
-
-@end
-
-@implementation GodotWindowDelegate
-
-- (void)setWindowID:(DisplayServerOSX::WindowID)wid {
-	window_id = wid;
-}
-
-- (BOOL)windowShouldClose:(id)sender {
-	if (!DS_OSX || !DS_OSX->windows.has(window_id)) {
-		return YES;
+	if (menu == apple_menu) {
+		// Do not allow to change Apple menu.
+		return nullptr;
 	}
-	DS_OSX->_send_window_event(DS_OSX->windows[window_id], DisplayServerOSX::WINDOW_EVENT_CLOSE_REQUEST);
-	return NO;
+	return menu;
 }
 
-- (void)windowWillClose:(NSNotification *)notification {
-	if (!DS_OSX || !DS_OSX->windows.has(window_id)) {
-		return;
-	}
-	DisplayServerOSX::WindowData &wd = DS_OSX->windows[window_id];
-
-	while (wd.transient_children.size()) {
-		DS_OSX->window_set_transient(wd.transient_children.front()->get(), DisplayServerOSX::INVALID_WINDOW_ID);
-	}
-
-	if (wd.transient_parent != DisplayServerOSX::INVALID_WINDOW_ID) {
-		DS_OSX->window_set_transient(window_id, DisplayServerOSX::INVALID_WINDOW_ID);
-	}
-
-#if defined(GLES3_ENABLED)
-	if (DS_OSX->gl_manager) {
-		DS_OSX->gl_manager->window_destroy(window_id);
-	}
-#endif
-#ifdef VULKAN_ENABLED
-	if (DS_OSX->context_vulkan) {
-		DS_OSX->context_vulkan->window_destroy(window_id);
+NSMenu *DisplayServerOSX::_get_menu_root(const String &p_menu_root) {
+	NSMenu *menu = nullptr;
+	if (p_menu_root == "") {
+		// Main menu.
+		menu = [NSApp mainMenu];
+	} else if (p_menu_root.to_lower() == "_dock") {
+		// macOS dock menu.
+		menu = dock_menu;
+	} else {
+		// Submenu.
+		if (!submenu.has(p_menu_root)) {
+			NSMenu *n_menu = [[NSMenu alloc] initWithTitle:[NSString stringWithUTF8String:p_menu_root.utf8().get_data()]];
+			submenu[p_menu_root] = n_menu;
+		}
+		menu = submenu[p_menu_root];
 	}
-#endif
-
-	DS_OSX->windows.erase(window_id);
-}
-
-- (void)windowDidEnterFullScreen:(NSNotification *)notification {
-	if (!DS_OSX || !DS_OSX->windows.has(window_id)) {
-		return;
+	if (menu == apple_menu) {
+		// Do not allow to change Apple menu.
+		return nullptr;
 	}
-	DisplayServerOSX::WindowData &wd = DS_OSX->windows[window_id];
-
-	wd.fullscreen = true;
-
-	[wd.window_object setContentMinSize:NSMakeSize(0, 0)];
-	[wd.window_object setContentMaxSize:NSMakeSize(FLT_MAX, FLT_MAX)];
-	// Force window resize event.
-	[self windowDidResize:notification];
+	return menu;
 }
 
-- (void)windowDidExitFullScreen:(NSNotification *)notification {
-	if (!DS_OSX || !DS_OSX->windows.has(window_id)) {
-		return;
-	}
-	DisplayServerOSX::WindowData &wd = DS_OSX->windows[window_id];
-
-	wd.fullscreen = false;
-
-	const float scale = DS_OSX->screen_get_max_scale();
-	if (wd.min_size != Size2i()) {
-		Size2i size = wd.min_size / scale;
-		[wd.window_object setContentMinSize:NSMakeSize(size.x, size.y)];
-	}
-	if (wd.max_size != Size2i()) {
-		Size2i size = wd.max_size / scale;
-		[wd.window_object setContentMaxSize:NSMakeSize(size.x, size.y)];
-	}
-
-	if (wd.resize_disabled) {
-		[wd.window_object setStyleMask:[wd.window_object styleMask] & ~NSWindowStyleMaskResizable];
-	}
-
-	if (wd.on_top) {
-		[wd.window_object setLevel:NSFloatingWindowLevel];
-	}
-	// Force window resize event.
-	[self windowDidResize:notification];
-}
+DisplayServerOSX::WindowID DisplayServerOSX::_create_window(WindowMode p_mode, VSyncMode p_vsync_mode, const Rect2i &p_rect) {
+	WindowID id;
+	const float scale = screen_get_max_scale();
+	{
+		WindowData wd;
 
-- (void)windowDidChangeBackingProperties:(NSNotification *)notification {
-	if (!DisplayServerOSX::get_singleton()) {
-		return;
-	}
+		wd.window_delegate = [[GodotWindowDelegate alloc] init];
+		ERR_FAIL_COND_V_MSG(wd.window_delegate == nil, INVALID_WINDOW_ID, "Can't create a window delegate");
+		[wd.window_delegate setWindowID:window_id_counter];
 
-	ERR_FAIL_COND(!DS_OSX->windows.has(window_id));
-	DisplayServerOSX::WindowData &wd = DS_OSX->windows[window_id];
+		Point2i position = p_rect.position;
+		// OS X native y-coordinate relative to _get_screens_origin() is negative,
+		// Godot passes a positive value.
+		position.y *= -1;
+		position += _get_screens_origin();
 
-	CGFloat newBackingScaleFactor = [wd.window_object backingScaleFactor];
-	CGFloat oldBackingScaleFactor = [[[notification userInfo] objectForKey:@"NSBackingPropertyOldScaleFactorKey"] doubleValue];
+		// initWithContentRect uses bottom-left corner of the window’s frame as origin.
+		wd.window_object = [[GodotWindow alloc]
+				initWithContentRect:NSMakeRect(position.x / scale, (position.y - p_rect.size.height) / scale, p_rect.size.width / scale, p_rect.size.height / scale)
+						  styleMask:NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | NSWindowStyleMaskMiniaturizable | NSWindowStyleMaskResizable
+							backing:NSBackingStoreBuffered
+							  defer:NO];
+		ERR_FAIL_COND_V_MSG(wd.window_object == nil, INVALID_WINDOW_ID, "Can't create a window");
 
-	if (newBackingScaleFactor != oldBackingScaleFactor) {
-		//Set new display scale and window size
-		const float scale = DS_OSX->screen_get_max_scale();
-		const NSRect contentRect = [wd.window_view frame];
+		wd.window_view = [[GodotContentView alloc] init];
+		ERR_FAIL_COND_V_MSG(wd.window_view == nil, INVALID_WINDOW_ID, "Can't create a window view");
+		[wd.window_view setWindowID:window_id_counter];
+		[wd.window_view setWantsLayer:TRUE];
 
-		wd.size.width = contentRect.size.width * scale;
-		wd.size.height = contentRect.size.height * scale;
+		[wd.window_object setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary];
+		[wd.window_object setContentView:wd.window_view];
+		[wd.window_object setDelegate:wd.window_delegate];
+		[wd.window_object setAcceptsMouseMovedEvents:YES];
+		[wd.window_object setRestorable:NO];
+		[wd.window_object setColorSpace:[NSColorSpace sRGBColorSpace]];
 
-		DS_OSX->_send_window_event(wd, DisplayServerOSX::WINDOW_EVENT_DPI_CHANGE);
+		if ([wd.window_object respondsToSelector:@selector(setTabbingMode:)]) {
+			[wd.window_object setTabbingMode:NSWindowTabbingModeDisallowed];
+		}
 
 		CALayer *layer = [wd.window_view layer];
 		if (layer) {
 			layer.contentsScale = scale;
 		}
 
-		//Force window resize event
-		[self windowDidResize:notification];
+#if defined(VULKAN_ENABLED)
+		if (context_vulkan) {
+			Error err = context_vulkan->window_create(window_id_counter, p_vsync_mode, wd.window_view, p_rect.size.width, p_rect.size.height);
+			ERR_FAIL_COND_V_MSG(err != OK, INVALID_WINDOW_ID, "Can't create a Vulkan context");
+		}
+#endif
+#if defined(GLES3_ENABLED)
+		if (gl_manager) {
+			Error err = gl_manager->window_create(window_id_counter, wd.window_view, p_rect.size.width, p_rect.size.height);
+			ERR_FAIL_COND_V_MSG(err != OK, INVALID_WINDOW_ID, "Can't create an OpenGL context");
+		}
+#endif
+		id = window_id_counter++;
+		windows[id] = wd;
 	}
-}
 
-- (void)windowDidResize:(NSNotification *)notification {
-	if (!DS_OSX || !DS_OSX->windows.has(window_id)) {
-		return;
-	}
-	DisplayServerOSX::WindowData &wd = DS_OSX->windows[window_id];
+	WindowData &wd = windows[id];
+	window_set_mode(p_mode, id);
 
 	const NSRect contentRect = [wd.window_view frame];
-
-	const float scale = DS_OSX->screen_get_max_scale();
 	wd.size.width = contentRect.size.width * scale;
 	wd.size.height = contentRect.size.height * scale;
 
@@ -267,1204 +176,448 @@ static NSCursor *_cursorFromSelector(SEL selector, SEL fallback = nil) {
 	}
 
 #if defined(GLES3_ENABLED)
-	if (DS_OSX->gl_manager) {
-		DS_OSX->gl_manager->window_resize(window_id, wd.size.width, wd.size.height);
+	if (gl_manager) {
+		gl_manager->window_resize(id, wd.size.width, wd.size.height);
 	}
 #endif
 #if defined(VULKAN_ENABLED)
-	if (DS_OSX->context_vulkan) {
-		DS_OSX->context_vulkan->window_resize(window_id, wd.size.width, wd.size.height);
+	if (context_vulkan) {
+		context_vulkan->window_resize(id, wd.size.width, wd.size.height);
 	}
 #endif
 
-	if (!wd.rect_changed_callback.is_null()) {
-		Variant size = Rect2i(DS_OSX->window_get_position(window_id), DS_OSX->window_get_size(window_id));
-		Variant *sizep = &size;
-		Variant ret;
-		Callable::CallError ce;
-		wd.rect_changed_callback.call((const Variant **)&sizep, 1, ret, ce);
-	}
+	return id;
 }
 
-- (void)windowDidMove:(NSNotification *)notification {
-	if (!DS_OSX || !DS_OSX->windows.has(window_id)) {
-		return;
-	}
-	DisplayServerOSX::WindowData &wd = DS_OSX->windows[window_id];
-
-	DS_OSX->_release_pressed_events();
+void DisplayServerOSX::_update_window_style(WindowData p_wd) {
+	bool borderless_full = false;
 
-	if (!wd.rect_changed_callback.is_null()) {
-		Variant size = Rect2i(DS_OSX->window_get_position(window_id), DS_OSX->window_get_size(window_id));
-		Variant *sizep = &size;
-		Variant ret;
-		Callable::CallError ce;
-		wd.rect_changed_callback.call((const Variant **)&sizep, 1, ret, ce);
-	}
-}
+	if (p_wd.borderless) {
+		NSRect frameRect = [p_wd.window_object frame];
+		NSRect screenRect = [[p_wd.window_object screen] frame];
 
-- (void)windowDidBecomeKey:(NSNotification *)notification {
-	if (!DS_OSX || !DS_OSX->windows.has(window_id)) {
-		return;
+		// Check if our window covers up the screen.
+		if (frameRect.origin.x <= screenRect.origin.x && frameRect.origin.y <= frameRect.origin.y &&
+				frameRect.size.width >= screenRect.size.width && frameRect.size.height >= screenRect.size.height) {
+			borderless_full = true;
+		}
 	}
-	DisplayServerOSX::WindowData &wd = DS_OSX->windows[window_id];
 
-	if (DS_OSX->mouse_mode == DisplayServer::MOUSE_MODE_CAPTURED) {
-		const NSRect contentRect = [wd.window_view frame];
-		NSRect pointInWindowRect = NSMakeRect(contentRect.size.width / 2, contentRect.size.height / 2, 0, 0);
-		NSPoint pointOnScreen = [[wd.window_view window] convertRectToScreen:pointInWindowRect].origin;
-		CGPoint lMouseWarpPos = { pointOnScreen.x, CGDisplayBounds(CGMainDisplayID()).size.height - pointOnScreen.y };
-		CGWarpMouseCursorPosition(lMouseWarpPos);
+	if (borderless_full) {
+		// If the window covers up the screen set the level to above the main menu and hide on deactivate.
+		[p_wd.window_object setLevel:NSMainMenuWindowLevel + 1];
+		[p_wd.window_object setHidesOnDeactivate:YES];
 	} else {
-		_ALLOW_DISCARD_ _get_mouse_pos(wd, [wd.window_object mouseLocationOutsideOfEventStream]);
-		Input::get_singleton()->set_mouse_position(wd.mouse_pos);
-	}
-
-	DS_OSX->window_focused = true;
-	DS_OSX->last_focused_window = window_id;
-	DS_OSX->_send_window_event(wd, DisplayServerOSX::WINDOW_EVENT_FOCUS_IN);
-}
-
-- (void)windowDidResignKey:(NSNotification *)notification {
-	if (!DS_OSX || !DS_OSX->windows.has(window_id)) {
-		return;
+		// Reset these when our window is not a borderless window that covers up the screen.
+		if (p_wd.on_top && !p_wd.fullscreen) {
+			[p_wd.window_object setLevel:NSFloatingWindowLevel];
+		} else {
+			[p_wd.window_object setLevel:NSNormalWindowLevel];
+		}
+		[p_wd.window_object setHidesOnDeactivate:NO];
 	}
-	DisplayServerOSX::WindowData &wd = DS_OSX->windows[window_id];
-
-	DS_OSX->window_focused = false;
-
-	DS_OSX->_release_pressed_events();
-	DS_OSX->_send_window_event(wd, DisplayServerOSX::WINDOW_EVENT_FOCUS_OUT);
 }
 
-- (void)windowDidMiniaturize:(NSNotification *)notification {
-	if (!DS_OSX || !DS_OSX->windows.has(window_id)) {
-		return;
-	}
-	DisplayServerOSX::WindowData &wd = DS_OSX->windows[window_id];
-
-	DS_OSX->window_focused = false;
-
-	DS_OSX->_release_pressed_events();
-	DS_OSX->_send_window_event(wd, DisplayServerOSX::WINDOW_EVENT_FOCUS_OUT);
-}
+void DisplayServerOSX::_set_window_per_pixel_transparency_enabled(bool p_enabled, WindowID p_window) {
+	ERR_FAIL_COND(!windows.has(p_window));
+	WindowData &wd = windows[p_window];
 
-- (void)windowDidDeminiaturize:(NSNotification *)notification {
-	if (!DS_OSX || !DS_OSX->windows.has(window_id)) {
+	if (!OS::get_singleton()->is_layered_allowed()) {
 		return;
 	}
-	DisplayServerOSX::WindowData &wd = DS_OSX->windows[window_id];
-
-	DS_OSX->window_focused = true;
-	DS_OSX->last_focused_window = window_id;
-	DS_OSX->_send_window_event(wd, DisplayServerOSX::WINDOW_EVENT_FOCUS_IN);
-}
-
-@end
-
-/*************************************************************************/
-/* GodotContentView                                                      */
-/*************************************************************************/
-
+	if (wd.layered_window != p_enabled) {
+		if (p_enabled) {
+			[wd.window_object setBackgroundColor:[NSColor clearColor]];
+			[wd.window_object setOpaque:NO];
+			[wd.window_object setHasShadow:NO];
+			CALayer *layer = [wd.window_view layer];
+			if (layer) {
+				[layer setBackgroundColor:[NSColor clearColor].CGColor];
+				[layer setOpaque:NO];
+			}
 #if defined(GLES3_ENABLED)
-@interface GodotContentView : NSOpenGLView <NSTextInputClient> {
-#else
-@interface GodotContentView : NSView <NSTextInputClient> {
-#endif
-
-	DisplayServerOSX::WindowID window_id;
-	NSTrackingArea *trackingArea;
-	NSMutableAttributedString *markedText;
-	bool imeInputEventInProgress;
-}
-
-- (void)cancelComposition;
-- (CALayer *)makeBackingLayer;
-- (BOOL)wantsUpdateLayer;
-- (void)updateLayer;
-- (void)setWindowID:(DisplayServerOSX::WindowID)wid;
-
-@end
-
-@implementation GodotContentView
-
-- (void)setWindowID:(DisplayServerOSX::WindowID)wid {
-	window_id = wid;
-}
-
-+ (void)initialize {
-	if (self == [GodotContentView class]) {
-		// nothing left to do here at the moment..
-	}
-}
-
-- (CALayer *)makeBackingLayer {
-#if defined(VULKAN_ENABLED)
-	if (DS_OSX->context_vulkan) {
-		CALayer *layer = [[CAMetalLayer class] layer];
-		return layer;
-	}
+			if (gl_manager) {
+				gl_manager->window_set_per_pixel_transparency_enabled(p_window, true);
+			}
 #endif
-	return [super makeBackingLayer];
-}
-
-- (void)updateLayer {
+			wd.layered_window = true;
+		} else {
+			[wd.window_object setBackgroundColor:[NSColor colorWithCalibratedWhite:1 alpha:1]];
+			[wd.window_object setOpaque:YES];
+			[wd.window_object setHasShadow:YES];
+			CALayer *layer = [wd.window_view layer];
+			if (layer) {
+				[layer setBackgroundColor:[NSColor colorWithCalibratedWhite:1 alpha:1].CGColor];
+				[layer setOpaque:YES];
+			}
 #if defined(GLES3_ENABLED)
-	if (DS_OSX->gl_manager) {
-		DS_OSX->gl_manager->window_update(window_id);
-	}
+			if (gl_manager) {
+				gl_manager->window_set_per_pixel_transparency_enabled(p_window, false);
+			}
 #endif
-#if defined(VULKAN_ENABLED)
-	if (DS_OSX->context_vulkan) {
-		[super updateLayer];
+			wd.layered_window = false;
+		}
+		NSRect frameRect = [wd.window_object frame];
+		[wd.window_object setFrame:NSMakeRect(frameRect.origin.x, frameRect.origin.y, frameRect.size.width + 1, frameRect.size.height) display:YES];
+		[wd.window_object setFrame:frameRect display:YES];
 	}
-#endif
-}
-
-- (BOOL)wantsUpdateLayer {
-	return YES;
 }
 
-- (id)init {
-	self = [super init];
-	trackingArea = nil;
-	imeInputEventInProgress = false;
-	[self updateTrackingAreas];
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
-	[self registerForDraggedTypes:[NSArray arrayWithObject:NSPasteboardTypeFileURL]];
-#else
-	[self registerForDraggedTypes:[NSArray arrayWithObject:NSFilenamesPboardType]];
-#endif
-	markedText = [[NSMutableAttributedString alloc] init];
-	return self;
-}
+void DisplayServerOSX::_update_displays_arrangement() {
+	origin = Point2i();
 
-- (void)dealloc {
-	[trackingArea release];
-	[markedText release];
-	[super dealloc];
+	for (int i = 0; i < get_screen_count(); i++) {
+		Point2i position = _get_native_screen_position(i);
+		if (position.x < origin.x) {
+			origin.x = position.x;
+		}
+		if (position.y > origin.y) {
+			origin.y = position.y;
+		}
+	}
+	displays_arrangement_dirty = false;
 }
 
-static const NSRange kEmptyRange = { NSNotFound, 0 };
-
-- (BOOL)hasMarkedText {
-	return (markedText.length > 0);
-}
+Point2i DisplayServerOSX::_get_screens_origin() const {
+	// Returns the native top-left screen coordinate of the smallest rectangle
+	// that encompasses all screens. Needed in get_screen_position(),
+	// window_get_position, and window_set_position()
+	// to convert between OS X native screen coordinates and the ones expected by Godot.
 
-- (NSRange)markedRange {
-	return NSMakeRange(0, markedText.length);
-}
+	if (displays_arrangement_dirty) {
+		const_cast<DisplayServerOSX *>(this)->_update_displays_arrangement();
+	}
 
-- (NSRange)selectedRange {
-	return kEmptyRange;
+	return origin;
 }
 
-- (void)setMarkedText:(id)aString selectedRange:(NSRange)selectedRange replacementRange:(NSRange)replacementRange {
-	if ([aString isKindOfClass:[NSAttributedString class]]) {
-		[markedText initWithAttributedString:aString];
-	} else {
-		[markedText initWithString:aString];
-	}
-	if (markedText.length == 0) {
-		[self unmarkText];
-		return;
+Point2i DisplayServerOSX::_get_native_screen_position(int p_screen) const {
+	NSArray *screenArray = [NSScreen screens];
+	if ((NSUInteger)p_screen < [screenArray count]) {
+		NSRect nsrect = [[screenArray objectAtIndex:p_screen] frame];
+		// Return the top-left corner of the screen, for OS X the y starts at the bottom.
+		return Point2i(nsrect.origin.x, nsrect.origin.y + nsrect.size.height) * screen_get_max_scale();
 	}
 
-	ERR_FAIL_COND(!DS_OSX->windows.has(window_id));
-	DisplayServerOSX::WindowData &wd = DS_OSX->windows[window_id];
-
-	if (wd.im_active) {
-		imeInputEventInProgress = true;
-		DS_OSX->im_text.parse_utf8([[markedText mutableString] UTF8String]);
-		DS_OSX->im_selection = Point2i(selectedRange.location, selectedRange.length);
+	return Point2i();
+}
 
-		OS_OSX::get_singleton()->get_main_loop()->notification(MainLoop::NOTIFICATION_OS_IME_UPDATE);
+void DisplayServerOSX::_displays_arrangement_changed(CGDirectDisplayID display_id, CGDisplayChangeSummaryFlags flags, void *user_info) {
+	DisplayServerOSX *ds = (DisplayServerOSX *)DisplayServer::get_singleton();
+	if (ds) {
+		ds->displays_arrangement_dirty = true;
 	}
 }
 
-- (void)doCommandBySelector:(SEL)aSelector {
-	if ([self respondsToSelector:aSelector]) {
-		[self performSelector:aSelector];
-	}
+void DisplayServerOSX::_dispatch_input_events(const Ref<InputEvent> &p_event) {
+	((DisplayServerOSX *)(get_singleton()))->_dispatch_input_event(p_event);
 }
 
-- (void)unmarkText {
-	imeInputEventInProgress = false;
-	[[markedText mutableString] setString:@""];
+void DisplayServerOSX::_dispatch_input_event(const Ref<InputEvent> &p_event) {
+	_THREAD_SAFE_METHOD_
+	if (!in_dispatch_input_event) {
+		in_dispatch_input_event = true;
 
-	ERR_FAIL_COND(!DS_OSX->windows.has(window_id));
-	DisplayServerOSX::WindowData &wd = DS_OSX->windows[window_id];
+		Variant ev = p_event;
+		Variant *evp = &ev;
+		Variant ret;
+		Callable::CallError ce;
 
-	if (wd.im_active) {
-		DS_OSX->im_text = String();
-		DS_OSX->im_selection = Point2i();
+		Ref<InputEventFromWindow> event_from_window = p_event;
+		if (event_from_window.is_valid() && event_from_window->get_window_id() != INVALID_WINDOW_ID) {
+			// Send to a window.
+			if (windows.has(event_from_window->get_window_id())) {
+				Callable callable = windows[event_from_window->get_window_id()].input_event_callback;
+				if (callable.is_null()) {
+					return;
+				}
+				callable.call((const Variant **)&evp, 1, ret, ce);
+			}
+		} else {
+			// Send to all windows.
+			for (Map<WindowID, WindowData>::Element *E = windows.front(); E; E = E->next()) {
+				Callable callable = E->get().input_event_callback;
+				if (callable.is_null()) {
+					continue;
+				}
+				callable.call((const Variant **)&evp, 1, ret, ce);
+			}
+		}
 
-		OS_OSX::get_singleton()->get_main_loop()->notification(MainLoop::NOTIFICATION_OS_IME_UPDATE);
+		in_dispatch_input_event = false;
 	}
 }
 
-- (NSArray *)validAttributesForMarkedText {
-	return [NSArray array];
-}
-
-- (NSAttributedString *)attributedSubstringForProposedRange:(NSRange)aRange actualRange:(NSRangePointer)actualRange {
-	return nil;
-}
-
-- (NSUInteger)characterIndexForPoint:(NSPoint)aPoint {
-	return 0;
-}
-
-- (NSRect)firstRectForCharacterRange:(NSRange)aRange actualRange:(NSRangePointer)actualRange {
-	ERR_FAIL_COND_V(!DS_OSX->windows.has(window_id), NSMakeRect(0, 0, 0, 0));
-	DisplayServerOSX::WindowData &wd = DS_OSX->windows[window_id];
-
-	const NSRect contentRect = [wd.window_view frame];
-	const float scale = DS_OSX->screen_get_max_scale();
-	NSRect pointInWindowRect = NSMakeRect(wd.im_position.x / scale, contentRect.size.height - (wd.im_position.y / scale) - 1, 0, 0);
-	NSPoint pointOnScreen = [wd.window_object convertRectToScreen:pointInWindowRect].origin;
-
-	return NSMakeRect(pointOnScreen.x, pointOnScreen.y, 0, 0);
+void DisplayServerOSX::_push_input(const Ref<InputEvent> &p_event) {
+	Ref<InputEvent> ev = p_event;
+	Input::get_singleton()->parse_input_event(ev);
 }
 
-- (void)cancelComposition {
-	[self unmarkText];
-	NSTextInputContext *currentInputContext = [NSTextInputContext currentInputContext];
-	[currentInputContext discardMarkedText];
-}
+void DisplayServerOSX::_process_key_events() {
+	Ref<InputEventKey> k;
+	for (int i = 0; i < key_event_pos; i++) {
+		const KeyEvent &ke = key_event_buffer[i];
+		if (ke.raw) {
+			// Non IME input - no composite characters, pass events as is.
+			k.instantiate();
 
-- (void)insertText:(id)aString {
-	[self insertText:aString replacementRange:NSMakeRange(0, 0)];
-}
+			k->set_window_id(ke.window_id);
+			get_key_modifier_state(ke.osx_state, k);
+			k->set_pressed(ke.pressed);
+			k->set_echo(ke.echo);
+			k->set_keycode(ke.keycode);
+			k->set_physical_keycode((Key)ke.physical_keycode);
+			k->set_unicode(ke.unicode);
 
-- (void)insertText:(id)aString replacementRange:(NSRange)replacementRange {
-	NSEvent *event = [NSApp currentEvent];
+			_push_input(k);
+		} else {
+			// IME input.
+			if ((i == 0 && ke.keycode == Key::NONE) || (i > 0 && key_event_buffer[i - 1].keycode == Key::NONE)) {
+				k.instantiate();
 
-	NSString *characters;
-	if ([aString isKindOfClass:[NSAttributedString class]]) {
-		characters = [aString string];
-	} else {
-		characters = (NSString *)aString;
-	}
+				k->set_window_id(ke.window_id);
+				get_key_modifier_state(ke.osx_state, k);
+				k->set_pressed(ke.pressed);
+				k->set_echo(ke.echo);
+				k->set_keycode(Key::NONE);
+				k->set_physical_keycode(Key::NONE);
+				k->set_unicode(ke.unicode);
 
-	NSCharacterSet *ctrlChars = [NSCharacterSet controlCharacterSet];
-	NSCharacterSet *wsnlChars = [NSCharacterSet whitespaceAndNewlineCharacterSet];
-	if ([characters rangeOfCharacterFromSet:ctrlChars].length && [characters rangeOfCharacterFromSet:wsnlChars].length == 0) {
-		NSTextInputContext *currentInputContext = [NSTextInputContext currentInputContext];
-		[currentInputContext discardMarkedText];
-		[self cancelComposition];
-		return;
-	}
+				_push_input(k);
+			}
+			if (ke.keycode != Key::NONE) {
+				k.instantiate();
 
-	Char16String text;
-	text.resize([characters length] + 1);
-	[characters getCharacters:(unichar *)text.ptrw() range:NSMakeRange(0, [characters length])];
+				k->set_window_id(ke.window_id);
+				get_key_modifier_state(ke.osx_state, k);
+				k->set_pressed(ke.pressed);
+				k->set_echo(ke.echo);
+				k->set_keycode(ke.keycode);
+				k->set_physical_keycode((Key)ke.physical_keycode);
 
-	String u32text;
-	u32text.parse_utf16(text.ptr(), text.length());
+				if (i + 1 < key_event_pos && key_event_buffer[i + 1].keycode == Key::NONE) {
+					k->set_unicode(key_event_buffer[i + 1].unicode);
+				}
 
-	for (int i = 0; i < u32text.length(); i++) {
-		const char32_t codepoint = u32text[i];
-		if ((codepoint & 0xFF00) == 0xF700) {
-			continue;
+				_push_input(k);
+			}
 		}
-
-		DisplayServerOSX::KeyEvent ke;
-
-		ke.window_id = window_id;
-		ke.osx_state = [event modifierFlags];
-		ke.pressed = true;
-		ke.echo = false;
-		ke.raw = false; // IME input event
-		ke.keycode = Key::NONE;
-		ke.physical_keycode = Key::NONE;
-		ke.unicode = codepoint;
-
-		_push_to_key_event_buffer(ke);
 	}
-	[self cancelComposition];
-}
 
-- (NSDragOperation)draggingEntered:(id<NSDraggingInfo>)sender {
-	return NSDragOperationCopy;
+	key_event_pos = 0;
 }
 
-- (NSDragOperation)draggingUpdated:(id<NSDraggingInfo>)sender {
-	return NSDragOperationCopy;
-}
+void DisplayServerOSX::_update_keyboard_layouts() {
+	kbd_layouts.clear();
+	current_layout = 0;
 
-- (BOOL)performDragOperation:(id<NSDraggingInfo>)sender {
-	ERR_FAIL_COND_V(!DS_OSX->windows.has(window_id), NO);
-	DisplayServerOSX::WindowData &wd = DS_OSX->windows[window_id];
+	TISInputSourceRef cur_source = TISCopyCurrentKeyboardInputSource();
+	NSString *cur_name = (__bridge NSString *)TISGetInputSourceProperty(cur_source, kTISPropertyLocalizedName);
+	CFRelease(cur_source);
 
-	if (!wd.drop_files_callback.is_null()) {
-		Vector<String> files;
-		NSPasteboard *pboard = [sender draggingPasteboard];
+	// Enum IME layouts.
+	NSDictionary *filter_ime = @{ (NSString *)kTISPropertyInputSourceType : (NSString *)kTISTypeKeyboardInputMode };
+	NSArray *list_ime = (__bridge NSArray *)TISCreateInputSourceList((__bridge CFDictionaryRef)filter_ime, false);
+	for (NSUInteger i = 0; i < [list_ime count]; i++) {
+		LayoutInfo ly;
+		NSString *name = (__bridge NSString *)TISGetInputSourceProperty((__bridge TISInputSourceRef)[list_ime objectAtIndex:i], kTISPropertyLocalizedName);
+		ly.name.parse_utf8([name UTF8String]);
 
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
-		NSArray *items = pboard.pasteboardItems;
-		for (NSPasteboardItem *item in items) {
-			NSString *path = [item stringForType:NSPasteboardTypeFileURL];
-			NSString *ns = [NSURL URLWithString:path].path;
-			char *utfs = strdup([ns UTF8String]);
-			String ret;
-			ret.parse_utf8(utfs);
-			free(utfs);
-			files.push_back(ret);
-		}
-#else
-		NSArray *filenames = [pboard propertyListForType:NSFilenamesPboardType];
-		for (NSString *ns in filenames) {
-			char *utfs = strdup([ns UTF8String]);
-			String ret;
-			ret.parse_utf8(utfs);
-			free(utfs);
-			files.push_back(ret);
-		}
-#endif
+		NSArray *langs = (__bridge NSArray *)TISGetInputSourceProperty((__bridge TISInputSourceRef)[list_ime objectAtIndex:i], kTISPropertyInputSourceLanguages);
+		ly.code.parse_utf8([(NSString *)[langs objectAtIndex:0] UTF8String]);
+		kbd_layouts.push_back(ly);
 
-		Variant v = files;
-		Variant *vp = &v;
-		Variant ret;
-		Callable::CallError ce;
-		wd.drop_files_callback.call((const Variant **)&vp, 1, ret, ce);
+		if ([name isEqualToString:cur_name]) {
+			current_layout = kbd_layouts.size() - 1;
+		}
 	}
 
-	return NO;
-}
+	// Enum plain keyboard layouts.
+	NSDictionary *filter_kbd = @{ (NSString *)kTISPropertyInputSourceType : (NSString *)kTISTypeKeyboardLayout };
+	NSArray *list_kbd = (__bridge NSArray *)TISCreateInputSourceList((__bridge CFDictionaryRef)filter_kbd, false);
+	for (NSUInteger i = 0; i < [list_kbd count]; i++) {
+		LayoutInfo ly;
+		NSString *name = (__bridge NSString *)TISGetInputSourceProperty((__bridge TISInputSourceRef)[list_kbd objectAtIndex:i], kTISPropertyLocalizedName);
+		ly.name.parse_utf8([name UTF8String]);
 
-- (BOOL)isOpaque {
-	return YES;
-}
+		NSArray *langs = (__bridge NSArray *)TISGetInputSourceProperty((__bridge TISInputSourceRef)[list_kbd objectAtIndex:i], kTISPropertyInputSourceLanguages);
+		ly.code.parse_utf8([(NSString *)[langs objectAtIndex:0] UTF8String]);
+		kbd_layouts.push_back(ly);
 
-- (BOOL)canBecomeKeyView {
-	if (DS_OSX->windows.has(window_id)) {
-		DisplayServerOSX::WindowData &wd = DS_OSX->windows[window_id];
-		if (wd.no_focus) {
-			return NO;
+		if ([name isEqualToString:cur_name]) {
+			current_layout = kbd_layouts.size() - 1;
 		}
 	}
-	return YES;
-}
-
-- (BOOL)acceptsFirstResponder {
-	return YES;
-}
 
-- (void)cursorUpdate:(NSEvent *)event {
-	DisplayServer::CursorShape p_shape = DS_OSX->cursor_shape;
-	DS_OSX->cursor_shape = DisplayServer::CURSOR_MAX;
-	DS_OSX->cursor_set_shape(p_shape);
+	keyboard_layout_dirty = false;
 }
 
-static void _mouseDownEvent(DisplayServer::WindowID window_id, NSEvent *event, MouseButton index, MouseButton mask, bool pressed) {
-	ERR_FAIL_COND(!DS_OSX->windows.has(window_id));
-	DisplayServerOSX::WindowData &wd = DS_OSX->windows[window_id];
-
-	if (pressed) {
-		DS_OSX->last_button_state |= mask;
-	} else {
-		DS_OSX->last_button_state &= (MouseButton)~mask;
-	}
-
-	Ref<InputEventMouseButton> mb;
-	mb.instantiate();
-	mb->set_window_id(window_id);
-	const Vector2 pos = _get_mouse_pos(wd, [event locationInWindow]);
-	_get_key_modifier_state([event modifierFlags], mb);
-	mb->set_button_index(index);
-	mb->set_pressed(pressed);
-	mb->set_position(pos);
-	mb->set_global_position(pos);
-	mb->set_button_mask(DS_OSX->last_button_state);
-	if (index == MouseButton::LEFT && pressed) {
-		mb->set_double_click([event clickCount] == 2);
+void DisplayServerOSX::_keyboard_layout_changed(CFNotificationCenterRef center, void *observer, CFStringRef name, const void *object, CFDictionaryRef user_info) {
+	DisplayServerOSX *ds = (DisplayServerOSX *)DisplayServer::get_singleton();
+	if (ds) {
+		ds->keyboard_layout_dirty = true;
 	}
-
-	Input::get_singleton()->parse_input_event(mb);
 }
 
-- (void)mouseDown:(NSEvent *)event {
-	ERR_FAIL_COND(!DS_OSX->windows.has(window_id));
-	DisplayServerOSX::WindowData &wd = DS_OSX->windows[window_id];
-
-	if (([event modifierFlags] & NSEventModifierFlagControl)) {
-		wd.mouse_down_control = true;
-		_mouseDownEvent(window_id, event, MouseButton::RIGHT, MouseButton::MASK_RIGHT, true);
-	} else {
-		wd.mouse_down_control = false;
-		_mouseDownEvent(window_id, event, MouseButton::LEFT, MouseButton::MASK_LEFT, true);
+NSCursor *DisplayServerOSX::_cursor_from_selector(SEL p_selector, SEL p_fallback) {
+	if ([NSCursor respondsToSelector:p_selector]) {
+		id object = [NSCursor performSelector:p_selector];
+		if ([object isKindOfClass:[NSCursor class]]) {
+			return object;
+		}
 	}
-}
-
-- (void)mouseDragged:(NSEvent *)event {
-	[self mouseMoved:event];
-}
-
-- (void)mouseUp:(NSEvent *)event {
-	ERR_FAIL_COND(!DS_OSX->windows.has(window_id));
-	DisplayServerOSX::WindowData &wd = DS_OSX->windows[window_id];
-
-	if (wd.mouse_down_control) {
-		_mouseDownEvent(window_id, event, MouseButton::RIGHT, MouseButton::MASK_RIGHT, false);
-	} else {
-		_mouseDownEvent(window_id, event, MouseButton::LEFT, MouseButton::MASK_LEFT, false);
+	if (p_fallback) {
+		// Fallback should be a reasonable default, no need to check.
+		return [NSCursor performSelector:p_fallback];
 	}
+	return [NSCursor arrowCursor];
 }
 
-- (void)mouseMoved:(NSEvent *)event {
-	ERR_FAIL_COND(!DS_OSX->windows.has(window_id));
-	DisplayServerOSX::WindowData &wd = DS_OSX->windows[window_id];
-
-	NSPoint delta = NSMakePoint([event deltaX], [event deltaY]);
-	NSPoint mpos = [event locationInWindow];
+NSMenu *DisplayServerOSX::get_dock_menu() const {
+	return dock_menu;
+}
 
-	if (DS_OSX->ignore_warp) {
-		// Discard late events, before warp
-		if (([event timestamp]) < DS_OSX->last_warp) {
-			return;
-		}
-		DS_OSX->ignore_warp = false;
+void DisplayServerOSX::menu_callback(id p_sender) {
+	if (![p_sender representedObject]) {
 		return;
 	}
 
-	if (DS_OSX->mouse_mode == DisplayServer::MOUSE_MODE_CONFINED || DS_OSX->mouse_mode == DisplayServer::MOUSE_MODE_CONFINED_HIDDEN) {
-		// Discard late events
-		if (([event timestamp]) < DS_OSX->last_warp) {
-			return;
-		}
+	GodotMenuItem *value = [p_sender representedObject];
 
-		// Warp affects next event delta, subtract previous warp deltas
-		List<DisplayServerOSX::WarpEvent>::Element *F = DS_OSX->warp_events.front();
-		while (F) {
-			if (F->get().timestamp < [event timestamp]) {
-				List<DisplayServerOSX::WarpEvent>::Element *E = F;
-				delta.x -= E->get().delta.x;
-				delta.y -= E->get().delta.y;
-				F = F->next();
-				DS_OSX->warp_events.erase(E);
+	if (value) {
+		if (value->checkable) {
+			if ([p_sender state] == NSControlStateValueOff) {
+				[p_sender setState:NSControlStateValueOn];
 			} else {
-				F = F->next();
+				[p_sender setState:NSControlStateValueOff];
 			}
 		}
 
-		// Confine mouse position to the window, and update delta
-		NSRect frame = [wd.window_object frame];
-		NSPoint conf_pos = mpos;
-		conf_pos.x = CLAMP(conf_pos.x + delta.x, 0.f, frame.size.width);
-		conf_pos.y = CLAMP(conf_pos.y - delta.y, 0.f, frame.size.height);
-		delta.x = conf_pos.x - mpos.x;
-		delta.y = mpos.y - conf_pos.y;
-		mpos = conf_pos;
-
-		// Move mouse cursor
-		NSRect pointInWindowRect = NSMakeRect(conf_pos.x, conf_pos.y, 0, 0);
-		conf_pos = [[wd.window_view window] convertRectToScreen:pointInWindowRect].origin;
-		conf_pos.y = CGDisplayBounds(CGMainDisplayID()).size.height - conf_pos.y;
-		CGWarpMouseCursorPosition(conf_pos);
-
-		// Save warp data
-		DS_OSX->last_warp = [[NSProcessInfo processInfo] systemUptime];
-		DisplayServerOSX::WarpEvent ev;
-		ev.timestamp = DS_OSX->last_warp;
-		ev.delta = delta;
-		DS_OSX->warp_events.push_back(ev);
-	}
-
-	Ref<InputEventMouseMotion> mm;
-	mm.instantiate();
-
-	mm->set_window_id(window_id);
-	mm->set_button_mask(DS_OSX->last_button_state);
-	const Vector2i pos = _get_mouse_pos(wd, mpos);
-	mm->set_position(pos);
-	mm->set_pressure([event pressure]);
-	if ([event subtype] == NSEventSubtypeTabletPoint) {
-		const NSPoint p = [event tilt];
-		mm->set_tilt(Vector2(p.x, p.y));
+		if (value->callback != Callable()) {
+			Variant tag = value->meta;
+			Variant *tagp = &tag;
+			Variant ret;
+			Callable::CallError ce;
+			value->callback.call((const Variant **)&tagp, 1, ret, ce);
+		}
 	}
-	mm->set_global_position(pos);
-	mm->set_velocity(Input::get_singleton()->get_last_mouse_velocity());
-	const Vector2i relativeMotion = Vector2i(delta.x, delta.y) * DS_OSX->screen_get_max_scale();
-	mm->set_relative(relativeMotion);
-	_get_key_modifier_state([event modifierFlags], mm);
-
-	Input::get_singleton()->parse_input_event(mm);
-}
-
-- (void)rightMouseDown:(NSEvent *)event {
-	_mouseDownEvent(window_id, event, MouseButton::RIGHT, MouseButton::MASK_RIGHT, true);
-}
-
-- (void)rightMouseDragged:(NSEvent *)event {
-	[self mouseMoved:event];
-}
-
-- (void)rightMouseUp:(NSEvent *)event {
-	_mouseDownEvent(window_id, event, MouseButton::RIGHT, MouseButton::MASK_RIGHT, false);
 }
 
-- (void)otherMouseDown:(NSEvent *)event {
-	if ((int)[event buttonNumber] == 2) {
-		_mouseDownEvent(window_id, event, MouseButton::MIDDLE, MouseButton::MASK_MIDDLE, true);
-	} else if ((int)[event buttonNumber] == 3) {
-		_mouseDownEvent(window_id, event, MouseButton::MB_XBUTTON1, MouseButton::MASK_XBUTTON1, true);
-	} else if ((int)[event buttonNumber] == 4) {
-		_mouseDownEvent(window_id, event, MouseButton::MB_XBUTTON2, MouseButton::MASK_XBUTTON2, true);
-	} else {
-		return;
-	}
+bool DisplayServerOSX::has_window(WindowID p_window) const {
+	return windows.has(p_window);
 }
 
-- (void)otherMouseDragged:(NSEvent *)event {
-	[self mouseMoved:event];
+DisplayServerOSX::WindowData &DisplayServerOSX::get_window(WindowID p_window) {
+	return windows[p_window];
 }
 
-- (void)otherMouseUp:(NSEvent *)event {
-	if ((int)[event buttonNumber] == 2) {
-		_mouseDownEvent(window_id, event, MouseButton::MIDDLE, MouseButton::MASK_MIDDLE, false);
-	} else if ((int)[event buttonNumber] == 3) {
-		_mouseDownEvent(window_id, event, MouseButton::MB_XBUTTON1, MouseButton::MASK_XBUTTON1, false);
-	} else if ((int)[event buttonNumber] == 4) {
-		_mouseDownEvent(window_id, event, MouseButton::MB_XBUTTON2, MouseButton::MASK_XBUTTON2, false);
-	} else {
-		return;
-	}
-}
+void DisplayServerOSX::send_event(NSEvent *p_event) {
+	// Special case handling of command-period, which is traditionally a special
+	// shortcut in macOS and doesn't arrive at our regular keyDown handler.
+	if ([p_event type] == NSEventTypeKeyDown) {
+		if (([p_event modifierFlags] & NSEventModifierFlagCommand) && [p_event keyCode] == 0x2f) {
+			Ref<InputEventKey> k;
+			k.instantiate();
 
-- (void)mouseExited:(NSEvent *)event {
-	ERR_FAIL_COND(!DS_OSX->windows.has(window_id));
-	DisplayServerOSX::WindowData &wd = DS_OSX->windows[window_id];
+			get_key_modifier_state([p_event modifierFlags], k);
+			k->set_window_id(DisplayServerOSX::INVALID_WINDOW_ID);
+			k->set_pressed(true);
+			k->set_keycode(Key::PERIOD);
+			k->set_physical_keycode(Key::PERIOD);
+			k->set_echo([p_event isARepeat]);
 
-	if (DS_OSX->mouse_mode != DisplayServer::MOUSE_MODE_CAPTURED) {
-		DS_OSX->_send_window_event(wd, DisplayServerOSX::WINDOW_EVENT_MOUSE_EXIT);
+			Input::get_singleton()->parse_input_event(k);
+		}
 	}
 }
 
-- (void)mouseEntered:(NSEvent *)event {
-	ERR_FAIL_COND(!DS_OSX->windows.has(window_id));
-	DisplayServerOSX::WindowData &wd = DS_OSX->windows[window_id];
+void DisplayServerOSX::send_window_event(const WindowData &wd, WindowEvent p_event) {
+	_THREAD_SAFE_METHOD_
 
-	if (DS_OSX->mouse_mode != DisplayServer::MOUSE_MODE_CAPTURED) {
-		DS_OSX->_send_window_event(wd, DisplayServerOSX::WINDOW_EVENT_MOUSE_ENTER);
+	if (!wd.event_callback.is_null()) {
+		Variant event = int(p_event);
+		Variant *eventp = &event;
+		Variant ret;
+		Callable::CallError ce;
+		wd.event_callback.call((const Variant **)&eventp, 1, ret, ce);
 	}
-
-	DisplayServer::CursorShape p_shape = DS_OSX->cursor_shape;
-	DS_OSX->cursor_shape = DisplayServer::CURSOR_MAX;
-	DS_OSX->cursor_set_shape(p_shape);
-}
-
-- (void)magnifyWithEvent:(NSEvent *)event {
-	ERR_FAIL_COND(!DS_OSX->windows.has(window_id));
-	DisplayServerOSX::WindowData &wd = DS_OSX->windows[window_id];
-
-	Ref<InputEventMagnifyGesture> ev;
-	ev.instantiate();
-	ev->set_window_id(window_id);
-	_get_key_modifier_state([event modifierFlags], ev);
-	ev->set_position(_get_mouse_pos(wd, [event locationInWindow]));
-	ev->set_factor([event magnification] + 1.0);
-
-	Input::get_singleton()->parse_input_event(ev);
 }
 
-- (void)viewDidChangeBackingProperties {
-	// nothing left to do here
-}
-
-- (void)updateTrackingAreas {
-	if (trackingArea != nil) {
-		[self removeTrackingArea:trackingArea];
-		[trackingArea release];
-	}
-
-	NSTrackingAreaOptions options = NSTrackingMouseEnteredAndExited | NSTrackingActiveInKeyWindow | NSTrackingCursorUpdate | NSTrackingInVisibleRect;
-	trackingArea = [[NSTrackingArea alloc] initWithRect:[self bounds] options:options owner:self userInfo:nil];
-
-	[self addTrackingArea:trackingArea];
-	[super updateTrackingAreas];
-}
-
-static bool isNumpadKey(unsigned int key) {
-	static const unsigned int table[] = {
-		0x41, /* kVK_ANSI_KeypadDecimal */
-		0x43, /* kVK_ANSI_KeypadMultiply */
-		0x45, /* kVK_ANSI_KeypadPlus */
-		0x47, /* kVK_ANSI_KeypadClear */
-		0x4b, /* kVK_ANSI_KeypadDivide */
-		0x4c, /* kVK_ANSI_KeypadEnter */
-		0x4e, /* kVK_ANSI_KeypadMinus */
-		0x51, /* kVK_ANSI_KeypadEquals */
-		0x52, /* kVK_ANSI_Keypad0 */
-		0x53, /* kVK_ANSI_Keypad1 */
-		0x54, /* kVK_ANSI_Keypad2 */
-		0x55, /* kVK_ANSI_Keypad3 */
-		0x56, /* kVK_ANSI_Keypad4 */
-		0x57, /* kVK_ANSI_Keypad5 */
-		0x58, /* kVK_ANSI_Keypad6 */
-		0x59, /* kVK_ANSI_Keypad7 */
-		0x5b, /* kVK_ANSI_Keypad8 */
-		0x5c, /* kVK_ANSI_Keypad9 */
-		0x5f, /* kVK_JIS_KeypadComma */
-		0x00
-	};
-	for (int i = 0; table[i] != 0; i++) {
-		if (key == table[i]) {
-			return true;
-		}
+void DisplayServerOSX::release_pressed_events() {
+	_THREAD_SAFE_METHOD_
+	if (Input::get_singleton()) {
+		Input::get_singleton()->release_pressed_events();
 	}
-	return false;
 }
 
-// Keyboard symbol translation table
-static const Key _osx_to_godot_table[128] = {
-	/* 00 */ Key::A,
-	/* 01 */ Key::S,
-	/* 02 */ Key::D,
-	/* 03 */ Key::F,
-	/* 04 */ Key::H,
-	/* 05 */ Key::G,
-	/* 06 */ Key::Z,
-	/* 07 */ Key::X,
-	/* 08 */ Key::C,
-	/* 09 */ Key::V,
-	/* 0a */ Key::SECTION, /* ISO Section */
-	/* 0b */ Key::B,
-	/* 0c */ Key::Q,
-	/* 0d */ Key::W,
-	/* 0e */ Key::E,
-	/* 0f */ Key::R,
-	/* 10 */ Key::Y,
-	/* 11 */ Key::T,
-	/* 12 */ Key::KEY_1,
-	/* 13 */ Key::KEY_2,
-	/* 14 */ Key::KEY_3,
-	/* 15 */ Key::KEY_4,
-	/* 16 */ Key::KEY_6,
-	/* 17 */ Key::KEY_5,
-	/* 18 */ Key::EQUAL,
-	/* 19 */ Key::KEY_9,
-	/* 1a */ Key::KEY_7,
-	/* 1b */ Key::MINUS,
-	/* 1c */ Key::KEY_8,
-	/* 1d */ Key::KEY_0,
-	/* 1e */ Key::BRACERIGHT,
-	/* 1f */ Key::O,
-	/* 20 */ Key::U,
-	/* 21 */ Key::BRACELEFT,
-	/* 22 */ Key::I,
-	/* 23 */ Key::P,
-	/* 24 */ Key::ENTER,
-	/* 25 */ Key::L,
-	/* 26 */ Key::J,
-	/* 27 */ Key::APOSTROPHE,
-	/* 28 */ Key::K,
-	/* 29 */ Key::SEMICOLON,
-	/* 2a */ Key::BACKSLASH,
-	/* 2b */ Key::COMMA,
-	/* 2c */ Key::SLASH,
-	/* 2d */ Key::N,
-	/* 2e */ Key::M,
-	/* 2f */ Key::PERIOD,
-	/* 30 */ Key::TAB,
-	/* 31 */ Key::SPACE,
-	/* 32 */ Key::QUOTELEFT,
-	/* 33 */ Key::BACKSPACE,
-	/* 34 */ Key::UNKNOWN,
-	/* 35 */ Key::ESCAPE,
-	/* 36 */ Key::META,
-	/* 37 */ Key::META,
-	/* 38 */ Key::SHIFT,
-	/* 39 */ Key::CAPSLOCK,
-	/* 3a */ Key::ALT,
-	/* 3b */ Key::CTRL,
-	/* 3c */ Key::SHIFT,
-	/* 3d */ Key::ALT,
-	/* 3e */ Key::CTRL,
-	/* 3f */ Key::UNKNOWN, /* Function */
-	/* 40 */ Key::UNKNOWN, /* F17 */
-	/* 41 */ Key::KP_PERIOD,
-	/* 42 */ Key::UNKNOWN,
-	/* 43 */ Key::KP_MULTIPLY,
-	/* 44 */ Key::UNKNOWN,
-	/* 45 */ Key::KP_ADD,
-	/* 46 */ Key::UNKNOWN,
-	/* 47 */ Key::NUMLOCK, /* Really KeypadClear... */
-	/* 48 */ Key::VOLUMEUP, /* VolumeUp */
-	/* 49 */ Key::VOLUMEDOWN, /* VolumeDown */
-	/* 4a */ Key::VOLUMEMUTE, /* Mute */
-	/* 4b */ Key::KP_DIVIDE,
-	/* 4c */ Key::KP_ENTER,
-	/* 4d */ Key::UNKNOWN,
-	/* 4e */ Key::KP_SUBTRACT,
-	/* 4f */ Key::UNKNOWN, /* F18 */
-	/* 50 */ Key::UNKNOWN, /* F19 */
-	/* 51 */ Key::EQUAL, /* KeypadEqual */
-	/* 52 */ Key::KP_0,
-	/* 53 */ Key::KP_1,
-	/* 54 */ Key::KP_2,
-	/* 55 */ Key::KP_3,
-	/* 56 */ Key::KP_4,
-	/* 57 */ Key::KP_5,
-	/* 58 */ Key::KP_6,
-	/* 59 */ Key::KP_7,
-	/* 5a */ Key::UNKNOWN, /* F20 */
-	/* 5b */ Key::KP_8,
-	/* 5c */ Key::KP_9,
-	/* 5d */ Key::YEN, /* JIS Yen */
-	/* 5e */ Key::UNDERSCORE, /* JIS Underscore */
-	/* 5f */ Key::COMMA, /* JIS KeypadComma */
-	/* 60 */ Key::F5,
-	/* 61 */ Key::F6,
-	/* 62 */ Key::F7,
-	/* 63 */ Key::F3,
-	/* 64 */ Key::F8,
-	/* 65 */ Key::F9,
-	/* 66 */ Key::UNKNOWN, /* JIS Eisu */
-	/* 67 */ Key::F11,
-	/* 68 */ Key::UNKNOWN, /* JIS Kana */
-	/* 69 */ Key::F13,
-	/* 6a */ Key::F16,
-	/* 6b */ Key::F14,
-	/* 6c */ Key::UNKNOWN,
-	/* 6d */ Key::F10,
-	/* 6e */ Key::MENU,
-	/* 6f */ Key::F12,
-	/* 70 */ Key::UNKNOWN,
-	/* 71 */ Key::F15,
-	/* 72 */ Key::INSERT, /* Really Help... */
-	/* 73 */ Key::HOME,
-	/* 74 */ Key::PAGEUP,
-	/* 75 */ Key::KEY_DELETE,
-	/* 76 */ Key::F4,
-	/* 77 */ Key::END,
-	/* 78 */ Key::F2,
-	/* 79 */ Key::PAGEDOWN,
-	/* 7a */ Key::F1,
-	/* 7b */ Key::LEFT,
-	/* 7c */ Key::RIGHT,
-	/* 7d */ Key::DOWN,
-	/* 7e */ Key::UP,
-	/* 7f */ Key::UNKNOWN,
-};
-
-// Translates a OS X keycode to a Godot keycode
-static Key translateKey(unsigned int key) {
-	if (key >= 128) {
-		return Key::UNKNOWN;
-	}
-
-	return _osx_to_godot_table[key];
-}
-
-// Translates a Godot keycode back to a OSX keycode
-static unsigned int unmapKey(Key key) {
-	for (int i = 0; i <= 126; i++) {
-		if (_osx_to_godot_table[i] == key) {
-			return i;
-		}
-	}
-	return 127;
-}
-
-struct _KeyCodeMap {
-	UniChar kchar;
-	Key kcode;
-};
-
-static const _KeyCodeMap _keycodes[55] = {
-	{ '`', Key::QUOTELEFT },
-	{ '~', Key::ASCIITILDE },
-	{ '0', Key::KEY_0 },
-	{ '1', Key::KEY_1 },
-	{ '2', Key::KEY_2 },
-	{ '3', Key::KEY_3 },
-	{ '4', Key::KEY_4 },
-	{ '5', Key::KEY_5 },
-	{ '6', Key::KEY_6 },
-	{ '7', Key::KEY_7 },
-	{ '8', Key::KEY_8 },
-	{ '9', Key::KEY_9 },
-	{ '-', Key::MINUS },
-	{ '_', Key::UNDERSCORE },
-	{ '=', Key::EQUAL },
-	{ '+', Key::PLUS },
-	{ 'q', Key::Q },
-	{ 'w', Key::W },
-	{ 'e', Key::E },
-	{ 'r', Key::R },
-	{ 't', Key::T },
-	{ 'y', Key::Y },
-	{ 'u', Key::U },
-	{ 'i', Key::I },
-	{ 'o', Key::O },
-	{ 'p', Key::P },
-	{ '[', Key::BRACELEFT },
-	{ ']', Key::BRACERIGHT },
-	{ '{', Key::BRACELEFT },
-	{ '}', Key::BRACERIGHT },
-	{ 'a', Key::A },
-	{ 's', Key::S },
-	{ 'd', Key::D },
-	{ 'f', Key::F },
-	{ 'g', Key::G },
-	{ 'h', Key::H },
-	{ 'j', Key::J },
-	{ 'k', Key::K },
-	{ 'l', Key::L },
-	{ ';', Key::SEMICOLON },
-	{ ':', Key::COLON },
-	{ '\'', Key::APOSTROPHE },
-	{ '\"', Key::QUOTEDBL },
-	{ '\\', Key::BACKSLASH },
-	{ '#', Key::NUMBERSIGN },
-	{ 'z', Key::Z },
-	{ 'x', Key::X },
-	{ 'c', Key::C },
-	{ 'v', Key::V },
-	{ 'b', Key::B },
-	{ 'n', Key::N },
-	{ 'm', Key::M },
-	{ ',', Key::COMMA },
-	{ '.', Key::PERIOD },
-	{ '/', Key::SLASH }
-};
-
-static Key remapKey(unsigned int key, unsigned int state) {
-	if (isNumpadKey(key)) {
-		return translateKey(key);
-	}
-
-	TISInputSourceRef currentKeyboard = TISCopyCurrentKeyboardInputSource();
-	if (!currentKeyboard) {
-		return translateKey(key);
-	}
-
-	CFDataRef layoutData = (CFDataRef)TISGetInputSourceProperty(currentKeyboard, kTISPropertyUnicodeKeyLayoutData);
-	if (!layoutData) {
-		return translateKey(key);
-	}
-
-	const UCKeyboardLayout *keyboardLayout = (const UCKeyboardLayout *)CFDataGetBytePtr(layoutData);
-
-	UInt32 keysDown = 0;
-	UniChar chars[4];
-	UniCharCount realLength;
-
-	OSStatus err = UCKeyTranslate(keyboardLayout,
-			key,
-			kUCKeyActionDisplay,
-			(state >> 8) & 0xFF,
-			LMGetKbdType(),
-			kUCKeyTranslateNoDeadKeysBit,
-			&keysDown,
-			sizeof(chars) / sizeof(chars[0]),
-			&realLength,
-			chars);
-
-	if (err != noErr) {
-		return translateKey(key);
-	}
-
-	for (unsigned int i = 0; i < 55; i++) {
-		if (_keycodes[i].kchar == chars[0]) {
-			return _keycodes[i].kcode;
-		}
-	}
-	return translateKey(key);
-}
-
-- (void)keyDown:(NSEvent *)event {
-	ERR_FAIL_COND(!DS_OSX->windows.has(window_id));
-	DisplayServerOSX::WindowData &wd = DS_OSX->windows[window_id];
-
-	ignore_momentum_scroll = true;
-
-	// Ignore all input if IME input is in progress
-	if (!imeInputEventInProgress) {
-		NSString *characters = [event characters];
-		NSUInteger length = [characters length];
-
-		if (!wd.im_active && length > 0 && keycode_has_unicode(remapKey([event keyCode], [event modifierFlags]))) {
-			// Fallback unicode character handler used if IME is not active
-			Char16String text;
-			text.resize([characters length] + 1);
-			[characters getCharacters:(unichar *)text.ptrw() range:NSMakeRange(0, [characters length])];
-
-			String u32text;
-			u32text.parse_utf16(text.ptr(), text.length());
-
-			for (int i = 0; i < u32text.length(); i++) {
-				const char32_t codepoint = u32text[i];
-
-				DisplayServerOSX::KeyEvent ke;
-
-				ke.window_id = window_id;
-				ke.osx_state = [event modifierFlags];
-				ke.pressed = true;
-				ke.echo = [event isARepeat];
-				ke.keycode = remapKey([event keyCode], [event modifierFlags]);
-				ke.physical_keycode = translateKey([event keyCode]);
-				ke.raw = true;
-				ke.unicode = codepoint;
-
-				_push_to_key_event_buffer(ke);
-			}
-		} else {
-			DisplayServerOSX::KeyEvent ke;
-
-			ke.window_id = window_id;
-			ke.osx_state = [event modifierFlags];
-			ke.pressed = true;
-			ke.echo = [event isARepeat];
-			ke.keycode = remapKey([event keyCode], [event modifierFlags]);
-			ke.physical_keycode = translateKey([event keyCode]);
-			ke.raw = false;
-			ke.unicode = 0;
-
-			_push_to_key_event_buffer(ke);
-		}
-	}
-
-	// Pass events to IME handler
-	if (wd.im_active) {
-		[self interpretKeyEvents:[NSArray arrayWithObject:event]];
-	}
+void DisplayServerOSX::get_key_modifier_state(unsigned int p_osx_state, Ref<InputEventWithModifiers> r_state) const {
+	r_state->set_shift_pressed((p_osx_state & NSEventModifierFlagShift));
+	r_state->set_ctrl_pressed((p_osx_state & NSEventModifierFlagControl));
+	r_state->set_alt_pressed((p_osx_state & NSEventModifierFlagOption));
+	r_state->set_meta_pressed((p_osx_state & NSEventModifierFlagCommand));
 }
 
-- (void)flagsChanged:(NSEvent *)event {
-	ignore_momentum_scroll = true;
-
-	// Ignore all input if IME input is in progress
-	if (!imeInputEventInProgress) {
-		DisplayServerOSX::KeyEvent ke;
-
-		ke.window_id = window_id;
-		ke.echo = false;
-		ke.raw = true;
-
-		int key = [event keyCode];
-		int mod = [event modifierFlags];
-
-		if (key == 0x36 || key == 0x37) {
-			if (mod & NSEventModifierFlagCommand) {
-				mod &= ~NSEventModifierFlagCommand;
-				ke.pressed = true;
-			} else {
-				ke.pressed = false;
-			}
-		} else if (key == 0x38 || key == 0x3c) {
-			if (mod & NSEventModifierFlagShift) {
-				mod &= ~NSEventModifierFlagShift;
-				ke.pressed = true;
-			} else {
-				ke.pressed = false;
-			}
-		} else if (key == 0x3a || key == 0x3d) {
-			if (mod & NSEventModifierFlagOption) {
-				mod &= ~NSEventModifierFlagOption;
-				ke.pressed = true;
-			} else {
-				ke.pressed = false;
-			}
-		} else if (key == 0x3b || key == 0x3e) {
-			if (mod & NSEventModifierFlagControl) {
-				mod &= ~NSEventModifierFlagControl;
-				ke.pressed = true;
-			} else {
-				ke.pressed = false;
-			}
-		} else {
-			return;
-		}
-
-		ke.osx_state = mod;
-		ke.keycode = remapKey(key, mod);
-		ke.physical_keycode = translateKey(key);
-		ke.unicode = 0;
-
-		_push_to_key_event_buffer(ke);
-	}
+void DisplayServerOSX::update_mouse_pos(DisplayServerOSX::WindowData &p_wd, NSPoint p_location_in_window) {
+	const NSRect content_rect = [p_wd.window_view frame];
+	const float scale = screen_get_max_scale();
+	p_wd.mouse_pos.x = p_location_in_window.x * scale;
+	p_wd.mouse_pos.y = (content_rect.size.height - p_location_in_window.y) * scale;
+	Input::get_singleton()->set_mouse_position(p_wd.mouse_pos);
 }
 
-- (void)keyUp:(NSEvent *)event {
-	ERR_FAIL_COND(!DS_OSX->windows.has(window_id));
-	DisplayServerOSX::WindowData &wd = DS_OSX->windows[window_id];
-
-	// Ignore all input if IME input is in progress
-	if (!imeInputEventInProgress) {
-		NSString *characters = [event characters];
-		NSUInteger length = [characters length];
-
-		// Fallback unicode character handler used if IME is not active
-		if (!wd.im_active && length > 0 && keycode_has_unicode(remapKey([event keyCode], [event modifierFlags]))) {
-			Char16String text;
-			text.resize([characters length] + 1);
-			[characters getCharacters:(unichar *)text.ptrw() range:NSMakeRange(0, [characters length])];
-
-			String u32text;
-			u32text.parse_utf16(text.ptr(), text.length());
-
-			for (int i = 0; i < u32text.length(); i++) {
-				const char32_t codepoint = u32text[i];
-				DisplayServerOSX::KeyEvent ke;
-
-				ke.window_id = window_id;
-				ke.osx_state = [event modifierFlags];
-				ke.pressed = false;
-				ke.echo = [event isARepeat];
-				ke.keycode = remapKey([event keyCode], [event modifierFlags]);
-				ke.physical_keycode = translateKey([event keyCode]);
-				ke.raw = true;
-				ke.unicode = codepoint;
-
-				_push_to_key_event_buffer(ke);
-			}
-		} else {
-			DisplayServerOSX::KeyEvent ke;
-
-			ke.window_id = window_id;
-			ke.osx_state = [event modifierFlags];
-			ke.pressed = false;
-			ke.echo = [event isARepeat];
-			ke.keycode = remapKey([event keyCode], [event modifierFlags]);
-			ke.physical_keycode = translateKey([event keyCode]);
-			ke.raw = true;
-			ke.unicode = 0;
-
-			_push_to_key_event_buffer(ke);
-		}
+void DisplayServerOSX::push_to_key_event_buffer(const DisplayServerOSX::KeyEvent &p_event) {
+	if (key_event_pos >= key_event_buffer.size()) {
+		key_event_buffer.resize(1 + key_event_pos);
 	}
+	key_event_buffer.write[key_event_pos++] = p_event;
 }
 
-inline void sendScrollEvent(DisplayServer::WindowID window_id, MouseButton button, double factor, int modifierFlags) {
-	ERR_FAIL_COND(!DS_OSX->windows.has(window_id));
-	DisplayServerOSX::WindowData &wd = DS_OSX->windows[window_id];
-
-	MouseButton mask = mouse_button_to_mask(button);
-
-	Ref<InputEventMouseButton> sc;
-	sc.instantiate();
-
-	sc->set_window_id(window_id);
-	_get_key_modifier_state(modifierFlags, sc);
-	sc->set_button_index(button);
-	sc->set_factor(factor);
-	sc->set_pressed(true);
-	sc->set_position(wd.mouse_pos);
-	sc->set_global_position(wd.mouse_pos);
-	DS_OSX->last_button_state |= (MouseButton)mask;
-	sc->set_button_mask(DS_OSX->last_button_state);
+void DisplayServerOSX::update_im_text(const Point2i &p_selection, const String &p_text) {
+	im_selection = p_selection;
+	im_text = p_text;
 
-	Input::get_singleton()->parse_input_event(sc);
-
-	sc.instantiate();
-	sc->set_window_id(window_id);
-	sc->set_button_index(button);
-	sc->set_factor(factor);
-	sc->set_pressed(false);
-	sc->set_position(wd.mouse_pos);
-	sc->set_global_position(wd.mouse_pos);
-	DS_OSX->last_button_state &= (MouseButton)~mask;
-	sc->set_button_mask(DS_OSX->last_button_state);
-
-	Input::get_singleton()->parse_input_event(sc);
+	OS::get_singleton()->get_main_loop()->notification(MainLoop::NOTIFICATION_OS_IME_UPDATE);
 }
 
-inline void sendPanEvent(DisplayServer::WindowID window_id, double dx, double dy, int modifierFlags) {
-	ERR_FAIL_COND(!DS_OSX->windows.has(window_id));
-	DisplayServerOSX::WindowData &wd = DS_OSX->windows[window_id];
-
-	Ref<InputEventPanGesture> pg;
-	pg.instantiate();
-
-	pg->set_window_id(window_id);
-	_get_key_modifier_state(modifierFlags, pg);
-	pg->set_position(wd.mouse_pos);
-	pg->set_delta(Vector2(-dx, -dy));
-
-	Input::get_singleton()->parse_input_event(pg);
+void DisplayServerOSX::set_last_focused_window(WindowID p_window) {
+	last_focused_window = p_window;
 }
 
-- (void)scrollWheel:(NSEvent *)event {
-	ERR_FAIL_COND(!DS_OSX->windows.has(window_id));
-	DisplayServerOSX::WindowData &wd = DS_OSX->windows[window_id];
-
-	double deltaX, deltaY;
-
-	_ALLOW_DISCARD_ _get_mouse_pos(wd, [event locationInWindow]);
-
-	deltaX = [event scrollingDeltaX];
-	deltaY = [event scrollingDeltaY];
-
-	if ([event hasPreciseScrollingDeltas]) {
-		deltaX *= 0.03;
-		deltaY *= 0.03;
+void DisplayServerOSX::window_update(WindowID p_window) {
+#if defined(GLES3_ENABLED)
+	if (gl_manager) {
+		gl_manager->window_update(p_window);
 	}
+#endif
+}
 
-	if ([event momentumPhase] != NSEventPhaseNone) {
-		if (ignore_momentum_scroll) {
-			return;
-		}
-	} else {
-		ignore_momentum_scroll = false;
+void DisplayServerOSX::window_destroy(WindowID p_window) {
+#if defined(GLES3_ENABLED)
+	if (gl_manager) {
+		gl_manager->window_destroy(p_window);
 	}
-
-	if ([event phase] != NSEventPhaseNone || [event momentumPhase] != NSEventPhaseNone) {
-		sendPanEvent(window_id, deltaX, deltaY, [event modifierFlags]);
-	} else {
-		if (fabs(deltaX)) {
-			sendScrollEvent(window_id, 0 > deltaX ? MouseButton::WHEEL_RIGHT : MouseButton::WHEEL_LEFT, fabs(deltaX * 0.3), [event modifierFlags]);
-		}
-		if (fabs(deltaY)) {
-			sendScrollEvent(window_id, 0 < deltaY ? MouseButton::WHEEL_UP : MouseButton::WHEEL_DOWN, fabs(deltaY * 0.3), [event modifierFlags]);
-		}
+#endif
+#ifdef VULKAN_ENABLED
+	if (context_vulkan) {
+		context_vulkan->window_destroy(p_window);
 	}
+#endif
+	windows.erase(p_window);
 }
 
-@end
-
-/*************************************************************************/
-/* GodotWindow                                                           */
-/*************************************************************************/
-
-@interface GodotWindow : NSWindow {
-}
-
-@end
-
-@implementation GodotWindow
-
-- (BOOL)canBecomeKeyWindow {
-	// Required for NSBorderlessWindowMask windows
-	for (Map<DisplayServer::WindowID, DisplayServerOSX::WindowData>::Element *E = DS_OSX->windows.front(); E; E = E->next()) {
-		if (E->get().window_object == self) {
-			if (E->get().no_focus) {
-				return NO;
-			}
-		}
+void DisplayServerOSX::window_resize(WindowID p_window, int p_width, int p_height) {
+#if defined(GLES3_ENABLED)
+	if (gl_manager) {
+		gl_manager->window_resize(p_window, p_width, p_height);
 	}
-	return YES;
-}
-
-- (BOOL)canBecomeMainWindow {
-	// Required for NSBorderlessWindowMask windows
-	for (Map<DisplayServer::WindowID, DisplayServerOSX::WindowData>::Element *E = DS_OSX->windows.front(); E; E = E->next()) {
-		if (E->get().window_object == self) {
-			if (E->get().no_focus) {
-				return NO;
-			}
-		}
+#endif
+#if defined(VULKAN_ENABLED)
+	if (context_vulkan) {
+		context_vulkan->window_resize(p_window, p_width, p_height);
 	}
-	return YES;
+#endif
 }
 
-@end
-
-/*************************************************************************/
-/* DisplayServerOSX                                                      */
-/*************************************************************************/
-
 bool DisplayServerOSX::has_feature(Feature p_feature) const {
 	switch (p_feature) {
 		case FEATURE_GLOBAL_MENU:
@@ -1494,57 +647,13 @@ String DisplayServerOSX::get_name() const {
 	return "OSX";
 }
 
-const NSMenu *DisplayServerOSX::_get_menu_root(const String &p_menu_root) const {
-	const NSMenu *menu = nullptr;
-	if (p_menu_root == "") {
-		// Main menu.x
-		menu = [NSApp mainMenu];
-	} else if (p_menu_root.to_lower() == "_dock") {
-		// macOS dock menu.
-		menu = dock_menu;
-	} else {
-		// Submenu.
-		if (submenu.has(p_menu_root)) {
-			menu = submenu[p_menu_root];
-		}
-	}
-	if (menu == apple_menu) {
-		// Do not allow to change Apple menu.
-		return nullptr;
-	}
-	return menu;
-}
-
-NSMenu *DisplayServerOSX::_get_menu_root(const String &p_menu_root) {
-	NSMenu *menu = nullptr;
-	if (p_menu_root == "") {
-		// Main menu.
-		menu = [NSApp mainMenu];
-	} else if (p_menu_root.to_lower() == "_dock") {
-		// macOS dock menu.
-		menu = dock_menu;
-	} else {
-		// Submenu.
-		if (!submenu.has(p_menu_root)) {
-			NSMenu *n_menu = [[NSMenu alloc] initWithTitle:[NSString stringWithUTF8String:p_menu_root.utf8().get_data()]];
-			submenu[p_menu_root] = n_menu;
-		}
-		menu = submenu[p_menu_root];
-	}
-	if (menu == apple_menu) {
-		// Do not allow to change Apple menu.
-		return nullptr;
-	}
-	return menu;
-}
-
 void DisplayServerOSX::global_menu_add_item(const String &p_menu_root, const String &p_label, const Callable &p_callback, const Variant &p_tag) {
 	_THREAD_SAFE_METHOD_
 
 	NSMenu *menu = _get_menu_root(p_menu_root);
 	if (menu) {
 		NSMenuItem *menu_item = [menu addItemWithTitle:[NSString stringWithUTF8String:p_label.utf8().get_data()] action:@selector(globalMenuCallback:) keyEquivalent:@""];
-		GlobalMenuItem *obj = [[[GlobalMenuItem alloc] init] autorelease];
+		GodotMenuItem *obj = [[GodotMenuItem alloc] init];
 		obj->callback = p_callback;
 		obj->meta = p_tag;
 		obj->checkable = false;
@@ -1558,7 +667,7 @@ void DisplayServerOSX::global_menu_add_check_item(const String &p_menu_root, con
 	NSMenu *menu = _get_menu_root(p_menu_root);
 	if (menu) {
 		NSMenuItem *menu_item = [menu addItemWithTitle:[NSString stringWithUTF8String:p_label.utf8().get_data()] action:@selector(globalMenuCallback:) keyEquivalent:@""];
-		GlobalMenuItem *obj = [[[GlobalMenuItem alloc] init] autorelease];
+		GodotMenuItem *obj = [[GodotMenuItem alloc] init];
 		obj->callback = p_callback;
 		obj->meta = p_tag;
 		obj->checkable = true;
@@ -1614,7 +723,7 @@ bool DisplayServerOSX::global_menu_is_item_checkable(const String &p_menu_root,
 	if (menu) {
 		const NSMenuItem *menu_item = [menu itemAtIndex:p_idx];
 		if (menu_item) {
-			GlobalMenuItem *obj = [menu_item representedObject];
+			GodotMenuItem *obj = [menu_item representedObject];
 			if (obj) {
 				return obj->checkable;
 			}
@@ -1630,7 +739,7 @@ Callable DisplayServerOSX::global_menu_get_item_callback(const String &p_menu_ro
 	if (menu) {
 		const NSMenuItem *menu_item = [menu itemAtIndex:p_idx];
 		if (menu_item) {
-			GlobalMenuItem *obj = [menu_item representedObject];
+			GodotMenuItem *obj = [menu_item representedObject];
 			if (obj) {
 				return obj->callback;
 			}
@@ -1646,7 +755,7 @@ Variant DisplayServerOSX::global_menu_get_item_tag(const String &p_menu_root, in
 	if (menu) {
 		const NSMenuItem *menu_item = [menu itemAtIndex:p_idx];
 		if (menu_item) {
-			GlobalMenuItem *obj = [menu_item representedObject];
+			GodotMenuItem *obj = [menu_item representedObject];
 			if (obj) {
 				return obj->meta;
 			}
@@ -1662,10 +771,8 @@ String DisplayServerOSX::global_menu_get_item_text(const String &p_menu_root, in
 	if (menu) {
 		const NSMenuItem *menu_item = [menu itemAtIndex:p_idx];
 		if (menu_item) {
-			char *utfs = strdup([[menu_item title] UTF8String]);
 			String ret;
-			ret.parse_utf8(utfs);
-			free(utfs);
+			ret.parse_utf8([[menu_item title] UTF8String]);
 			return ret;
 		}
 	}
@@ -1720,7 +827,7 @@ void DisplayServerOSX::global_menu_set_item_checkable(const String &p_menu_root,
 		}
 		NSMenuItem *menu_item = [menu itemAtIndex:p_idx];
 		if (menu_item) {
-			GlobalMenuItem *obj = [menu_item representedObject];
+			GodotMenuItem *obj = [menu_item representedObject];
 			obj->checkable = p_checkable;
 		}
 	}
@@ -1736,7 +843,7 @@ void DisplayServerOSX::global_menu_set_item_callback(const String &p_menu_root,
 		}
 		NSMenuItem *menu_item = [menu itemAtIndex:p_idx];
 		if (menu_item) {
-			GlobalMenuItem *obj = [menu_item representedObject];
+			GodotMenuItem *obj = [menu_item representedObject];
 			obj->callback = p_callback;
 		}
 	}
@@ -1752,7 +859,7 @@ void DisplayServerOSX::global_menu_set_item_tag(const String &p_menu_root, int p
 		}
 		NSMenuItem *menu_item = [menu itemAtIndex:p_idx];
 		if (menu_item) {
-			GlobalMenuItem *obj = [menu_item representedObject];
+			GodotMenuItem *obj = [menu_item representedObject];
 			obj->meta = p_tag;
 		}
 	}
@@ -1869,7 +976,6 @@ Error DisplayServerOSX::dialog_show(String p_title, String p_description, Vector
 		p_callback.call((const Variant **)&buttonp, 1, ret, ce);
 	}
 
-	[window release];
 	return OK;
 }
 
@@ -1891,10 +997,8 @@ Error DisplayServerOSX::dialog_input_text(String p_title, String p_description,
 
 	[window runModal];
 
-	char *utfs = strdup([[input stringValue] UTF8String]);
 	String ret;
-	ret.parse_utf8(utfs);
-	free(utfs);
+	ret.parse_utf8([[input stringValue] UTF8String]);
 
 	if (!p_callback.is_null()) {
 		Variant text = ret;
@@ -1904,7 +1008,6 @@ Error DisplayServerOSX::dialog_input_text(String p_title, String p_description,
 		p_callback.call((const Variant **)&textp, 1, ret, ce);
 	}
 
-	[window release];
 	return OK;
 }
 
@@ -1959,9 +1062,7 @@ void DisplayServerOSX::mouse_set_mode(MouseMode p_mode) {
 	mouse_mode = p_mode;
 
 	if (mouse_mode == MOUSE_MODE_VISIBLE || mouse_mode == MOUSE_MODE_CONFINED) {
-		CursorShape p_shape = cursor_shape;
-		cursor_shape = DisplayServer::CURSOR_MAX;
-		cursor_set_shape(p_shape);
+		cursor_update_shape();
 	}
 }
 
@@ -1969,25 +1070,82 @@ DisplayServer::MouseMode DisplayServerOSX::mouse_get_mode() const {
 	return mouse_mode;
 }
 
+bool DisplayServerOSX::update_mouse_wrap(WindowData &p_wd, NSPoint &r_delta, NSPoint &r_mpos, NSTimeInterval p_timestamp) {
+	_THREAD_SAFE_METHOD_
+
+	if (ignore_warp) {
+		// Discard late events, before warp.
+		if (p_timestamp < last_warp) {
+			return true;
+		}
+		ignore_warp = false;
+		return true;
+	}
+
+	if (mouse_mode == DisplayServer::MOUSE_MODE_CONFINED || mouse_mode == DisplayServer::MOUSE_MODE_CONFINED_HIDDEN) {
+		// Discard late events.
+		if (p_timestamp < last_warp) {
+			return true;
+		}
+
+		// Warp affects next event delta, subtract previous warp deltas.
+		List<WarpEvent>::Element *F = warp_events.front();
+		while (F) {
+			if (F->get().timestamp < p_timestamp) {
+				List<DisplayServerOSX::WarpEvent>::Element *E = F;
+				r_delta.x -= E->get().delta.x;
+				r_delta.y -= E->get().delta.y;
+				F = F->next();
+				warp_events.erase(E);
+			} else {
+				F = F->next();
+			}
+		}
+
+		// Confine mouse position to the window, and update delta.
+		NSRect frame = [p_wd.window_object frame];
+		NSPoint conf_pos = r_mpos;
+		conf_pos.x = CLAMP(conf_pos.x + r_delta.x, 0.f, frame.size.width);
+		conf_pos.y = CLAMP(conf_pos.y - r_delta.y, 0.f, frame.size.height);
+		r_delta.x = conf_pos.x - r_mpos.x;
+		r_delta.y = r_mpos.y - conf_pos.y;
+		r_mpos = conf_pos;
+
+		// Move mouse cursor.
+		NSRect point_in_window_rect = NSMakeRect(conf_pos.x, conf_pos.y, 0, 0);
+		conf_pos = [[p_wd.window_view window] convertRectToScreen:point_in_window_rect].origin;
+		conf_pos.y = CGDisplayBounds(CGMainDisplayID()).size.height - conf_pos.y;
+		CGWarpMouseCursorPosition(conf_pos);
+
+		// Save warp data.
+		last_warp = [[NSProcessInfo processInfo] systemUptime];
+
+		DisplayServerOSX::WarpEvent ev;
+		ev.timestamp = last_warp;
+		ev.delta = r_delta;
+		warp_events.push_back(ev);
+	}
+
+	return false;
+}
+
 void DisplayServerOSX::mouse_warp_to_position(const Point2i &p_to) {
 	_THREAD_SAFE_METHOD_
 
-	if (mouse_mode == MOUSE_MODE_CAPTURED) {
-		last_mouse_pos = p_to;
-	} else {
+	if (mouse_mode != MOUSE_MODE_CAPTURED) {
 		WindowID window_id = windows.has(last_focused_window) ? last_focused_window : MAIN_WINDOW_ID;
 		WindowData &wd = windows[window_id];
 
-		//local point in window coords
+		// Local point in window coords.
 		const NSRect contentRect = [wd.window_view frame];
 		const float scale = screen_get_max_scale();
 		NSRect pointInWindowRect = NSMakeRect(p_to.x / scale, contentRect.size.height - (p_to.y / scale - 1), 0, 0);
 		NSPoint pointOnScreen = [[wd.window_view window] convertRectToScreen:pointInWindowRect].origin;
 
-		//point in scren coords
+		// Point in scren coords.
 		CGPoint lMouseWarpPos = { pointOnScreen.x, CGDisplayBounds(CGMainDisplayID()).size.height - pointOnScreen.y };
 
-		//do the warping
+		// Do the warping.
 		CGEventSourceRef lEventRef = CGEventSourceCreate(kCGEventSourceStateCombinedSessionState);
 		CGEventSourceSetLocalEventsSuppressionInterval(lEventRef, 0.0);
 		CGAssociateMouseAndMouseCursorPosition(false);
@@ -2013,6 +1171,10 @@ Point2i DisplayServerOSX::mouse_get_position() const {
 	return Vector2i();
 }
 
+void DisplayServerOSX::mouse_set_button_state(MouseButton p_state) {
+	last_button_state = p_state;
+}
+
 MouseButton DisplayServerOSX::mouse_get_button_state() const {
 	return last_button_state;
 }
@@ -2044,11 +1206,8 @@ String DisplayServerOSX::clipboard_get() const {
 	NSArray *objectsToPaste = [pasteboard readObjectsForClasses:classArray options:options];
 	NSString *string = [objectsToPaste objectAtIndex:0];
 
-	char *utfs = strdup([string UTF8String]);
 	String ret;
-	ret.parse_utf8(utfs);
-	free(utfs);
-
+	ret.parse_utf8([string UTF8String]);
 	return ret;
 }
 
@@ -2059,48 +1218,6 @@ int DisplayServerOSX::get_screen_count() const {
 	return [screenArray count];
 }
 
-// Returns the native top-left screen coordinate of the smallest rectangle
-// that encompasses all screens. Needed in get_screen_position(),
-// window_get_position, and window_set_position()
-// to convert between OS X native screen coordinates and the ones expected by Godot
-
-static bool displays_arrangement_dirty = true;
-static void displays_arrangement_changed(CGDirectDisplayID display_id, CGDisplayChangeSummaryFlags flags, void *user_info) {
-	displays_arrangement_dirty = true;
-}
-
-Point2i DisplayServerOSX::_get_screens_origin() const {
-	static Point2i origin;
-
-	if (displays_arrangement_dirty) {
-		origin = Point2i();
-
-		for (int i = 0; i < get_screen_count(); i++) {
-			Point2i position = _get_native_screen_position(i);
-			if (position.x < origin.x) {
-				origin.x = position.x;
-			}
-			if (position.y > origin.y) {
-				origin.y = position.y;
-			}
-		}
-		displays_arrangement_dirty = false;
-	}
-
-	return origin;
-}
-
-Point2i DisplayServerOSX::_get_native_screen_position(int p_screen) const {
-	NSArray *screenArray = [NSScreen screens];
-	if ((NSUInteger)p_screen < [screenArray count]) {
-		NSRect nsrect = [[screenArray objectAtIndex:p_screen] frame];
-		// Return the top-left corner of the screen, for OS X the y starts at the bottom
-		return Point2i(nsrect.origin.x, nsrect.origin.y + nsrect.size.height) * screen_get_max_scale();
-	}
-
-	return Point2i();
-}
-
 Point2i DisplayServerOSX::screen_get_position(int p_screen) const {
 	_THREAD_SAFE_METHOD_
 
@@ -2110,7 +1227,7 @@ Point2i DisplayServerOSX::screen_get_position(int p_screen) const {
 
 	Point2i position = _get_native_screen_position(p_screen) - _get_screens_origin();
 	// OS X native y-coordinate relative to _get_screens_origin() is negative,
-	// Godot expects a positive value
+	// Godot expects a positive value.
 	position.y *= -1;
 	return position;
 }
@@ -2124,7 +1241,7 @@ Size2i DisplayServerOSX::screen_get_size(int p_screen) const {
 
 	NSArray *screenArray = [NSScreen screens];
 	if ((NSUInteger)p_screen < [screenArray count]) {
-		// Note: Use frame to get the whole screen size
+		// Note: Use frame to get the whole screen size.
 		NSRect nsrect = [[screenArray objectAtIndex:p_screen] frame];
 		return Size2i(nsrect.size.width, nsrect.size.height) * screen_get_max_scale();
 	}
@@ -2254,56 +1371,6 @@ void DisplayServerOSX::show_window(WindowID p_id) {
 	}
 }
 
-void DisplayServerOSX::_send_window_event(const WindowData &wd, WindowEvent p_event) {
-	_THREAD_SAFE_METHOD_
-
-	if (!wd.event_callback.is_null()) {
-		Variant event = int(p_event);
-		Variant *eventp = &event;
-		Variant ret;
-		Callable::CallError ce;
-		wd.event_callback.call((const Variant **)&eventp, 1, ret, ce);
-	}
-}
-
-DisplayServerOSX::WindowID DisplayServerOSX::_find_window_id(id p_window) {
-	for (Map<WindowID, WindowData>::Element *E = windows.front(); E; E = E->next()) {
-		if (E->get().window_object == p_window) {
-			return E->key();
-		}
-	}
-	return INVALID_WINDOW_ID;
-}
-
-void DisplayServerOSX::_update_window(WindowData p_wd) {
-	bool borderless_full = false;
-
-	if (p_wd.borderless) {
-		NSRect frameRect = [p_wd.window_object frame];
-		NSRect screenRect = [[p_wd.window_object screen] frame];
-
-		// Check if our window covers up the screen
-		if (frameRect.origin.x <= screenRect.origin.x && frameRect.origin.y <= frameRect.origin.y &&
-				frameRect.size.width >= screenRect.size.width && frameRect.size.height >= screenRect.size.height) {
-			borderless_full = true;
-		}
-	}
-
-	if (borderless_full) {
-		// If the window covers up the screen set the level to above the main menu and hide on deactivate
-		[p_wd.window_object setLevel:NSMainMenuWindowLevel + 1];
-		[p_wd.window_object setHidesOnDeactivate:YES];
-	} else {
-		// Reset these when our window is not a borderless window that covers up the screen
-		if (p_wd.on_top && !p_wd.fullscreen) {
-			[p_wd.window_object setLevel:NSFloatingWindowLevel];
-		} else {
-			[p_wd.window_object setLevel:NSNormalWindowLevel];
-		}
-		[p_wd.window_object setHidesOnDeactivate:NO];
-	}
-}
-
 void DisplayServerOSX::delete_sub_window(WindowID p_id) {
 	_THREAD_SAFE_METHOD_
 
@@ -2316,24 +1383,6 @@ void DisplayServerOSX::delete_sub_window(WindowID p_id) {
 	[wd.window_object close];
 }
 
-void DisplayServerOSX::window_set_title(const String &p_title, WindowID p_window) {
-	_THREAD_SAFE_METHOD_
-
-	ERR_FAIL_COND(!windows.has(p_window));
-	WindowData &wd = windows[p_window];
-
-	[wd.window_object setTitle:[NSString stringWithUTF8String:p_title.utf8().get_data()]];
-}
-
-void DisplayServerOSX::window_set_mouse_passthrough(const Vector<Vector2> &p_region, WindowID p_window) {
-	_THREAD_SAFE_METHOD_
-
-	ERR_FAIL_COND(!windows.has(p_window));
-	WindowData &wd = windows[p_window];
-
-	wd.mpath = p_region;
-}
-
 void DisplayServerOSX::window_set_rect_changed_callback(const Callable &p_callable, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
@@ -2372,6 +1421,24 @@ void DisplayServerOSX::window_set_drop_files_callback(const Callable &p_callable
 	wd.drop_files_callback = p_callable;
 }
 
+void DisplayServerOSX::window_set_title(const String &p_title, WindowID p_window) {
+	_THREAD_SAFE_METHOD_
+
+	ERR_FAIL_COND(!windows.has(p_window));
+	WindowData &wd = windows[p_window];
+
+	[wd.window_object setTitle:[NSString stringWithUTF8String:p_title.utf8().get_data()]];
+}
+
+void DisplayServerOSX::window_set_mouse_passthrough(const Vector<Vector2> &p_region, WindowID p_window) {
+	_THREAD_SAFE_METHOD_
+
+	ERR_FAIL_COND(!windows.has(p_window));
+	WindowData &wd = windows[p_window];
+
+	wd.mpath = p_region;
+}
+
 int DisplayServerOSX::window_get_current_screen(WindowID p_window) const {
 	_THREAD_SAFE_METHOD_
 	ERR_FAIL_COND_V(!windows.has(p_window), -1);
@@ -2403,39 +1470,6 @@ void DisplayServerOSX::window_set_current_screen(int p_screen, WindowID p_window
 	}
 }
 
-void DisplayServerOSX::window_set_transient(WindowID p_window, WindowID p_parent) {
-	_THREAD_SAFE_METHOD_
-	ERR_FAIL_COND(p_window == p_parent);
-
-	ERR_FAIL_COND(!windows.has(p_window));
-	WindowData &wd_window = windows[p_window];
-
-	ERR_FAIL_COND(wd_window.transient_parent == p_parent);
-
-	ERR_FAIL_COND_MSG(wd_window.on_top, "Windows with the 'on top' can't become transient.");
-	if (p_parent == INVALID_WINDOW_ID) {
-		//remove transient
-		ERR_FAIL_COND(wd_window.transient_parent == INVALID_WINDOW_ID);
-		ERR_FAIL_COND(!windows.has(wd_window.transient_parent));
-
-		WindowData &wd_parent = windows[wd_window.transient_parent];
-
-		wd_window.transient_parent = INVALID_WINDOW_ID;
-		wd_parent.transient_children.erase(p_window);
-
-		[wd_window.window_object setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary];
-	} else {
-		ERR_FAIL_COND(!windows.has(p_parent));
-		ERR_FAIL_COND_MSG(wd_window.transient_parent != INVALID_WINDOW_ID, "Window already has a transient parent");
-		WindowData &wd_parent = windows[p_parent];
-
-		wd_window.transient_parent = p_parent;
-		wd_parent.transient_children.insert(p_window);
-
-		[wd_window.window_object setCollectionBehavior:NSWindowCollectionBehaviorFullScreenAuxiliary];
-	}
-}
-
 Point2i DisplayServerOSX::window_get_position(WindowID p_window) const {
 	_THREAD_SAFE_METHOD_
 
@@ -2447,14 +1481,14 @@ Point2i DisplayServerOSX::window_get_position(WindowID p_window) const {
 	const NSRect nsrect = [wd.window_object convertRectToScreen:contentRect];
 	Point2i pos;
 
-	// Return the position of the top-left corner, for OS X the y starts at the bottom
+	// Return the position of the top-left corner, for OS X the y starts at the bottom.
 	const float scale = screen_get_max_scale();
 	pos.x = nsrect.origin.x;
 	pos.y = (nsrect.origin.y + nsrect.size.height);
 	pos *= scale;
 	pos -= _get_screens_origin();
 	// OS X native y-coordinate relative to _get_screens_origin() is negative,
-	// Godot expects a positive value
+	// Godot expects a positive value.
 	pos.y *= -1;
 	return pos;
 }
@@ -2467,7 +1501,7 @@ void DisplayServerOSX::window_set_position(const Point2i &p_position, WindowID p
 
 	Point2i position = p_position;
 	// OS X native y-coordinate relative to _get_screens_origin() is negative,
-	// Godot passes a positive value
+	// Godot passes a positive value.
 	position.y *= -1;
 	position += _get_screens_origin();
 	position /= screen_get_max_scale();
@@ -2483,8 +1517,41 @@ void DisplayServerOSX::window_set_position(const Point2i &p_position, WindowID p
 
 	[wd.window_object setFrameTopLeftPoint:NSMakePoint(position.x - offset.x, position.y - offset.y)];
 
-	_update_window(wd);
-	_ALLOW_DISCARD_ _get_mouse_pos(wd, [wd.window_object mouseLocationOutsideOfEventStream]);
+	_update_window_style(wd);
+	update_mouse_pos(wd, [wd.window_object mouseLocationOutsideOfEventStream]);
+}
+
+void DisplayServerOSX::window_set_transient(WindowID p_window, WindowID p_parent) {
+	_THREAD_SAFE_METHOD_
+	ERR_FAIL_COND(p_window == p_parent);
+
+	ERR_FAIL_COND(!windows.has(p_window));
+	WindowData &wd_window = windows[p_window];
+
+	ERR_FAIL_COND(wd_window.transient_parent == p_parent);
+
+	ERR_FAIL_COND_MSG(wd_window.on_top, "Windows with the 'on top' can't become transient.");
+	if (p_parent == INVALID_WINDOW_ID) {
+		// Remove transient.
+		ERR_FAIL_COND(wd_window.transient_parent == INVALID_WINDOW_ID);
+		ERR_FAIL_COND(!windows.has(wd_window.transient_parent));
+
+		WindowData &wd_parent = windows[wd_window.transient_parent];
+
+		wd_window.transient_parent = INVALID_WINDOW_ID;
+		wd_parent.transient_children.erase(p_window);
+
+		[wd_window.window_object setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary];
+	} else {
+		ERR_FAIL_COND(!windows.has(p_parent));
+		ERR_FAIL_COND_MSG(wd_window.transient_parent != INVALID_WINDOW_ID, "Window already has a transient parent");
+		WindowData &wd_parent = windows[p_parent];
+
+		wd_window.transient_parent = p_parent;
+		wd_parent.transient_children.insert(p_window);
+
+		[wd_window.window_object setCollectionBehavior:NSWindowCollectionBehaviorFullScreenAuxiliary];
+	}
 }
 
 void DisplayServerOSX::window_set_max_size(const Size2i p_size, WindowID p_window) {
@@ -2565,7 +1632,7 @@ void DisplayServerOSX::window_set_size(const Size2i p_size, WindowID p_window) {
 
 	[wd.window_object setFrame:new_frame display:YES];
 
-	_update_window(wd);
+	_update_window_style(wd);
 }
 
 Size2i DisplayServerOSX::window_get_size(WindowID p_window) const {
@@ -2585,73 +1652,6 @@ Size2i DisplayServerOSX::window_get_real_size(WindowID p_window) const {
 	return Size2i(frame.size.width, frame.size.height) * screen_get_max_scale();
 }
 
-bool DisplayServerOSX::window_is_maximize_allowed(WindowID p_window) const {
-	return true;
-}
-
-void DisplayServerOSX::_set_window_per_pixel_transparency_enabled(bool p_enabled, WindowID p_window) {
-	ERR_FAIL_COND(!windows.has(p_window));
-	WindowData &wd = windows[p_window];
-
-	if (!OS_OSX::get_singleton()->is_layered_allowed()) {
-		return;
-	}
-	if (wd.layered_window != p_enabled) {
-		if (p_enabled) {
-			[wd.window_object setBackgroundColor:[NSColor clearColor]];
-			[wd.window_object setOpaque:NO];
-			[wd.window_object setHasShadow:NO];
-			CALayer *layer = [wd.window_view layer];
-			if (layer) {
-				[layer setOpaque:NO];
-			}
-#if defined(VULKAN_ENABLED)
-			if (context_vulkan) {
-				//TODO - implement transparency for Vulkan
-			}
-#endif
-#if defined(GLES3_ENABLED)
-			if (gl_manager) {
-				//TODO - reimplement OpenGLES
-			}
-#endif
-			wd.layered_window = true;
-		} else {
-			[wd.window_object setBackgroundColor:[NSColor colorWithCalibratedWhite:1 alpha:1]];
-			[wd.window_object setOpaque:YES];
-			[wd.window_object setHasShadow:YES];
-			CALayer *layer = [wd.window_view layer];
-			if (layer) {
-				[layer setOpaque:YES];
-			}
-#if defined(VULKAN_ENABLED)
-			if (context_vulkan) {
-				//TODO - implement transparency for Vulkan
-			}
-#endif
-#if defined(GLES3_ENABLED)
-			if (gl_manager) {
-				//TODO - reimplement OpenGLES
-			}
-#endif
-			wd.layered_window = false;
-		}
-#if defined(GLES3_ENABLED)
-		if (gl_manager) {
-			//TODO - reimplement OpenGLES
-		}
-#endif
-#if defined(VULKAN_ENABLED)
-		if (context_vulkan) {
-			//TODO - implement transparency for Vulkan
-		}
-#endif
-		NSRect frameRect = [wd.window_object frame];
-		[wd.window_object setFrame:NSMakeRect(frameRect.origin.x, frameRect.origin.y, frameRect.size.width + 1, frameRect.size.height) display:YES];
-		[wd.window_object setFrame:frameRect display:YES];
-	}
-}
-
 void DisplayServerOSX::window_set_mode(WindowMode p_mode, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
@@ -2660,12 +1660,12 @@ void DisplayServerOSX::window_set_mode(WindowMode p_mode, WindowID p_window) {
 
 	WindowMode old_mode = window_get_mode(p_window);
 	if (old_mode == p_mode) {
-		return; // do nothing
+		return; // Do nothing.
 	}
 
 	switch (old_mode) {
 		case WINDOW_MODE_WINDOWED: {
-			//do nothing
+			// Do nothing.
 		} break;
 		case WINDOW_MODE_MINIMIZED: {
 			[wd.window_object deminiaturize:nil];
@@ -2673,10 +1673,8 @@ void DisplayServerOSX::window_set_mode(WindowMode p_mode, WindowID p_window) {
 		case WINDOW_MODE_EXCLUSIVE_FULLSCREEN:
 		case WINDOW_MODE_FULLSCREEN: {
 			[wd.window_object setLevel:NSNormalWindowLevel];
-			if (wd.layered_window) {
-				_set_window_per_pixel_transparency_enabled(true, p_window);
-			}
-			if (wd.resize_disabled) { //restore resize disabled
+			_set_window_per_pixel_transparency_enabled(true, p_window);
+			if (wd.resize_disabled) { // Restore resize disabled.
 				[wd.window_object setStyleMask:[wd.window_object styleMask] & ~NSWindowStyleMaskResizable];
 			}
 			if (wd.min_size != Size2i()) {
@@ -2699,17 +1697,17 @@ void DisplayServerOSX::window_set_mode(WindowMode p_mode, WindowID p_window) {
 
 	switch (p_mode) {
 		case WINDOW_MODE_WINDOWED: {
-			//do nothing
+			// Do nothing.
 		} break;
 		case WINDOW_MODE_MINIMIZED: {
 			[wd.window_object performMiniaturize:nil];
 		} break;
 		case WINDOW_MODE_EXCLUSIVE_FULLSCREEN:
 		case WINDOW_MODE_FULLSCREEN: {
-			if (wd.layered_window)
-				_set_window_per_pixel_transparency_enabled(false, p_window);
-			if (wd.resize_disabled) //fullscreen window should be resizable to work
+			_set_window_per_pixel_transparency_enabled(false, p_window);
+			if (wd.resize_disabled) { // Fullscreen window should be resizable to work.
 				[wd.window_object setStyleMask:[wd.window_object styleMask] | NSWindowStyleMaskResizable];
+			}
 			[wd.window_object setContentMinSize:NSMakeSize(0, 0)];
 			[wd.window_object setContentMaxSize:NSMakeSize(FLT_MAX, FLT_MAX)];
 			[wd.window_object toggleFullScreen:nil];
@@ -2729,7 +1727,7 @@ DisplayServer::WindowMode DisplayServerOSX::window_get_mode(WindowID p_window) c
 	ERR_FAIL_COND_V(!windows.has(p_window), WINDOW_MODE_WINDOWED);
 	const WindowData &wd = windows[p_window];
 
-	if (wd.fullscreen) { //if fullscreen, it's not in another mode
+	if (wd.fullscreen) { // If fullscreen, it's not in another mode.
 		return WINDOW_MODE_FULLSCREEN;
 	}
 	if ([wd.window_object isZoomed] && !wd.resize_disabled) {
@@ -2741,10 +1739,14 @@ DisplayServer::WindowMode DisplayServerOSX::window_get_mode(WindowID p_window) c
 		}
 	}
 
-	// all other discarded, return windowed.
+	// All other discarded, return windowed.
 	return WINDOW_MODE_WINDOWED;
 }
 
+bool DisplayServerOSX::window_is_maximize_allowed(WindowID p_window) const {
+	return true;
+}
+
 void DisplayServerOSX::window_set_flag(WindowFlags p_flag, bool p_enabled, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
@@ -2754,7 +1756,7 @@ void DisplayServerOSX::window_set_flag(WindowFlags p_flag, bool p_enabled, Windo
 	switch (p_flag) {
 		case WINDOW_FLAG_RESIZE_DISABLED: {
 			wd.resize_disabled = p_enabled;
-			if (wd.fullscreen) { //fullscreen window should be resizable, style will be applied on exiting fs
+			if (wd.fullscreen) { // Fullscreen window should be resizable, style will be applied on exiting fullscreen.
 				return;
 			}
 			if (p_enabled) {
@@ -2764,7 +1766,7 @@ void DisplayServerOSX::window_set_flag(WindowFlags p_flag, bool p_enabled, Windo
 			}
 		} break;
 		case WINDOW_FLAG_BORDERLESS: {
-			// OrderOut prevents a lose focus bug with the window
+			// OrderOut prevents a lose focus bug with the window.
 			if ([wd.window_object isVisible]) {
 				[wd.window_object orderOut:nil];
 			}
@@ -2772,15 +1774,14 @@ void DisplayServerOSX::window_set_flag(WindowFlags p_flag, bool p_enabled, Windo
 			if (p_enabled) {
 				[wd.window_object setStyleMask:NSWindowStyleMaskBorderless];
 			} else {
-				if (wd.layered_window)
-					_set_window_per_pixel_transparency_enabled(false, p_window);
+				_set_window_per_pixel_transparency_enabled(false, p_window);
 				[wd.window_object setStyleMask:NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | NSWindowStyleMaskMiniaturizable | (wd.resize_disabled ? 0 : NSWindowStyleMaskResizable)];
-				// Force update of the window styles
+				// Force update of the window styles.
 				NSRect frameRect = [wd.window_object frame];
 				[wd.window_object setFrame:NSMakeRect(frameRect.origin.x, frameRect.origin.y, frameRect.size.width + 1, frameRect.size.height) display:NO];
 				[wd.window_object setFrame:frameRect display:NO];
 			}
-			_update_window(wd);
+			_update_window_style(wd);
 			if ([wd.window_object isVisible]) {
 				if (wd.no_focus) {
 					[wd.window_object orderFront:nil];
@@ -2801,9 +1802,8 @@ void DisplayServerOSX::window_set_flag(WindowFlags p_flag, bool p_enabled, Windo
 			}
 		} break;
 		case WINDOW_FLAG_TRANSPARENT: {
-			wd.layered_window = p_enabled;
 			if (p_enabled) {
-				[wd.window_object setStyleMask:NSWindowStyleMaskBorderless]; // force borderless
+				[wd.window_object setStyleMask:NSWindowStyleMaskBorderless]; // Force borderless.
 			} else if (!wd.borderless) {
 				[wd.window_object setStyleMask:NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | NSWindowStyleMaskMiniaturizable | (wd.resize_disabled ? 0 : NSWindowStyleMaskResizable)];
 			}
@@ -2906,28 +1906,103 @@ void DisplayServerOSX::window_set_ime_position(const Point2i &p_pos, WindowID p_
 	wd.im_position = p_pos;
 }
 
-bool DisplayServerOSX::get_swap_cancel_ok() {
-	return false;
+DisplayServer::WindowID DisplayServerOSX::get_window_at_screen_position(const Point2i &p_position) const {
+	Point2i position = p_position;
+	position.y *= -1;
+	position += _get_screens_origin();
+	position /= screen_get_max_scale();
+
+	NSInteger wnum = [NSWindow windowNumberAtPoint:NSMakePoint(position.x, position.y) belowWindowWithWindowNumber:0 /*topmost*/];
+	for (Map<WindowID, WindowData>::Element *E = windows.front(); E; E = E->next()) {
+		if ([E->get().window_object windowNumber] == wnum) {
+			return E->key();
+		}
+	}
+	return INVALID_WINDOW_ID;
 }
 
-void DisplayServerOSX::cursor_set_shape(CursorShape p_shape) {
+int64_t DisplayServerOSX::window_get_native_handle(HandleType p_handle_type, WindowID p_window) const {
+	ERR_FAIL_COND_V(!windows.has(p_window), 0);
+	switch (p_handle_type) {
+		case DISPLAY_HANDLE: {
+			return 0; // Not supported.
+		}
+		case WINDOW_HANDLE: {
+			return (int64_t)windows[p_window].window_object;
+		}
+		case WINDOW_VIEW: {
+			return (int64_t)windows[p_window].window_view;
+		}
+		default: {
+			return 0;
+		}
+	}
+}
+
+void DisplayServerOSX::window_attach_instance_id(ObjectID p_instance, WindowID p_window) {
 	_THREAD_SAFE_METHOD_
 
-	ERR_FAIL_INDEX(p_shape, CURSOR_MAX);
+	ERR_FAIL_COND(!windows.has(p_window));
+	windows[p_window].instance_id = p_instance;
+}
 
-	if (cursor_shape == p_shape) {
-		return;
+ObjectID DisplayServerOSX::window_get_attached_instance_id(WindowID p_window) const {
+	_THREAD_SAFE_METHOD_
+
+	ERR_FAIL_COND_V(!windows.has(p_window), ObjectID());
+	return windows[p_window].instance_id;
+}
+
+void DisplayServerOSX::gl_window_make_current(DisplayServer::WindowID p_window_id) {
+#if defined(GLES3_ENABLED)
+	gl_manager->window_make_current(p_window_id);
+#endif
+}
+
+void DisplayServerOSX::window_set_vsync_mode(DisplayServer::VSyncMode p_vsync_mode, WindowID p_window) {
+	_THREAD_SAFE_METHOD_
+#if defined(GLES3_ENABLED)
+	if (gl_manager) {
+		gl_manager->set_use_vsync(p_vsync_mode);
 	}
+#endif
+#if defined(VULKAN_ENABLED)
+	if (context_vulkan) {
+		context_vulkan->set_vsync_mode(p_window, p_vsync_mode);
+	}
+#endif
+}
 
-	if (mouse_mode != MOUSE_MODE_VISIBLE && mouse_mode != MOUSE_MODE_CONFINED) {
-		cursor_shape = p_shape;
-		return;
+DisplayServer::VSyncMode DisplayServerOSX::window_get_vsync_mode(WindowID p_window) const {
+	_THREAD_SAFE_METHOD_
+#if defined(GLES3_ENABLED)
+	if (gl_manager) {
+		return (gl_manager->is_using_vsync() ? DisplayServer::VSyncMode::VSYNC_ENABLED : DisplayServer::VSyncMode::VSYNC_DISABLED);
+	}
+#endif
+#if defined(VULKAN_ENABLED)
+	if (context_vulkan) {
+		return context_vulkan->get_vsync_mode(p_window);
 	}
+#endif
+	return DisplayServer::VSYNC_ENABLED;
+}
+
+Point2i DisplayServerOSX::ime_get_selection() const {
+	return im_selection;
+}
+
+String DisplayServerOSX::ime_get_text() const {
+	return im_text;
+}
 
-	if (cursors[p_shape] != nullptr) {
-		[cursors[p_shape] set];
+void DisplayServerOSX::cursor_update_shape() {
+	_THREAD_SAFE_METHOD_
+
+	if (cursors[cursor_shape] != nullptr) {
+		[cursors[cursor_shape] set];
 	} else {
-		switch (p_shape) {
+		switch (cursor_shape) {
 			case CURSOR_ARROW:
 				[[NSCursor arrowCursor] set];
 				break;
@@ -2956,16 +2031,16 @@ void DisplayServerOSX::cursor_set_shape(CursorShape p_shape) {
 				[[NSCursor operationNotAllowedCursor] set];
 				break;
 			case CURSOR_VSIZE:
-				[_cursorFromSelector(@selector(_windowResizeNorthSouthCursor), @selector(resizeUpDownCursor)) set];
+				[_cursor_from_selector(@selector(_windowResizeNorthSouthCursor), @selector(resizeUpDownCursor)) set];
 				break;
 			case CURSOR_HSIZE:
-				[_cursorFromSelector(@selector(_windowResizeEastWestCursor), @selector(resizeLeftRightCursor)) set];
+				[_cursor_from_selector(@selector(_windowResizeEastWestCursor), @selector(resizeLeftRightCursor)) set];
 				break;
 			case CURSOR_BDIAGSIZE:
-				[_cursorFromSelector(@selector(_windowResizeNorthEastSouthWestCursor)) set];
+				[_cursor_from_selector(@selector(_windowResizeNorthEastSouthWestCursor)) set];
 				break;
 			case CURSOR_FDIAGSIZE:
-				[_cursorFromSelector(@selector(_windowResizeNorthWestSouthEastCursor)) set];
+				[_cursor_from_selector(@selector(_windowResizeNorthWestSouthEastCursor)) set];
 				break;
 			case CURSOR_MOVE:
 				[[NSCursor arrowCursor] set];
@@ -2977,14 +2052,30 @@ void DisplayServerOSX::cursor_set_shape(CursorShape p_shape) {
 				[[NSCursor resizeLeftRightCursor] set];
 				break;
 			case CURSOR_HELP:
-				[_cursorFromSelector(@selector(_helpCursor)) set];
+				[_cursor_from_selector(@selector(_helpCursor)) set];
 				break;
 			default: {
 			}
 		}
 	}
+}
+
+void DisplayServerOSX::cursor_set_shape(CursorShape p_shape) {
+	_THREAD_SAFE_METHOD_
+
+	ERR_FAIL_INDEX(p_shape, CURSOR_MAX);
+
+	if (cursor_shape == p_shape) {
+		return;
+	}
 
 	cursor_shape = p_shape;
+
+	if (mouse_mode != MOUSE_MODE_VISIBLE && mouse_mode != MOUSE_MODE_CONFINED) {
+		return;
+	}
+
+	cursor_update_shape();
 }
 
 DisplayServerOSX::CursorShape DisplayServerOSX::cursor_get_shape() const {
@@ -3079,7 +2170,6 @@ void DisplayServerOSX::cursor_set_custom_image(const RES &p_cursor, CursorShape
 
 		NSCursor *cursor = [[NSCursor alloc] initWithImage:nsimage hotSpot:NSMakePoint(p_hotspot.x, p_hotspot.y)];
 
-		[cursors[p_shape] release];
 		cursors[p_shape] = cursor;
 
 		Vector<Variant> params;
@@ -3092,94 +2182,32 @@ void DisplayServerOSX::cursor_set_custom_image(const RES &p_cursor, CursorShape
 				[cursor set];
 			}
 		}
-
-		[imgrep release];
-		[nsimage release];
 	} else {
-		// Reset to default system cursor
+		// Reset to default system cursor.
 		if (cursors[p_shape] != nullptr) {
-			[cursors[p_shape] release];
 			cursors[p_shape] = nullptr;
 		}
 
-		CursorShape c = cursor_shape;
-		cursor_shape = CURSOR_MAX;
-		cursor_set_shape(c);
+		cursor_update_shape();
 
 		cursors_cache.erase(p_shape);
 	}
 }
 
-struct LayoutInfo {
-	String name;
-	String code;
-};
-
-static Vector<LayoutInfo> kbd_layouts;
-static int current_layout = 0;
-static bool keyboard_layout_dirty = true;
-static void keyboard_layout_changed(CFNotificationCenterRef center, void *observer, CFStringRef name, const void *object, CFDictionaryRef user_info) {
-	kbd_layouts.clear();
-	current_layout = 0;
-	keyboard_layout_dirty = true;
-}
-
-void _update_keyboard_layouts() {
-	@autoreleasepool {
-		TISInputSourceRef cur_source = TISCopyCurrentKeyboardInputSource();
-		NSString *cur_name = (NSString *)TISGetInputSourceProperty(cur_source, kTISPropertyLocalizedName);
-		CFRelease(cur_source);
-
-		// Enum IME layouts
-		NSDictionary *filter_ime = @{ (NSString *)kTISPropertyInputSourceType : (NSString *)kTISTypeKeyboardInputMode };
-		NSArray *list_ime = (NSArray *)TISCreateInputSourceList((CFDictionaryRef)filter_ime, false);
-		for (NSUInteger i = 0; i < [list_ime count]; i++) {
-			LayoutInfo ly;
-			NSString *name = (NSString *)TISGetInputSourceProperty((TISInputSourceRef)[list_ime objectAtIndex:i], kTISPropertyLocalizedName);
-			ly.name.parse_utf8([name UTF8String]);
-
-			NSArray *langs = (NSArray *)TISGetInputSourceProperty((TISInputSourceRef)[list_ime objectAtIndex:i], kTISPropertyInputSourceLanguages);
-			ly.code.parse_utf8([(NSString *)[langs objectAtIndex:0] UTF8String]);
-			kbd_layouts.push_back(ly);
-
-			if ([name isEqualToString:cur_name]) {
-				current_layout = kbd_layouts.size() - 1;
-			}
-		}
-		[list_ime release];
-
-		// Enum plain keyboard layouts
-		NSDictionary *filter_kbd = @{ (NSString *)kTISPropertyInputSourceType : (NSString *)kTISTypeKeyboardLayout };
-		NSArray *list_kbd = (NSArray *)TISCreateInputSourceList((CFDictionaryRef)filter_kbd, false);
-		for (NSUInteger i = 0; i < [list_kbd count]; i++) {
-			LayoutInfo ly;
-			NSString *name = (NSString *)TISGetInputSourceProperty((TISInputSourceRef)[list_kbd objectAtIndex:i], kTISPropertyLocalizedName);
-			ly.name.parse_utf8([name UTF8String]);
-
-			NSArray *langs = (NSArray *)TISGetInputSourceProperty((TISInputSourceRef)[list_kbd objectAtIndex:i], kTISPropertyInputSourceLanguages);
-			ly.code.parse_utf8([(NSString *)[langs objectAtIndex:0] UTF8String]);
-			kbd_layouts.push_back(ly);
-
-			if ([name isEqualToString:cur_name]) {
-				current_layout = kbd_layouts.size() - 1;
-			}
-		}
-		[list_kbd release];
-	}
-
-	keyboard_layout_dirty = false;
+bool DisplayServerOSX::get_swap_cancel_ok() {
+	return false;
 }
 
 int DisplayServerOSX::keyboard_get_layout_count() const {
 	if (keyboard_layout_dirty) {
-		_update_keyboard_layouts();
+		const_cast<DisplayServerOSX *>(this)->_update_keyboard_layouts();
 	}
 	return kbd_layouts.size();
 }
 
 void DisplayServerOSX::keyboard_set_current_layout(int p_index) {
 	if (keyboard_layout_dirty) {
-		_update_keyboard_layouts();
+		const_cast<DisplayServerOSX *>(this)->_update_keyboard_layouts();
 	}
 
 	ERR_FAIL_INDEX(p_index, kbd_layouts.size());
@@ -3187,31 +2215,29 @@ void DisplayServerOSX::keyboard_set_current_layout(int p_index) {
 	NSString *cur_name = [NSString stringWithUTF8String:kbd_layouts[p_index].name.utf8().get_data()];
 
 	NSDictionary *filter_kbd = @{ (NSString *)kTISPropertyInputSourceType : (NSString *)kTISTypeKeyboardLayout };
-	NSArray *list_kbd = (NSArray *)TISCreateInputSourceList((CFDictionaryRef)filter_kbd, false);
+	NSArray *list_kbd = (__bridge NSArray *)TISCreateInputSourceList((__bridge CFDictionaryRef)filter_kbd, false);
 	for (NSUInteger i = 0; i < [list_kbd count]; i++) {
-		NSString *name = (NSString *)TISGetInputSourceProperty((TISInputSourceRef)[list_kbd objectAtIndex:i], kTISPropertyLocalizedName);
+		NSString *name = (__bridge NSString *)TISGetInputSourceProperty((__bridge TISInputSourceRef)[list_kbd objectAtIndex:i], kTISPropertyLocalizedName);
 		if ([name isEqualToString:cur_name]) {
-			TISSelectInputSource((TISInputSourceRef)[list_kbd objectAtIndex:i]);
+			TISSelectInputSource((__bridge TISInputSourceRef)[list_kbd objectAtIndex:i]);
 			break;
 		}
 	}
-	[list_kbd release];
 
 	NSDictionary *filter_ime = @{ (NSString *)kTISPropertyInputSourceType : (NSString *)kTISTypeKeyboardInputMode };
-	NSArray *list_ime = (NSArray *)TISCreateInputSourceList((CFDictionaryRef)filter_ime, false);
+	NSArray *list_ime = (__bridge NSArray *)TISCreateInputSourceList((__bridge CFDictionaryRef)filter_ime, false);
 	for (NSUInteger i = 0; i < [list_ime count]; i++) {
-		NSString *name = (NSString *)TISGetInputSourceProperty((TISInputSourceRef)[list_ime objectAtIndex:i], kTISPropertyLocalizedName);
+		NSString *name = (__bridge NSString *)TISGetInputSourceProperty((__bridge TISInputSourceRef)[list_ime objectAtIndex:i], kTISPropertyLocalizedName);
 		if ([name isEqualToString:cur_name]) {
-			TISSelectInputSource((TISInputSourceRef)[list_ime objectAtIndex:i]);
+			TISSelectInputSource((__bridge TISInputSourceRef)[list_ime objectAtIndex:i]);
 			break;
 		}
 	}
-	[list_ime release];
 }
 
 int DisplayServerOSX::keyboard_get_current_layout() const {
 	if (keyboard_layout_dirty) {
-		_update_keyboard_layouts();
+		const_cast<DisplayServerOSX *>(this)->_update_keyboard_layouts();
 	}
 
 	return current_layout;
@@ -3219,7 +2245,7 @@ int DisplayServerOSX::keyboard_get_current_layout() const {
 
 String DisplayServerOSX::keyboard_get_layout_language(int p_index) const {
 	if (keyboard_layout_dirty) {
-		_update_keyboard_layouts();
+		const_cast<DisplayServerOSX *>(this)->_update_keyboard_layouts();
 	}
 
 	ERR_FAIL_INDEX_V(p_index, kbd_layouts.size(), "");
@@ -3228,7 +2254,7 @@ String DisplayServerOSX::keyboard_get_layout_language(int p_index) const {
 
 String DisplayServerOSX::keyboard_get_layout_name(int p_index) const {
 	if (keyboard_layout_dirty) {
-		_update_keyboard_layouts();
+		const_cast<DisplayServerOSX *>(this)->_update_keyboard_layouts();
 	}
 
 	ERR_FAIL_INDEX_V(p_index, kbd_layouts.size(), "");
@@ -3242,124 +2268,8 @@ Key DisplayServerOSX::keyboard_get_keycode_from_physical(Key p_keycode) const {
 
 	Key modifiers = p_keycode & KeyModifierMask::MODIFIER_MASK;
 	Key keycode_no_mod = p_keycode & KeyModifierMask::CODE_MASK;
-	unsigned int osx_keycode = unmapKey((Key)keycode_no_mod);
-	return (Key)(remapKey(osx_keycode, 0) | modifiers);
-}
-
-void DisplayServerOSX::_push_input(const Ref<InputEvent> &p_event) {
-	Ref<InputEvent> ev = p_event;
-	Input::get_singleton()->parse_input_event(ev);
-}
-
-void DisplayServerOSX::_release_pressed_events() {
-	_THREAD_SAFE_METHOD_
-	if (Input::get_singleton()) {
-		Input::get_singleton()->release_pressed_events();
-	}
-}
-
-NSMenu *DisplayServerOSX::_get_dock_menu() const {
-	return dock_menu;
-}
-
-void DisplayServerOSX::_menu_callback(id p_sender) {
-	if (![p_sender representedObject]) {
-		return;
-	}
-
-	GlobalMenuItem *value = [p_sender representedObject];
-
-	if (value) {
-		if (value->checkable) {
-			if ([p_sender state] == NSControlStateValueOff) {
-				[p_sender setState:NSControlStateValueOn];
-			} else {
-				[p_sender setState:NSControlStateValueOff];
-			}
-		}
-
-		if (value->callback != Callable()) {
-			Variant tag = value->meta;
-			Variant *tagp = &tag;
-			Variant ret;
-			Callable::CallError ce;
-			value->callback.call((const Variant **)&tagp, 1, ret, ce);
-		}
-	}
-}
-
-void DisplayServerOSX::_send_event(NSEvent *p_event) {
-	// special case handling of command-period, which is traditionally a special
-	// shortcut in macOS and doesn't arrive at our regular keyDown handler.
-	if ([p_event type] == NSEventTypeKeyDown) {
-		if (([p_event modifierFlags] & NSEventModifierFlagCommand) && [p_event keyCode] == 0x2f) {
-			Ref<InputEventKey> k;
-			k.instantiate();
-
-			_get_key_modifier_state([p_event modifierFlags], k);
-			k->set_window_id(DisplayServerOSX::INVALID_WINDOW_ID);
-			k->set_pressed(true);
-			k->set_keycode(Key::PERIOD);
-			k->set_physical_keycode(Key::PERIOD);
-			k->set_echo([p_event isARepeat]);
-
-			Input::get_singleton()->parse_input_event(k);
-		}
-	}
-}
-
-void DisplayServerOSX::_process_key_events() {
-	Ref<InputEventKey> k;
-	for (int i = 0; i < key_event_pos; i++) {
-		const KeyEvent &ke = key_event_buffer[i];
-		if (ke.raw) {
-			// Non IME input - no composite characters, pass events as is
-			k.instantiate();
-
-			k->set_window_id(ke.window_id);
-			_get_key_modifier_state(ke.osx_state, k);
-			k->set_pressed(ke.pressed);
-			k->set_echo(ke.echo);
-			k->set_keycode(ke.keycode);
-			k->set_physical_keycode((Key)ke.physical_keycode);
-			k->set_unicode(ke.unicode);
-
-			_push_input(k);
-		} else {
-			// IME input
-			if ((i == 0 && ke.keycode == Key::NONE) || (i > 0 && key_event_buffer[i - 1].keycode == Key::NONE)) {
-				k.instantiate();
-
-				k->set_window_id(ke.window_id);
-				_get_key_modifier_state(ke.osx_state, k);
-				k->set_pressed(ke.pressed);
-				k->set_echo(ke.echo);
-				k->set_keycode(Key::NONE);
-				k->set_physical_keycode(Key::NONE);
-				k->set_unicode(ke.unicode);
-
-				_push_input(k);
-			}
-			if (ke.keycode != Key::NONE) {
-				k.instantiate();
-
-				k->set_window_id(ke.window_id);
-				_get_key_modifier_state(ke.osx_state, k);
-				k->set_pressed(ke.pressed);
-				k->set_echo(ke.echo);
-				k->set_keycode(ke.keycode);
-				k->set_physical_keycode((Key)ke.physical_keycode);
-
-				if (i + 1 < key_event_pos && key_event_buffer[i + 1].keycode == Key::NONE) {
-					k->set_unicode(key_event_buffer[i + 1].unicode);
-				}
-
-				_push_input(k);
-			}
-		}
-	}
-
-	key_event_pos = 0;
+	unsigned int osx_keycode = KeyMappingOSX::unmap_key((Key)keycode_no_mod);
+	return (Key)(KeyMappingOSX::remap_key(osx_keycode, 0) | modifiers);
 }
 
 void DisplayServerOSX::process_events() {
@@ -3387,8 +2297,8 @@ void DisplayServerOSX::process_events() {
 	for (Map<WindowID, WindowData>::Element *E = windows.front(); E; E = E->next()) {
 		WindowData &wd = E->get();
 		if (wd.mpath.size() > 0) {
-			const Vector2 mpos = _get_mouse_pos(wd, [wd.window_object mouseLocationOutsideOfEventStream]);
-			if (Geometry2D::is_point_in_polygon(mpos, wd.mpath)) {
+			update_mouse_pos(wd, [wd.window_object mouseLocationOutsideOfEventStream]);
+			if (Geometry2D::is_point_in_polygon(wd.mouse_pos, wd.mpath)) {
 				if ([wd.window_object ignoresMouseEvents]) {
 					[wd.window_object setIgnoresMouseEvents:NO];
 				}
@@ -3403,9 +2313,6 @@ void DisplayServerOSX::process_events() {
 			}
 		}
 	}
-
-	[autoreleasePool drain];
-	autoreleasePool = [[NSAutoreleasePool alloc] init];
 }
 
 void DisplayServerOSX::force_process_and_drop_events() {
@@ -3416,6 +2323,18 @@ void DisplayServerOSX::force_process_and_drop_events() {
 	drop_events = false;
 }
 
+void DisplayServerOSX::release_rendering_thread() {
+}
+
+void DisplayServerOSX::make_rendering_thread() {
+}
+
+void DisplayServerOSX::swap_buffers() {
+#if defined(GLES3_ENABLED)
+	gl_manager->swap_buffers();
+#endif
+}
+
 void DisplayServerOSX::set_native_icon(const String &p_filename) {
 	_THREAD_SAFE_METHOD_
 
@@ -3428,10 +2347,10 @@ void DisplayServerOSX::set_native_icon(const String &p_filename) {
 	f->get_buffer((uint8_t *)&data.write[0], len);
 	memdelete(f);
 
-	NSData *icon_data = [[[NSData alloc] initWithBytes:&data.write[0] length:len] autorelease];
+	NSData *icon_data = [[NSData alloc] initWithBytes:&data.write[0] length:len];
 	ERR_FAIL_COND_MSG(!icon_data, "Error reading icon data.");
 
-	NSImage *icon = [[[NSImage alloc] initWithData:icon_data] autorelease];
+	NSImage *icon = [[NSImage alloc] initWithData:icon_data];
 	ERR_FAIL_COND_MSG(!icon, "Error loading icon.");
 
 	[NSApp setApplicationIconImage:icon];
@@ -3474,112 +2393,6 @@ void DisplayServerOSX::set_icon(const Ref<Image> &p_icon) {
 
 	[nsimg addRepresentation:imgrep];
 	[NSApp setApplicationIconImage:nsimg];
-
-	[imgrep release];
-	[nsimg release];
-}
-
-void DisplayServerOSX::window_set_vsync_mode(DisplayServer::VSyncMode p_vsync_mode, WindowID p_window) {
-	_THREAD_SAFE_METHOD_
-#if defined(GLES3_ENABLED)
-	if (gl_manager) {
-		gl_manager->swap_buffers();
-	}
-#endif
-#if defined(VULKAN_ENABLED)
-	if (context_vulkan) {
-		context_vulkan->set_vsync_mode(p_window, p_vsync_mode);
-	}
-#endif
-}
-
-DisplayServer::VSyncMode DisplayServerOSX::window_get_vsync_mode(WindowID p_window) const {
-	_THREAD_SAFE_METHOD_
-#if defined(GLES3_ENABLED)
-	if (gl_manager) {
-		return (gl_manager->is_using_vsync() ? DisplayServer::VSyncMode::VSYNC_ENABLED : DisplayServer::VSyncMode::VSYNC_DISABLED);
-	}
-#endif
-#if defined(VULKAN_ENABLED)
-	if (context_vulkan) {
-		return context_vulkan->get_vsync_mode(p_window);
-	}
-#endif
-	return DisplayServer::VSYNC_ENABLED;
-}
-
-Vector<String> DisplayServerOSX::get_rendering_drivers_func() {
-	Vector<String> drivers;
-
-#if defined(VULKAN_ENABLED)
-	drivers.push_back("vulkan");
-#endif
-#if defined(GLES3_ENABLED)
-	drivers.push_back("opengl3");
-#endif
-
-	return drivers;
-}
-
-void DisplayServerOSX::gl_window_make_current(DisplayServer::WindowID p_window_id) {
-#if defined(GLES3_ENABLED)
-	gl_manager->window_make_current(p_window_id);
-#endif
-}
-
-Point2i DisplayServerOSX::ime_get_selection() const {
-	return im_selection;
-}
-
-String DisplayServerOSX::ime_get_text() const {
-	return im_text;
-}
-
-DisplayServer::WindowID DisplayServerOSX::get_window_at_screen_position(const Point2i &p_position) const {
-	Point2i position = p_position;
-	position.y *= -1;
-	position += _get_screens_origin();
-	position /= screen_get_max_scale();
-
-	NSInteger wnum = [NSWindow windowNumberAtPoint:NSMakePoint(position.x, position.y) belowWindowWithWindowNumber:0 /*topmost*/];
-	for (Map<WindowID, WindowData>::Element *E = windows.front(); E; E = E->next()) {
-		if ([E->get().window_object windowNumber] == wnum) {
-			return E->key();
-		}
-	}
-	return INVALID_WINDOW_ID;
-}
-
-int64_t DisplayServerOSX::window_get_native_handle(HandleType p_handle_type, WindowID p_window) const {
-	ERR_FAIL_COND_V(!windows.has(p_window), 0);
-	switch (p_handle_type) {
-		case DISPLAY_HANDLE: {
-			return 0; // Not supported.
-		}
-		case WINDOW_HANDLE: {
-			return (int64_t)windows[p_window].window_object;
-		}
-		case WINDOW_VIEW: {
-			return (int64_t)windows[p_window].window_view;
-		}
-		default: {
-			return 0;
-		}
-	}
-}
-
-void DisplayServerOSX::window_attach_instance_id(ObjectID p_instance, WindowID p_window) {
-	_THREAD_SAFE_METHOD_
-
-	ERR_FAIL_COND(!windows.has(p_window));
-	windows[p_window].instance_id = p_instance;
-}
-
-ObjectID DisplayServerOSX::window_get_attached_instance_id(WindowID p_window) const {
-	_THREAD_SAFE_METHOD_
-
-	ERR_FAIL_COND_V(!windows.has(p_window), ObjectID());
-	return windows[p_window].instance_id;
 }
 
 DisplayServer *DisplayServerOSX::create_func(const String &p_rendering_driver, WindowMode p_mode, VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i &p_resolution, Error &r_error) {
@@ -3590,179 +2403,48 @@ DisplayServer *DisplayServerOSX::create_func(const String &p_rendering_driver, W
 	return ds;
 }
 
-DisplayServerOSX::WindowID DisplayServerOSX::_create_window(WindowMode p_mode, VSyncMode p_vsync_mode, const Rect2i &p_rect) {
-	WindowID id;
-	const float scale = screen_get_max_scale();
-	{
-		WindowData wd;
-
-		wd.window_delegate = [[GodotWindowDelegate alloc] init];
-		ERR_FAIL_COND_V_MSG(wd.window_delegate == nil, INVALID_WINDOW_ID, "Can't create a window delegate");
-		[wd.window_delegate setWindowID:window_id_counter];
-
-		Point2i position = p_rect.position;
-		// OS X native y-coordinate relative to _get_screens_origin() is negative,
-		// Godot passes a positive value
-		position.y *= -1;
-		position += _get_screens_origin();
-
-		// initWithContentRect uses bottom-left corner of the window’s frame as origin.
-		wd.window_object = [[GodotWindow alloc]
-				initWithContentRect:NSMakeRect(position.x / scale, (position.y - p_rect.size.height) / scale, p_rect.size.width / scale, p_rect.size.height / scale)
-						  styleMask:NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | NSWindowStyleMaskMiniaturizable | NSWindowStyleMaskResizable
-							backing:NSBackingStoreBuffered
-							  defer:NO];
-		ERR_FAIL_COND_V_MSG(wd.window_object == nil, INVALID_WINDOW_ID, "Can't create a window");
-
-		wd.window_view = [[GodotContentView alloc] init];
-		ERR_FAIL_COND_V_MSG(wd.window_view == nil, INVALID_WINDOW_ID, "Can't create a window view");
-		[wd.window_view setWindowID:window_id_counter];
-		[wd.window_view setWantsLayer:TRUE];
-
-		[wd.window_object setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary];
-		[wd.window_object setContentView:wd.window_view];
-		[wd.window_object setDelegate:wd.window_delegate];
-		[wd.window_object setAcceptsMouseMovedEvents:YES];
-		[wd.window_object setRestorable:NO];
-		[wd.window_object setColorSpace:[NSColorSpace sRGBColorSpace]];
-
-		if ([wd.window_object respondsToSelector:@selector(setTabbingMode:)]) {
-			[wd.window_object setTabbingMode:NSWindowTabbingModeDisallowed];
-		}
-
-		CALayer *layer = [wd.window_view layer];
-		if (layer) {
-			layer.contentsScale = scale;
-		}
+Vector<String> DisplayServerOSX::get_rendering_drivers_func() {
+	Vector<String> drivers;
 
 #if defined(VULKAN_ENABLED)
-		if (context_vulkan) {
-			Error err = context_vulkan->window_create(window_id_counter, p_vsync_mode, wd.window_view, p_rect.size.width, p_rect.size.height);
-			ERR_FAIL_COND_V_MSG(err != OK, INVALID_WINDOW_ID, "Can't create a Vulkan context");
-		}
-#endif
-#if defined(GLES3_ENABLED)
-		if (gl_manager) {
-			Error err = gl_manager->window_create(window_id_counter, wd.window_view, p_rect.size.width, p_rect.size.height);
-			ERR_FAIL_COND_V_MSG(err != OK, INVALID_WINDOW_ID, "Can't create an OpenGL context");
-		}
+	drivers.push_back("vulkan");
 #endif
-		id = window_id_counter++;
-		windows[id] = wd;
-	}
-
-	WindowData &wd = windows[id];
-	window_set_mode(p_mode, id);
-
-	const NSRect contentRect = [wd.window_view frame];
-	wd.size.width = contentRect.size.width * scale;
-	wd.size.height = contentRect.size.height * scale;
-
-	CALayer *layer = [wd.window_view layer];
-	if (layer) {
-		layer.contentsScale = scale;
-	}
-
 #if defined(GLES3_ENABLED)
-	if (gl_manager) {
-		gl_manager->window_resize(id, wd.size.width, wd.size.height);
-	}
-#endif
-#if defined(VULKAN_ENABLED)
-	if (context_vulkan) {
-		context_vulkan->window_resize(id, wd.size.width, wd.size.height);
-	}
+	drivers.push_back("opengl3");
 #endif
 
-	return id;
-}
-
-void DisplayServerOSX::_dispatch_input_events(const Ref<InputEvent> &p_event) {
-	((DisplayServerOSX *)(get_singleton()))->_dispatch_input_event(p_event);
-}
-
-void DisplayServerOSX::_dispatch_input_event(const Ref<InputEvent> &p_event) {
-	_THREAD_SAFE_METHOD_
-	if (!in_dispatch_input_event) {
-		in_dispatch_input_event = true;
-
-		Variant ev = p_event;
-		Variant *evp = &ev;
-		Variant ret;
-		Callable::CallError ce;
-
-		Ref<InputEventFromWindow> event_from_window = p_event;
-		if (event_from_window.is_valid() && event_from_window->get_window_id() != INVALID_WINDOW_ID) {
-			//send to a window
-			if (windows.has(event_from_window->get_window_id())) {
-				Callable callable = windows[event_from_window->get_window_id()].input_event_callback;
-				if (callable.is_null()) {
-					return;
-				}
-				callable.call((const Variant **)&evp, 1, ret, ce);
-			}
-		} else {
-			//send to all windows
-			for (Map<WindowID, WindowData>::Element *E = windows.front(); E; E = E->next()) {
-				Callable callable = E->get().input_event_callback;
-				if (callable.is_null()) {
-					continue;
-				}
-				callable.call((const Variant **)&evp, 1, ret, ce);
-			}
-		}
-
-		in_dispatch_input_event = false;
-	}
-}
-
-void DisplayServerOSX::release_rendering_thread() {
-}
-
-void DisplayServerOSX::make_rendering_thread() {
+	return drivers;
 }
 
-void DisplayServerOSX::swap_buffers() {
-#if defined(GLES3_ENABLED)
-	gl_manager->swap_buffers();
-#endif
+void DisplayServerOSX::register_osx_driver() {
+	register_create_function("osx", create_func, get_rendering_drivers_func);
 }
 
 DisplayServerOSX::DisplayServerOSX(const String &p_rendering_driver, WindowMode p_mode, VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i &p_resolution, Error &r_error) {
 	Input::get_singleton()->set_event_dispatch_function(_dispatch_input_events);
 
 	r_error = OK;
-	drop_events = false;
 
 	memset(cursors, 0, sizeof(cursors));
-	cursor_shape = CURSOR_ARROW;
-
-	key_event_pos = 0;
-	mouse_mode = MOUSE_MODE_VISIBLE;
 
-	autoreleasePool = [[NSAutoreleasePool alloc] init];
+	event_source = CGEventSourceCreate(kCGEventSourceStateHIDSystemState);
+	ERR_FAIL_COND(!event_source);
 
-	eventSource = CGEventSourceCreate(kCGEventSourceStateHIDSystemState);
-	ERR_FAIL_COND(!eventSource);
-
-	CGEventSourceSetLocalEventsSuppressionInterval(eventSource, 0.0);
-
-	keyboard_layout_dirty = true;
-	displays_arrangement_dirty = true;
+	CGEventSourceSetLocalEventsSuppressionInterval(event_source, 0.0);
 
 	int screen_count = get_screen_count();
 	for (int i = 0; i < screen_count; i++) {
 		display_max_scale = fmax(display_max_scale, screen_get_scale(i));
 	}
 
-	// Register to be notified on keyboard layout changes
+	// Register to be notified on keyboard layout changes.
 	CFNotificationCenterAddObserver(CFNotificationCenterGetDistributedCenter(),
-			nullptr, keyboard_layout_changed,
+			nullptr, _keyboard_layout_changed,
 			kTISNotifySelectedKeyboardInputSourceChanged, nullptr,
 			CFNotificationSuspensionBehaviorDeliverImmediately);
 
-	// Register to be notified on displays arrangement changes
-	CGDisplayRegisterReconfigurationCallback(displays_arrangement_changed, nullptr);
+	// Register to be notified on displays arrangement changes.
+	CGDisplayRegisterReconfigurationCallback(_displays_arrangement_changed, nullptr);
 
 	NSMenuItem *menu_item;
 	NSString *title;
@@ -3772,11 +2454,11 @@ DisplayServerOSX::DisplayServerOSX(const String &p_rendering_driver, WindowMode
 		nsappname = [[NSProcessInfo processInfo] processName];
 	}
 
-	// Setup Dock menu
+	// Setup Dock menu.
 	dock_menu = [[NSMenu alloc] initWithTitle:@"_dock"];
 
-	// Setup Apple menu
-	apple_menu = [[[NSMenu alloc] initWithTitle:@""] autorelease];
+	// Setup Apple menu.
+	apple_menu = [[NSMenu alloc] initWithTitle:@""];
 	title = [NSString stringWithFormat:NSLocalizedString(@"About %@", nil), nsappname];
 	[apple_menu addItemWithTitle:title action:@selector(showAbout:) keyEquivalent:@""];
 
@@ -3786,7 +2468,6 @@ DisplayServerOSX::DisplayServerOSX(const String &p_rendering_driver, WindowMode
 	menu_item = [apple_menu addItemWithTitle:NSLocalizedString(@"Services", nil) action:nil keyEquivalent:@""];
 	[apple_menu setSubmenu:services forItem:menu_item];
 	[NSApp setServicesMenu:services];
-	[services release];
 
 	[apple_menu addItem:[NSMenuItem separatorItem]];
 
@@ -3803,7 +2484,7 @@ DisplayServerOSX::DisplayServerOSX(const String &p_rendering_driver, WindowMode
 	title = [NSString stringWithFormat:NSLocalizedString(@"Quit %@", nil), nsappname];
 	[apple_menu addItemWithTitle:title action:@selector(terminate:) keyEquivalent:@"q"];
 
-	// Add items to the menu bar
+	// Add items to the menu bar.
 	NSMenu *main_menu = [NSApp mainMenu];
 	menu_item = [main_menu addItemWithTitle:@"" action:nil keyEquivalent:@""];
 	[main_menu setSubmenu:apple_menu forItem:menu_item];
@@ -3865,15 +2546,7 @@ DisplayServerOSX::DisplayServerOSX(const String &p_rendering_driver, WindowMode
 }
 
 DisplayServerOSX::~DisplayServerOSX() {
-	if (dock_menu) {
-		[dock_menu release];
-	}
-
-	for (Map<String, NSMenu *>::Element *E = submenu.front(); E; E = E->next()) {
-		[E->get() release];
-	}
-
-	//destroy all windows
+	// Destroy all windows.
 	for (Map<WindowID, WindowData>::Element *E = windows.front(); E;) {
 		Map<WindowID, WindowData>::Element *F = E;
 		E = E->next();
@@ -3881,7 +2554,7 @@ DisplayServerOSX::~DisplayServerOSX() {
 		[F->get().window_object close];
 	}
 
-	//destroy drivers
+	// Destroy drivers.
 #if defined(GLES3_ENABLED)
 	if (gl_manager) {
 		memdelete(gl_manager);
@@ -3902,11 +2575,7 @@ DisplayServerOSX::~DisplayServerOSX() {
 #endif
 
 	CFNotificationCenterRemoveObserver(CFNotificationCenterGetDistributedCenter(), nullptr, kTISNotifySelectedKeyboardInputSourceChanged, nullptr);
-	CGDisplayRemoveReconfigurationCallback(displays_arrangement_changed, nullptr);
+	CGDisplayRemoveReconfigurationCallback(_displays_arrangement_changed, nullptr);
 
 	cursors_cache.clear();
 }
-
-void DisplayServerOSX::register_osx_driver() {
-	register_create_function("osx", create_func, get_rendering_drivers_func);
-}
diff --git a/platform/osx/gl_manager_osx.h b/platform/osx/gl_manager_osx_legacy.h
index 0229b672a2..b5a1b9dd98 100644
--- a/platform/osx/gl_manager_osx.h
+++ b/platform/osx/gl_manager_osx_legacy.h
@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  gl_manager_osx.h                                                     */
+/*  gl_manager_osx_legacy.h                                              */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef GL_MANAGER_OSX_H
-#define GL_MANAGER_OSX_H
+#ifndef GL_MANAGER_OSX_LEGACY_H
+#define GL_MANAGER_OSX_LEGACY_H
 
 #if defined(OSX_ENABLED) && defined(GLES3_ENABLED)
 
@@ -50,29 +50,21 @@ public:
 
 private:
 	struct GLWindow {
-		GLWindow() { in_use = false; }
-		bool in_use;
+		int width = 0;
+		int height = 0;
 
-		DisplayServer::WindowID window_id;
-		int width;
-		int height;
-
-		id window_view;
-		NSOpenGLContext *context;
+		id window_view = nullptr;
+		NSOpenGLContext *context = nullptr;
 	};
 
-	LocalVector<GLWindow> _windows;
-
-	NSOpenGLContext *_shared_context = nullptr;
-	GLWindow *_current_window;
+	Map<DisplayServer::WindowID, GLWindow> windows;
 
-	Error _create_context(GLWindow &win);
-	void _internal_set_current_window(GLWindow *p_win);
+	NSOpenGLContext *shared_context = nullptr;
+	DisplayServer::WindowID current_window = DisplayServer::INVALID_WINDOW_ID;
 
-	GLWindow &get_window(unsigned int id) { return _windows[id]; }
-	const GLWindow &get_window(unsigned int id) const { return _windows[id]; }
+	Error create_context(GLWindow &win);
 
-	bool use_vsync;
+	bool use_vsync = false;
 	ContextType context_type;
 
 public:
@@ -80,7 +72,6 @@ public:
 	void window_destroy(DisplayServer::WindowID p_window_id);
 	void window_resize(DisplayServer::WindowID p_window_id, int p_width, int p_height);
 
-	// get directly from the cached GLWindow
 	int window_get_width(DisplayServer::WindowID p_window_id = 0);
 	int window_get_height(DisplayServer::WindowID p_window_id = 0);
 
@@ -91,6 +82,7 @@ public:
 	void window_make_current(DisplayServer::WindowID p_window_id);
 
 	void window_update(DisplayServer::WindowID p_window_id);
+	void window_set_per_pixel_transparency_enabled(DisplayServer::WindowID p_window_id, bool p_enabled);
 
 	Error initialize();
 
@@ -101,6 +93,5 @@ public:
 	~GLManager_OSX();
 };
 
-#endif // defined(OSX_ENABLED) && defined(GLES3_ENABLED)
-
-#endif // GL_MANAGER_OSX_H
+#endif // OSX_ENABLED && GLES3_ENABLED
+#endif // GL_MANAGER_OSX_LEGACY_H
diff --git a/platform/osx/gl_manager_osx.mm b/platform/osx/gl_manager_osx_legacy.mm
index 3e70de8523..fbe64e32a3 100644
--- a/platform/osx/gl_manager_osx.mm
+++ b/platform/osx/gl_manager_osx_legacy.mm
@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  gl_manager_osx.mm                                                    */
+/*  gl_manager_osx_legacy.mm                                             */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "gl_manager_osx.h"
+#include "gl_manager_osx_legacy.h"
 
 #ifdef OSX_ENABLED
 #ifdef GLES3_ENABLED
@@ -36,7 +36,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-Error GLManager_OSX::_create_context(GLWindow &win) {
+Error GLManager_OSX::create_context(GLWindow &win) {
 	NSOpenGLPixelFormatAttribute attributes[] = {
 		NSOpenGLPFADoubleBuffer,
 		NSOpenGLPFAClosestPolicy,
@@ -50,10 +50,10 @@ Error GLManager_OSX::_create_context(GLWindow &win) {
 	NSOpenGLPixelFormat *pixel_format = [[NSOpenGLPixelFormat alloc] initWithAttributes:attributes];
 	ERR_FAIL_COND_V(pixel_format == nil, ERR_CANT_CREATE);
 
-	win.context = [[NSOpenGLContext alloc] initWithFormat:pixel_format shareContext:_shared_context];
+	win.context = [[NSOpenGLContext alloc] initWithFormat:pixel_format shareContext:shared_context];
 	ERR_FAIL_COND_V(win.context == nil, ERR_CANT_CREATE);
-	if (_shared_context == nullptr) {
-		_shared_context = win.context;
+	if (shared_context == nullptr) {
+		shared_context = win.context;
 	}
 
 	[win.context setView:win.window_view];
@@ -63,40 +63,27 @@ Error GLManager_OSX::_create_context(GLWindow &win) {
 }
 
 Error GLManager_OSX::window_create(DisplayServer::WindowID p_window_id, id p_view, int p_width, int p_height) {
-	if (p_window_id >= (int)_windows.size()) {
-		_windows.resize(p_window_id + 1);
-	}
-
-	GLWindow &win = _windows[p_window_id];
-	win.in_use = true;
-	win.window_id = p_window_id;
+	GLWindow win;
 	win.width = p_width;
 	win.height = p_height;
 	win.window_view = p_view;
 
-	if (_create_context(win) != OK) {
-		_windows.remove_at(_windows.size() - 1);
+	if (create_context(win) != OK) {
 		return FAILED;
 	}
 
-	window_make_current(_windows.size() - 1);
+	windows[p_window_id] = win;
+	window_make_current(p_window_id);
 
 	return OK;
 }
 
-void GLManager_OSX::_internal_set_current_window(GLWindow *p_win) {
-	_current_window = p_win;
-}
-
 void GLManager_OSX::window_resize(DisplayServer::WindowID p_window_id, int p_width, int p_height) {
-	if (p_window_id == -1) {
+	if (!windows.has(p_window_id)) {
 		return;
 	}
 
-	GLWindow &win = _windows[p_window_id];
-	if (!win.in_use) {
-		return;
-	}
+	GLWindow &win = windows[p_window_id];
 
 	win.width = p_width;
 	win.height = p_height;
@@ -116,24 +103,37 @@ void GLManager_OSX::window_resize(DisplayServer::WindowID p_window_id, int p_wid
 }
 
 int GLManager_OSX::window_get_width(DisplayServer::WindowID p_window_id) {
-	return get_window(p_window_id).width;
+	if (!windows.has(p_window_id)) {
+		return 0;
+	}
+
+	GLWindow &win = windows[p_window_id];
+	return win.width;
 }
 
 int GLManager_OSX::window_get_height(DisplayServer::WindowID p_window_id) {
-	return get_window(p_window_id).height;
+	if (!windows.has(p_window_id)) {
+		return 0;
+	}
+
+	GLWindow &win = windows[p_window_id];
+	return win.height;
 }
 
 void GLManager_OSX::window_destroy(DisplayServer::WindowID p_window_id) {
-	GLWindow &win = get_window(p_window_id);
-	win.in_use = false;
+	if (!windows.has(p_window_id)) {
+		return;
+	}
 
-	if (_current_window == &win) {
-		_current_window = nullptr;
+	if (current_window == p_window_id) {
+		current_window = DisplayServer::INVALID_WINDOW_ID;
 	}
+
+	windows.erase(p_window_id);
 }
 
 void GLManager_OSX::release_current() {
-	if (!_current_window) {
+	if (current_window == DisplayServer::INVALID_WINDOW_ID) {
 		return;
 	}
 
@@ -141,63 +141,59 @@ void GLManager_OSX::release_current() {
 }
 
 void GLManager_OSX::window_make_current(DisplayServer::WindowID p_window_id) {
-	if (p_window_id == -1) {
-		return;
-	}
-
-	GLWindow &win = _windows[p_window_id];
-	if (!win.in_use) {
+	if (current_window == p_window_id) {
 		return;
 	}
-
-	if (&win == _current_window) {
+	if (!windows.has(p_window_id)) {
 		return;
 	}
 
+	GLWindow &win = windows[p_window_id];
 	[win.context makeCurrentContext];
 
-	_internal_set_current_window(&win);
+	current_window = p_window_id;
 }
 
 void GLManager_OSX::make_current() {
-	if (!_current_window) {
+	if (current_window == DisplayServer::INVALID_WINDOW_ID) {
 		return;
 	}
-	if (!_current_window->in_use) {
-		WARN_PRINT("current window not in use!");
+	if (!windows.has(current_window)) {
 		return;
 	}
-	[_current_window->context makeCurrentContext];
+
+	GLWindow &win = windows[current_window];
+	[win.context makeCurrentContext];
 }
 
 void GLManager_OSX::swap_buffers() {
-	// NO NEED TO CALL SWAP BUFFERS for each window...
-	// see https://www.khronos.org/registry/OpenGL-Refpages/gl2.1/xhtml/glXSwapBuffers.xml
-
-	if (!_current_window) {
-		return;
-	}
-	if (!_current_window->in_use) {
-		WARN_PRINT("current window not in use!");
-		return;
+	for (Map<DisplayServer::WindowID, GLWindow>::Element *E = windows.front(); E; E = E->next()) {
+		[E->get().context flushBuffer];
 	}
-	[_current_window->context flushBuffer];
 }
 
 void GLManager_OSX::window_update(DisplayServer::WindowID p_window_id) {
-	if (p_window_id == -1) {
+	if (!windows.has(p_window_id)) {
 		return;
 	}
 
-	GLWindow &win = _windows[p_window_id];
-	if (!win.in_use) {
-		return;
-	}
+	GLWindow &win = windows[p_window_id];
+	[win.context update];
+}
 
-	if (&win == _current_window) {
+void GLManager_OSX::window_set_per_pixel_transparency_enabled(DisplayServer::WindowID p_window_id, bool p_enabled) {
+	if (!windows.has(p_window_id)) {
 		return;
 	}
 
+	GLWindow &win = windows[p_window_id];
+	if (p_enabled) {
+		GLint opacity = 0;
+		[win.context setValues:&opacity forParameter:NSOpenGLContextParameterSurfaceOpacity];
+	} else {
+		GLint opacity = 1;
+		[win.context setValues:&opacity forParameter:NSOpenGLContextParameterSurfaceOpacity];
+	}
 	[win.context update];
 }
 
@@ -207,6 +203,7 @@ Error GLManager_OSX::initialize() {
 
 void GLManager_OSX::set_use_vsync(bool p_use) {
 	use_vsync = p_use;
+
 	CGLContextObj ctx = CGLGetCurrentContext();
 	if (ctx) {
 		GLint swapInterval = p_use ? 1 : 0;
@@ -221,8 +218,6 @@ bool GLManager_OSX::is_using_vsync() const {
 
 GLManager_OSX::GLManager_OSX(ContextType p_context_type) {
 	context_type = p_context_type;
-	use_vsync = false;
-	_current_window = nullptr;
 }
 
 GLManager_OSX::~GLManager_OSX() {
diff --git a/platform/osx/godot_application.h b/platform/osx/godot_application.h
new file mode 100644
index 0000000000..8d48a659f3
--- /dev/null
+++ b/platform/osx/godot_application.h
@@ -0,0 +1,42 @@
+/*************************************************************************/
+/*  godot_application.h                                                  */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#ifndef GODOT_APPLICATION_H
+#define GODOT_APPLICATION_H
+
+#include "core/os/os.h"
+
+#import <AppKit/AppKit.h>
+#import <Foundation/Foundation.h>
+
+@interface GodotApplication : NSApplication
+@end
+
+#endif // GODOT_APPLICATION_H
diff --git a/platform/osx/godot_application.mm b/platform/osx/godot_application.mm
new file mode 100644
index 0000000000..00a58700e8
--- /dev/null
+++ b/platform/osx/godot_application.mm
@@ -0,0 +1,53 @@
+/*************************************************************************/
+/*  godot_application.mm                                                 */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#include "godot_application.h"
+
+#include "display_server_osx.h"
+
+@implementation GodotApplication
+
+- (void)sendEvent:(NSEvent *)event {
+	DisplayServerOSX *ds = (DisplayServerOSX *)DisplayServer::get_singleton();
+	if (ds) {
+		ds->send_event(event);
+	}
+
+	// From http://cocoadev.com/index.pl?GameKeyboardHandlingAlmost
+	// This works around an AppKit bug, where key up events while holding
+	// down the command key don't get sent to the key window.
+	if ([event type] == NSEventTypeKeyUp && ([event modifierFlags] & NSEventModifierFlagCommand)) {
+		[[self keyWindow] sendEvent:event];
+	} else {
+		[super sendEvent:event];
+	}
+}
+
+@end
diff --git a/platform/osx/godot_application_delegate.h b/platform/osx/godot_application_delegate.h
new file mode 100644
index 0000000000..8eec762d8f
--- /dev/null
+++ b/platform/osx/godot_application_delegate.h
@@ -0,0 +1,45 @@
+/*************************************************************************/
+/*  godot_application_delegate.h                                         */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#ifndef GODOT_APPLICATION_DELEGATE_H
+#define GODOT_APPLICATION_DELEGATE_H
+
+#include "core/os/os.h"
+
+#import <AppKit/AppKit.h>
+#import <Foundation/Foundation.h>
+
+@interface GodotApplicationDelegate : NSObject
+- (void)forceUnbundledWindowActivationHackStep1;
+- (void)forceUnbundledWindowActivationHackStep2;
+- (void)forceUnbundledWindowActivationHackStep3;
+@end
+
+#endif // GODOT_APPLICATION_DELEGATE_H
diff --git a/platform/osx/godot_application_delegate.mm b/platform/osx/godot_application_delegate.mm
new file mode 100644
index 0000000000..be284ba543
--- /dev/null
+++ b/platform/osx/godot_application_delegate.mm
@@ -0,0 +1,132 @@
+/*************************************************************************/
+/*  godot_application_delegate.mm                                        */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#include "godot_application_delegate.h"
+
+#include "display_server_osx.h"
+#include "os_osx.h"
+
+@implementation GodotApplicationDelegate
+
+- (void)forceUnbundledWindowActivationHackStep1 {
+	// Step 1: Switch focus to macOS SystemUIServer process.
+	// Required to perform step 2, TransformProcessType will fail if app is already the in focus.
+	for (NSRunningApplication *app in [NSRunningApplication runningApplicationsWithBundleIdentifier:@"com.apple.systemuiserver"]) {
+		[app activateWithOptions:NSApplicationActivateIgnoringOtherApps];
+		break;
+	}
+	[self performSelector:@selector(forceUnbundledWindowActivationHackStep2)
+			   withObject:nil
+			   afterDelay:0.02];
+}
+
+- (void)forceUnbundledWindowActivationHackStep2 {
+	// Step 2: Register app as foreground process.
+	ProcessSerialNumber psn = { 0, kCurrentProcess };
+	(void)TransformProcessType(&psn, kProcessTransformToForegroundApplication);
+	[self performSelector:@selector(forceUnbundledWindowActivationHackStep3) withObject:nil afterDelay:0.02];
+}
+
+- (void)forceUnbundledWindowActivationHackStep3 {
+	// Step 3: Switch focus back to app window.
+	[[NSRunningApplication currentApplication] activateWithOptions:NSApplicationActivateIgnoringOtherApps];
+}
+
+- (void)applicationDidFinishLaunching:(NSNotification *)notice {
+	NSString *nsappname = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleName"];
+	if (nsappname == nil || isatty(STDOUT_FILENO) || isatty(STDIN_FILENO) || isatty(STDERR_FILENO)) {
+		// If the executable is started from terminal or is not bundled, macOS WindowServer won't register and activate app window correctly (menu and title bar are grayed out and input ignored).
+		[self performSelector:@selector(forceUnbundledWindowActivationHackStep1) withObject:nil afterDelay:0.02];
+	}
+}
+
+- (void)applicationDidResignActive:(NSNotification *)notification {
+	if (OS::get_singleton()->get_main_loop()) {
+		OS::get_singleton()->get_main_loop()->notification(MainLoop::NOTIFICATION_APPLICATION_FOCUS_OUT);
+	}
+}
+
+- (void)applicationDidBecomeActive:(NSNotification *)notification {
+	if (OS::get_singleton()->get_main_loop()) {
+		OS::get_singleton()->get_main_loop()->notification(MainLoop::NOTIFICATION_APPLICATION_FOCUS_IN);
+	}
+}
+
+- (void)globalMenuCallback:(id)sender {
+	DisplayServerOSX *ds = (DisplayServerOSX *)DisplayServer::get_singleton();
+	if (ds) {
+		return ds->menu_callback(sender);
+	}
+}
+
+- (NSMenu *)applicationDockMenu:(NSApplication *)sender {
+	DisplayServerOSX *ds = (DisplayServerOSX *)DisplayServer::get_singleton();
+	if (ds) {
+		return ds->get_dock_menu();
+	} else {
+		return nullptr;
+	}
+}
+
+- (BOOL)application:(NSApplication *)sender openFile:(NSString *)filename {
+	// Note: may be called called before main loop init!
+	OS_OSX *os = (OS_OSX *)OS::get_singleton();
+	if (os) {
+		os->set_open_with_filename(String::utf8([filename UTF8String]));
+	}
+
+#ifdef TOOLS_ENABLED
+	// Open new instance.
+	if (os && os->get_main_loop()) {
+		List<String> args;
+		args.push_back(os->get_open_with_filename());
+		String exec = os->get_executable_path();
+		os->create_process(exec, args);
+	}
+#endif
+	return YES;
+}
+
+- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender {
+	DisplayServerOSX *ds = (DisplayServerOSX *)DisplayServer::get_singleton();
+	if (ds) {
+		ds->send_window_event(ds->get_window(DisplayServerOSX::MAIN_WINDOW_ID), DisplayServerOSX::WINDOW_EVENT_CLOSE_REQUEST);
+	}
+	return NSTerminateCancel;
+}
+
+- (void)showAbout:(id)sender {
+	OS_OSX *os = (OS_OSX *)OS::get_singleton();
+	if (os && os->get_main_loop()) {
+		os->get_main_loop()->notification(MainLoop::NOTIFICATION_WM_ABOUT);
+	}
+}
+
+@end
diff --git a/platform/osx/godot_content_view.h b/platform/osx/godot_content_view.h
new file mode 100644
index 0000000000..7942d716dc
--- /dev/null
+++ b/platform/osx/godot_content_view.h
@@ -0,0 +1,65 @@
+/*************************************************************************/
+/*  godot_content_view.h                                                 */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#ifndef GODOT_CONTENT_VIEW_H
+#define GODOT_CONTENT_VIEW_H
+
+#include "servers/display_server.h"
+
+#import <AppKit/AppKit.h>
+#import <Foundation/Foundation.h>
+
+#if defined(GLES3_ENABLED)
+#import <AppKit/NSOpenGLView.h>
+#define RootView NSOpenGLView
+#else
+#define RootView NSView
+#endif
+
+#import <QuartzCore/CAMetalLayer.h>
+
+@interface GodotContentView : RootView <NSTextInputClient> {
+	DisplayServer::WindowID window_id;
+	NSTrackingArea *tracking_area;
+	NSMutableAttributedString *marked_text;
+	bool ime_input_event_in_progress;
+	bool mouse_down_control;
+	bool ignore_momentum_scroll;
+}
+
+- (void)processScrollEvent:(NSEvent *)event button:(MouseButton)button factor:(double)factor;
+- (void)processPanEvent:(NSEvent *)event dx:(double)dx dy:(double)dy;
+- (void)processMouseEvent:(NSEvent *)event index:(MouseButton)index mask:(MouseButton)mask pressed:(bool)pressed;
+- (void)setWindowID:(DisplayServer::WindowID)wid;
+- (void)cancelComposition;
+
+@end
+
+#endif // GODOT_CONTENT_VIEW_H
diff --git a/platform/osx/godot_content_view.mm b/platform/osx/godot_content_view.mm
new file mode 100644
index 0000000000..4e831e1ccc
--- /dev/null
+++ b/platform/osx/godot_content_view.mm
@@ -0,0 +1,760 @@
+/*************************************************************************/
+/*  godot_content_view.mm                                                */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#include "godot_content_view.h"
+
+#include "display_server_osx.h"
+#include "key_mapping_osx.h"
+
+@implementation GodotContentView
+
+- (id)init {
+	self = [super init];
+	window_id = DisplayServer::INVALID_WINDOW_ID;
+	tracking_area = nil;
+	ime_input_event_in_progress = false;
+	mouse_down_control = false;
+	ignore_momentum_scroll = false;
+	[self updateTrackingAreas];
+
+	if (@available(macOS 10.13, *)) {
+		[self registerForDraggedTypes:[NSArray arrayWithObject:NSPasteboardTypeFileURL]];
+#if !defined(__aarch64__) // Do not build deprectead 10.13 code on ARM.
+	} else {
+		[self registerForDraggedTypes:[NSArray arrayWithObject:NSFilenamesPboardType]];
+#endif
+	}
+	marked_text = [[NSMutableAttributedString alloc] init];
+	return self;
+}
+
+- (void)setWindowID:(DisplayServerOSX::WindowID)wid {
+	window_id = wid;
+}
+
+// MARK: Backing Layer
+
+- (CALayer *)makeBackingLayer {
+	return [[CAMetalLayer class] layer];
+}
+
+- (void)updateLayer {
+	DisplayServerOSX *ds = (DisplayServerOSX *)DisplayServer::get_singleton();
+	ds->window_update(window_id);
+	[super updateLayer];
+}
+
+- (BOOL)wantsUpdateLayer {
+	return YES;
+}
+
+- (BOOL)isOpaque {
+	return YES;
+}
+
+// MARK: IME
+
+- (BOOL)hasMarkedText {
+	return (marked_text.length > 0);
+}
+
+- (NSRange)markedRange {
+	return NSMakeRange(0, marked_text.length);
+}
+
+- (NSRange)selectedRange {
+	static const NSRange kEmptyRange = { NSNotFound, 0 };
+	return kEmptyRange;
+}
+
+- (void)setMarkedText:(id)aString selectedRange:(NSRange)selectedRange replacementRange:(NSRange)replacementRange {
+	if ([aString isKindOfClass:[NSAttributedString class]]) {
+		marked_text = [[NSMutableAttributedString alloc] initWithAttributedString:aString];
+	} else {
+		marked_text = [[NSMutableAttributedString alloc] initWithString:aString];
+	}
+	if (marked_text.length == 0) {
+		[self unmarkText];
+		return;
+	}
+
+	DisplayServerOSX *ds = (DisplayServerOSX *)DisplayServer::get_singleton();
+	if (!ds || !ds->has_window(window_id)) {
+		return;
+	}
+
+	DisplayServerOSX::WindowData &wd = ds->get_window(window_id);
+	if (wd.im_active) {
+		ime_input_event_in_progress = true;
+		ds->update_im_text(Point2i(selectedRange.location, selectedRange.length), String::utf8([[marked_text mutableString] UTF8String]));
+	}
+}
+
+- (void)unmarkText {
+	ime_input_event_in_progress = false;
+	[[marked_text mutableString] setString:@""];
+
+	DisplayServerOSX *ds = (DisplayServerOSX *)DisplayServer::get_singleton();
+	if (!ds || !ds->has_window(window_id)) {
+		return;
+	}
+
+	DisplayServerOSX::WindowData &wd = ds->get_window(window_id);
+	if (wd.im_active) {
+		ds->update_im_text(Point2i(), String());
+	}
+}
+
+- (NSArray *)validAttributesForMarkedText {
+	return [NSArray array];
+}
+
+- (NSAttributedString *)attributedSubstringForProposedRange:(NSRange)aRange actualRange:(NSRangePointer)actualRange {
+	return nil;
+}
+
+- (NSUInteger)characterIndexForPoint:(NSPoint)aPoint {
+	return 0;
+}
+
+- (NSRect)firstRectForCharacterRange:(NSRange)aRange actualRange:(NSRangePointer)actualRange {
+	DisplayServerOSX *ds = (DisplayServerOSX *)DisplayServer::get_singleton();
+	if (!ds || !ds->has_window(window_id)) {
+		return NSMakeRect(0, 0, 0, 0);
+	}
+
+	DisplayServerOSX::WindowData &wd = ds->get_window(window_id);
+	const NSRect content_rect = [wd.window_view frame];
+	const float scale = ds->screen_get_max_scale();
+	NSRect point_in_window_rect = NSMakeRect(wd.im_position.x / scale, content_rect.size.height - (wd.im_position.y / scale) - 1, 0, 0);
+	NSPoint point_on_screen = [wd.window_object convertRectToScreen:point_in_window_rect].origin;
+
+	return NSMakeRect(point_on_screen.x, point_on_screen.y, 0, 0);
+}
+
+- (void)cancelComposition {
+	[self unmarkText];
+	[[NSTextInputContext currentInputContext] discardMarkedText];
+}
+
+- (void)insertText:(id)aString {
+	[self insertText:aString replacementRange:NSMakeRange(0, 0)];
+}
+
+- (void)insertText:(id)aString replacementRange:(NSRange)replacementRange {
+	NSEvent *event = [NSApp currentEvent];
+
+	NSString *characters;
+	if ([aString isKindOfClass:[NSAttributedString class]]) {
+		characters = [aString string];
+	} else {
+		characters = (NSString *)aString;
+	}
+
+	NSCharacterSet *ctrl_chars = [NSCharacterSet controlCharacterSet];
+	NSCharacterSet *wsnl_chars = [NSCharacterSet whitespaceAndNewlineCharacterSet];
+	if ([characters rangeOfCharacterFromSet:ctrl_chars].length && [characters rangeOfCharacterFromSet:wsnl_chars].length == 0) {
+		[[NSTextInputContext currentInputContext] discardMarkedText];
+		[self cancelComposition];
+		return;
+	}
+
+	DisplayServerOSX *ds = (DisplayServerOSX *)DisplayServer::get_singleton();
+	if (!ds || !ds->has_window(window_id)) {
+		[self cancelComposition];
+		return;
+	}
+
+	Char16String text;
+	text.resize([characters length] + 1);
+	[characters getCharacters:(unichar *)text.ptrw() range:NSMakeRange(0, [characters length])];
+
+	String u32text;
+	u32text.parse_utf16(text.ptr(), text.length());
+
+	for (int i = 0; i < u32text.length(); i++) {
+		const char32_t codepoint = u32text[i];
+		if ((codepoint & 0xFF00) == 0xF700) {
+			continue;
+		}
+
+		DisplayServerOSX::KeyEvent ke;
+
+		ke.window_id = window_id;
+		ke.osx_state = [event modifierFlags];
+		ke.pressed = true;
+		ke.echo = false;
+		ke.raw = false; // IME input event.
+		ke.keycode = Key::NONE;
+		ke.physical_keycode = Key::NONE;
+		ke.unicode = codepoint;
+
+		ds->push_to_key_event_buffer(ke);
+	}
+	[self cancelComposition];
+}
+
+// MARK: Drag and drop
+
+- (NSDragOperation)draggingEntered:(id<NSDraggingInfo>)sender {
+	return NSDragOperationCopy;
+}
+
+- (NSDragOperation)draggingUpdated:(id<NSDraggingInfo>)sender {
+	return NSDragOperationCopy;
+}
+
+- (BOOL)performDragOperation:(id<NSDraggingInfo>)sender {
+	DisplayServerOSX *ds = (DisplayServerOSX *)DisplayServer::get_singleton();
+	if (!ds || !ds->has_window(window_id)) {
+		return NO;
+	}
+
+	DisplayServerOSX::WindowData &wd = ds->get_window(window_id);
+	if (!wd.drop_files_callback.is_null()) {
+		Vector<String> files;
+		NSPasteboard *pboard = [sender draggingPasteboard];
+
+		if (@available(macOS 10.13, *)) {
+			NSArray *items = pboard.pasteboardItems;
+			for (NSPasteboardItem *item in items) {
+				NSString *url = [item stringForType:NSPasteboardTypeFileURL];
+				NSString *file = [NSURL URLWithString:url].path;
+				files.push_back(String::utf8([file UTF8String]));
+			}
+#if !defined(__aarch64__) // Do not build deprectead 10.13 code on ARM.
+		} else {
+			NSArray *filenames = [pboard propertyListForType:NSFilenamesPboardType];
+			for (NSString *file in filenames) {
+				files.push_back(String::utf8([file UTF8String]));
+			}
+#endif
+		}
+
+		Variant v = files;
+		Variant *vp = &v;
+		Variant ret;
+		Callable::CallError ce;
+		wd.drop_files_callback.call((const Variant **)&vp, 1, ret, ce);
+	}
+
+	return NO;
+}
+
+// MARK: Focus
+
+- (BOOL)canBecomeKeyView {
+	DisplayServerOSX *ds = (DisplayServerOSX *)DisplayServer::get_singleton();
+	if (!ds || !ds->has_window(window_id)) {
+		return YES;
+	}
+
+	DisplayServerOSX::WindowData &wd = ds->get_window(window_id);
+	return !wd.no_focus;
+}
+
+- (BOOL)acceptsFirstResponder {
+	return YES;
+}
+
+// MARK: Mouse
+
+- (void)cursorUpdate:(NSEvent *)event {
+	DisplayServerOSX *ds = (DisplayServerOSX *)DisplayServer::get_singleton();
+	if (!ds) {
+		return;
+	}
+
+	ds->cursor_update_shape();
+}
+
+- (void)processMouseEvent:(NSEvent *)event index:(MouseButton)index mask:(MouseButton)mask pressed:(bool)pressed {
+	DisplayServerOSX *ds = (DisplayServerOSX *)DisplayServer::get_singleton();
+	if (!ds || !ds->has_window(window_id)) {
+		return;
+	}
+
+	DisplayServerOSX::WindowData &wd = ds->get_window(window_id);
+	MouseButton last_button_state = ds->mouse_get_button_state();
+
+	if (pressed) {
+		last_button_state |= mask;
+	} else {
+		last_button_state &= (MouseButton)~mask;
+	}
+	ds->mouse_set_button_state(last_button_state);
+
+	Ref<InputEventMouseButton> mb;
+	mb.instantiate();
+	mb->set_window_id(window_id);
+	ds->update_mouse_pos(wd, [event locationInWindow]);
+	ds->get_key_modifier_state([event modifierFlags], mb);
+	mb->set_button_index(index);
+	mb->set_pressed(pressed);
+	mb->set_position(wd.mouse_pos);
+	mb->set_global_position(wd.mouse_pos);
+	mb->set_button_mask(last_button_state);
+	if (index == MouseButton::LEFT && pressed) {
+		mb->set_double_click([event clickCount] == 2);
+	}
+
+	Input::get_singleton()->parse_input_event(mb);
+}
+
+- (void)mouseDown:(NSEvent *)event {
+	if (([event modifierFlags] & NSEventModifierFlagControl)) {
+		mouse_down_control = true;
+		[self processMouseEvent:event index:MouseButton::RIGHT mask:MouseButton::MASK_RIGHT pressed:true];
+	} else {
+		mouse_down_control = false;
+		[self processMouseEvent:event index:MouseButton::LEFT mask:MouseButton::MASK_LEFT pressed:true];
+	}
+}
+
+- (void)mouseDragged:(NSEvent *)event {
+	[self mouseMoved:event];
+}
+
+- (void)mouseUp:(NSEvent *)event {
+	if (mouse_down_control) {
+		[self processMouseEvent:event index:MouseButton::RIGHT mask:MouseButton::MASK_RIGHT pressed:false];
+	} else {
+		[self processMouseEvent:event index:MouseButton::LEFT mask:MouseButton::MASK_LEFT pressed:false];
+	}
+}
+
+- (void)mouseMoved:(NSEvent *)event {
+	DisplayServerOSX *ds = (DisplayServerOSX *)DisplayServer::get_singleton();
+	if (!ds || !ds->has_window(window_id)) {
+		return;
+	}
+
+	DisplayServerOSX::WindowData &wd = ds->get_window(window_id);
+
+	NSPoint delta = NSMakePoint([event deltaX], [event deltaY]);
+	NSPoint mpos = [event locationInWindow];
+
+	if (ds->update_mouse_wrap(wd, delta, mpos, [event timestamp])) {
+		return;
+	}
+
+	Ref<InputEventMouseMotion> mm;
+	mm.instantiate();
+
+	mm->set_window_id(window_id);
+	mm->set_button_mask(ds->mouse_get_button_state());
+	ds->update_mouse_pos(wd, mpos);
+	mm->set_position(wd.mouse_pos);
+	mm->set_pressure([event pressure]);
+	if ([event subtype] == NSEventSubtypeTabletPoint) {
+		const NSPoint p = [event tilt];
+		mm->set_tilt(Vector2(p.x, p.y));
+	}
+	mm->set_global_position(wd.mouse_pos);
+	mm->set_velocity(Input::get_singleton()->get_last_mouse_velocity());
+	const Vector2i relativeMotion = Vector2i(delta.x, delta.y) * ds->screen_get_max_scale();
+	mm->set_relative(relativeMotion);
+	ds->get_key_modifier_state([event modifierFlags], mm);
+
+	Input::get_singleton()->parse_input_event(mm);
+}
+
+- (void)rightMouseDown:(NSEvent *)event {
+	[self processMouseEvent:event index:MouseButton::RIGHT mask:MouseButton::MASK_RIGHT pressed:true];
+}
+
+- (void)rightMouseDragged:(NSEvent *)event {
+	[self mouseMoved:event];
+}
+
+- (void)rightMouseUp:(NSEvent *)event {
+	[self processMouseEvent:event index:MouseButton::RIGHT mask:MouseButton::MASK_RIGHT pressed:false];
+}
+
+- (void)otherMouseDown:(NSEvent *)event {
+	if ((int)[event buttonNumber] == 2) {
+		[self processMouseEvent:event index:MouseButton::MIDDLE mask:MouseButton::MASK_MIDDLE pressed:true];
+	} else if ((int)[event buttonNumber] == 3) {
+		[self processMouseEvent:event index:MouseButton::MB_XBUTTON1 mask:MouseButton::MASK_XBUTTON1 pressed:true];
+	} else if ((int)[event buttonNumber] == 4) {
+		[self processMouseEvent:event index:MouseButton::MB_XBUTTON2 mask:MouseButton::MASK_XBUTTON2 pressed:true];
+	} else {
+		return;
+	}
+}
+
+- (void)otherMouseDragged:(NSEvent *)event {
+	[self mouseMoved:event];
+}
+
+- (void)otherMouseUp:(NSEvent *)event {
+	if ((int)[event buttonNumber] == 2) {
+		[self processMouseEvent:event index:MouseButton::MIDDLE mask:MouseButton::MASK_MIDDLE pressed:false];
+	} else if ((int)[event buttonNumber] == 3) {
+		[self processMouseEvent:event index:MouseButton::MB_XBUTTON1 mask:MouseButton::MASK_XBUTTON1 pressed:false];
+	} else if ((int)[event buttonNumber] == 4) {
+		[self processMouseEvent:event index:MouseButton::MB_XBUTTON2 mask:MouseButton::MASK_XBUTTON2 pressed:false];
+	} else {
+		return;
+	}
+}
+
+- (void)mouseExited:(NSEvent *)event {
+	DisplayServerOSX *ds = (DisplayServerOSX *)DisplayServer::get_singleton();
+	if (!ds || !ds->has_window(window_id)) {
+		return;
+	}
+
+	DisplayServerOSX::WindowData &wd = ds->get_window(window_id);
+	if (ds->mouse_get_mode() != DisplayServer::MOUSE_MODE_CAPTURED) {
+		ds->send_window_event(wd, DisplayServerOSX::WINDOW_EVENT_MOUSE_EXIT);
+	}
+}
+
+- (void)mouseEntered:(NSEvent *)event {
+	DisplayServerOSX *ds = (DisplayServerOSX *)DisplayServer::get_singleton();
+	if (!ds || !ds->has_window(window_id)) {
+		return;
+	}
+
+	DisplayServerOSX::WindowData &wd = ds->get_window(window_id);
+	if (ds->mouse_get_mode() != DisplayServer::MOUSE_MODE_CAPTURED) {
+		ds->send_window_event(wd, DisplayServerOSX::WINDOW_EVENT_MOUSE_ENTER);
+	}
+
+	ds->cursor_update_shape();
+}
+
+- (void)magnifyWithEvent:(NSEvent *)event {
+	DisplayServerOSX *ds = (DisplayServerOSX *)DisplayServer::get_singleton();
+	if (!ds || !ds->has_window(window_id)) {
+		return;
+	}
+
+	DisplayServerOSX::WindowData &wd = ds->get_window(window_id);
+
+	Ref<InputEventMagnifyGesture> ev;
+	ev.instantiate();
+	ev->set_window_id(window_id);
+	ds->get_key_modifier_state([event modifierFlags], ev);
+	ds->update_mouse_pos(wd, [event locationInWindow]);
+	ev->set_position(wd.mouse_pos);
+	ev->set_factor([event magnification] + 1.0);
+
+	Input::get_singleton()->parse_input_event(ev);
+}
+
+- (void)updateTrackingAreas {
+	if (tracking_area != nil) {
+		[self removeTrackingArea:tracking_area];
+	}
+
+	NSTrackingAreaOptions options = NSTrackingMouseEnteredAndExited | NSTrackingActiveInKeyWindow | NSTrackingCursorUpdate | NSTrackingInVisibleRect;
+	tracking_area = [[NSTrackingArea alloc] initWithRect:[self bounds] options:options owner:self userInfo:nil];
+
+	[self addTrackingArea:tracking_area];
+	[super updateTrackingAreas];
+}
+
+// MARK: Keyboard
+
+- (void)keyDown:(NSEvent *)event {
+	DisplayServerOSX *ds = (DisplayServerOSX *)DisplayServer::get_singleton();
+	if (!ds || !ds->has_window(window_id)) {
+		return;
+	}
+
+	DisplayServerOSX::WindowData &wd = ds->get_window(window_id);
+
+	ignore_momentum_scroll = true;
+
+	// Ignore all input if IME input is in progress.
+	if (!ime_input_event_in_progress) {
+		NSString *characters = [event characters];
+		NSUInteger length = [characters length];
+
+		if (!wd.im_active && length > 0 && keycode_has_unicode(KeyMappingOSX::remap_key([event keyCode], [event modifierFlags]))) {
+			// Fallback unicode character handler used if IME is not active.
+			Char16String text;
+			text.resize([characters length] + 1);
+			[characters getCharacters:(unichar *)text.ptrw() range:NSMakeRange(0, [characters length])];
+
+			String u32text;
+			u32text.parse_utf16(text.ptr(), text.length());
+
+			for (int i = 0; i < u32text.length(); i++) {
+				const char32_t codepoint = u32text[i];
+
+				DisplayServerOSX::KeyEvent ke;
+
+				ke.window_id = window_id;
+				ke.osx_state = [event modifierFlags];
+				ke.pressed = true;
+				ke.echo = [event isARepeat];
+				ke.keycode = KeyMappingOSX::remap_key([event keyCode], [event modifierFlags]);
+				ke.physical_keycode = KeyMappingOSX::translate_key([event keyCode]);
+				ke.raw = true;
+				ke.unicode = codepoint;
+
+				ds->push_to_key_event_buffer(ke);
+			}
+		} else {
+			DisplayServerOSX::KeyEvent ke;
+
+			ke.window_id = window_id;
+			ke.osx_state = [event modifierFlags];
+			ke.pressed = true;
+			ke.echo = [event isARepeat];
+			ke.keycode = KeyMappingOSX::remap_key([event keyCode], [event modifierFlags]);
+			ke.physical_keycode = KeyMappingOSX::translate_key([event keyCode]);
+			ke.raw = false;
+			ke.unicode = 0;
+
+			ds->push_to_key_event_buffer(ke);
+		}
+	}
+
+	// Pass events to IME handler
+	if (wd.im_active) {
+		[self interpretKeyEvents:[NSArray arrayWithObject:event]];
+	}
+}
+
+- (void)flagsChanged:(NSEvent *)event {
+	DisplayServerOSX *ds = (DisplayServerOSX *)DisplayServer::get_singleton();
+	if (!ds || !ds->has_window(window_id)) {
+		return;
+	}
+	ignore_momentum_scroll = true;
+
+	// Ignore all input if IME input is in progress
+	if (!ime_input_event_in_progress) {
+		DisplayServerOSX::KeyEvent ke;
+
+		ke.window_id = window_id;
+		ke.echo = false;
+		ke.raw = true;
+
+		int key = [event keyCode];
+		int mod = [event modifierFlags];
+
+		if (key == 0x36 || key == 0x37) {
+			if (mod & NSEventModifierFlagCommand) {
+				mod &= ~NSEventModifierFlagCommand;
+				ke.pressed = true;
+			} else {
+				ke.pressed = false;
+			}
+		} else if (key == 0x38 || key == 0x3c) {
+			if (mod & NSEventModifierFlagShift) {
+				mod &= ~NSEventModifierFlagShift;
+				ke.pressed = true;
+			} else {
+				ke.pressed = false;
+			}
+		} else if (key == 0x3a || key == 0x3d) {
+			if (mod & NSEventModifierFlagOption) {
+				mod &= ~NSEventModifierFlagOption;
+				ke.pressed = true;
+			} else {
+				ke.pressed = false;
+			}
+		} else if (key == 0x3b || key == 0x3e) {
+			if (mod & NSEventModifierFlagControl) {
+				mod &= ~NSEventModifierFlagControl;
+				ke.pressed = true;
+			} else {
+				ke.pressed = false;
+			}
+		} else {
+			return;
+		}
+
+		ke.osx_state = mod;
+		ke.keycode = KeyMappingOSX::remap_key(key, mod);
+		ke.physical_keycode = KeyMappingOSX::translate_key(key);
+		ke.unicode = 0;
+
+		ds->push_to_key_event_buffer(ke);
+	}
+}
+
+- (void)keyUp:(NSEvent *)event {
+	DisplayServerOSX *ds = (DisplayServerOSX *)DisplayServer::get_singleton();
+	if (!ds || !ds->has_window(window_id)) {
+		return;
+	}
+
+	DisplayServerOSX::WindowData &wd = ds->get_window(window_id);
+
+	// Ignore all input if IME input is in progress.
+	if (!ime_input_event_in_progress) {
+		NSString *characters = [event characters];
+		NSUInteger length = [characters length];
+
+		// Fallback unicode character handler used if IME is not active.
+		if (!wd.im_active && length > 0 && keycode_has_unicode(KeyMappingOSX::remap_key([event keyCode], [event modifierFlags]))) {
+			Char16String text;
+			text.resize([characters length] + 1);
+			[characters getCharacters:(unichar *)text.ptrw() range:NSMakeRange(0, [characters length])];
+
+			String u32text;
+			u32text.parse_utf16(text.ptr(), text.length());
+
+			for (int i = 0; i < u32text.length(); i++) {
+				const char32_t codepoint = u32text[i];
+				DisplayServerOSX::KeyEvent ke;
+
+				ke.window_id = window_id;
+				ke.osx_state = [event modifierFlags];
+				ke.pressed = false;
+				ke.echo = [event isARepeat];
+				ke.keycode = KeyMappingOSX::remap_key([event keyCode], [event modifierFlags]);
+				ke.physical_keycode = KeyMappingOSX::translate_key([event keyCode]);
+				ke.raw = true;
+				ke.unicode = codepoint;
+
+				ds->push_to_key_event_buffer(ke);
+			}
+		} else {
+			DisplayServerOSX::KeyEvent ke;
+
+			ke.window_id = window_id;
+			ke.osx_state = [event modifierFlags];
+			ke.pressed = false;
+			ke.echo = [event isARepeat];
+			ke.keycode = KeyMappingOSX::remap_key([event keyCode], [event modifierFlags]);
+			ke.physical_keycode = KeyMappingOSX::translate_key([event keyCode]);
+			ke.raw = true;
+			ke.unicode = 0;
+
+			ds->push_to_key_event_buffer(ke);
+		}
+	}
+}
+
+// MARK: Scroll and pan
+
+- (void)processScrollEvent:(NSEvent *)event button:(MouseButton)button factor:(double)factor {
+	DisplayServerOSX *ds = (DisplayServerOSX *)DisplayServer::get_singleton();
+	if (!ds || !ds->has_window(window_id)) {
+		return;
+	}
+
+	DisplayServerOSX::WindowData &wd = ds->get_window(window_id);
+	MouseButton mask = mouse_button_to_mask(button);
+
+	Ref<InputEventMouseButton> sc;
+	sc.instantiate();
+
+	sc->set_window_id(window_id);
+	ds->get_key_modifier_state([event modifierFlags], sc);
+	sc->set_button_index(button);
+	sc->set_factor(factor);
+	sc->set_pressed(true);
+	sc->set_position(wd.mouse_pos);
+	sc->set_global_position(wd.mouse_pos);
+	MouseButton last_button_state = ds->mouse_get_button_state() | (MouseButton)mask;
+	sc->set_button_mask(last_button_state);
+	ds->mouse_set_button_state(last_button_state);
+
+	Input::get_singleton()->parse_input_event(sc);
+
+	sc.instantiate();
+	sc->set_window_id(window_id);
+	sc->set_button_index(button);
+	sc->set_factor(factor);
+	sc->set_pressed(false);
+	sc->set_position(wd.mouse_pos);
+	sc->set_global_position(wd.mouse_pos);
+	last_button_state &= (MouseButton)~mask;
+	sc->set_button_mask(last_button_state);
+	ds->mouse_set_button_state(last_button_state);
+
+	Input::get_singleton()->parse_input_event(sc);
+}
+
+- (void)processPanEvent:(NSEvent *)event dx:(double)dx dy:(double)dy {
+	DisplayServerOSX *ds = (DisplayServerOSX *)DisplayServer::get_singleton();
+	if (!ds || !ds->has_window(window_id)) {
+		return;
+	}
+
+	DisplayServerOSX::WindowData &wd = ds->get_window(window_id);
+
+	Ref<InputEventPanGesture> pg;
+	pg.instantiate();
+
+	pg->set_window_id(window_id);
+	ds->get_key_modifier_state([event modifierFlags], pg);
+	pg->set_position(wd.mouse_pos);
+	pg->set_delta(Vector2(-dx, -dy));
+
+	Input::get_singleton()->parse_input_event(pg);
+}
+
+- (void)scrollWheel:(NSEvent *)event {
+	DisplayServerOSX *ds = (DisplayServerOSX *)DisplayServer::get_singleton();
+	if (!ds || !ds->has_window(window_id)) {
+		return;
+	}
+
+	DisplayServerOSX::WindowData &wd = ds->get_window(window_id);
+	ds->update_mouse_pos(wd, [event locationInWindow]);
+
+	double delta_x = [event scrollingDeltaX];
+	double delta_y = [event scrollingDeltaY];
+
+	if ([event hasPreciseScrollingDeltas]) {
+		delta_x *= 0.03;
+		delta_y *= 0.03;
+	}
+
+	if ([event momentumPhase] != NSEventPhaseNone) {
+		if (ignore_momentum_scroll) {
+			return;
+		}
+	} else {
+		ignore_momentum_scroll = false;
+	}
+
+	if ([event phase] != NSEventPhaseNone || [event momentumPhase] != NSEventPhaseNone) {
+		[self processPanEvent:event dx:delta_x dy:delta_y];
+	} else {
+		if (fabs(delta_x)) {
+			[self processScrollEvent:event button:(0 > delta_x ? MouseButton::WHEEL_RIGHT : MouseButton::WHEEL_LEFT) factor:fabs(delta_x * 0.3)];
+		}
+		if (fabs(delta_y)) {
+			[self processScrollEvent:event button:(0 < delta_y ? MouseButton::WHEEL_UP : MouseButton::WHEEL_DOWN) factor:fabs(delta_y * 0.3)];
+		}
+	}
+}
+
+@end
diff --git a/platform/osx/godot_main_osx.mm b/platform/osx/godot_main_osx.mm
index 64a93f7292..7fabfaa1b7 100644
--- a/platform/osx/godot_main_osx.mm
+++ b/platform/osx/godot_main_osx.mm
@@ -37,7 +37,7 @@
 
 int main(int argc, char **argv) {
 #if defined(VULKAN_ENABLED)
-	// MoltenVK - enable full component swizzling support
+	// MoltenVK - enable full component swizzling support.
 	setenv("MVK_CONFIG_FULL_IMAGE_VIEW_SWIZZLE", "1", 1);
 #endif
 
@@ -45,13 +45,14 @@ int main(int argc, char **argv) {
 	const char *dbg_arg = "-NSDocumentRevisionsDebugMode";
 	printf("arguments\n");
 	for (int i = 0; i < argc; i++) {
-		if (strcmp(dbg_arg, argv[i]) == 0)
+		if (strcmp(dbg_arg, argv[i]) == 0) {
 			first_arg = i + 2;
+		}
 		printf("%i: %s\n", i, argv[i]);
 	};
 
 #ifdef DEBUG_ENABLED
-	// lets report the path we made current after all that
+	// Lets report the path we made current after all that.
 	char cwd[4096];
 	getcwd(cwd, 4096);
 	printf("Current path: %s\n", cwd);
@@ -60,23 +61,25 @@ int main(int argc, char **argv) {
 	OS_OSX os;
 	Error err;
 
-	// We must override main when testing is enabled
+	// We must override main when testing is enabled.
 	TEST_MAIN_OVERRIDE
 
-	if (os.open_with_filename != "") {
-		char *argv_c = (char *)malloc(os.open_with_filename.utf8().size());
-		memcpy(argv_c, os.open_with_filename.utf8().get_data(), os.open_with_filename.utf8().size());
+	if (os.get_open_with_filename() != "") {
+		char *argv_c = (char *)malloc(os.get_open_with_filename().utf8().size());
+		memcpy(argv_c, os.get_open_with_filename().utf8().get_data(), os.get_open_with_filename().utf8().size());
 		err = Main::setup(argv[0], 1, &argv_c);
 		free(argv_c);
 	} else {
 		err = Main::setup(argv[0], argc - first_arg, &argv[first_arg]);
 	}
 
-	if (err != OK)
+	if (err != OK) {
 		return 255;
+	}
 
-	if (Main::start())
-		os.run(); // it is actually the OS that decides how to run
+	if (Main::start()) {
+		os.run(); // It is actually the OS that decides how to run.
+	}
 
 	Main::cleanup();
 
diff --git a/platform/osx/godot_menu_item.h b/platform/osx/godot_menu_item.h
new file mode 100644
index 0000000000..50c4709c18
--- /dev/null
+++ b/platform/osx/godot_menu_item.h
@@ -0,0 +1,52 @@
+/*************************************************************************/
+/*  godot_menu_item.h                                                    */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#ifndef GODOT_MENU_ITEM_H
+#define GODOT_MENU_ITEM_H
+
+#include "servers/display_server.h"
+
+#import <AppKit/AppKit.h>
+#import <Foundation/Foundation.h>
+
+@interface GodotMenuItem : NSObject {
+@public
+	Callable callback;
+	Variant meta;
+	int id;
+	bool checkable;
+}
+
+@end
+
+@implementation GodotMenuItem
+@end
+
+#endif // GODOT_MENU_ITEM_H
diff --git a/platform/osx/godot_window.h b/platform/osx/godot_window.h
new file mode 100644
index 0000000000..16ff101142
--- /dev/null
+++ b/platform/osx/godot_window.h
@@ -0,0 +1,47 @@
+/*************************************************************************/
+/*  godot_window.h                                                       */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#ifndef GODOT_WINDOW_H
+#define GODOT_WINDOW_H
+
+#include "servers/display_server.h"
+
+#import <AppKit/AppKit.h>
+#import <Foundation/Foundation.h>
+
+@interface GodotWindow : NSWindow {
+	DisplayServer::WindowID window_id;
+}
+
+- (void)setWindowID:(DisplayServer::WindowID)wid;
+
+@end
+
+#endif //GODOT_WINDOW_H
diff --git a/platform/osx/godot_window.mm b/platform/osx/godot_window.mm
new file mode 100644
index 0000000000..e392cfb384
--- /dev/null
+++ b/platform/osx/godot_window.mm
@@ -0,0 +1,69 @@
+/*************************************************************************/
+/*  godot_window.mm                                                      */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#include "godot_window.h"
+
+#include "display_server_osx.h"
+
+@implementation GodotWindow
+
+- (id)init {
+	self = [super init];
+	window_id = DisplayServer::INVALID_WINDOW_ID;
+	return self;
+}
+
+- (void)setWindowID:(DisplayServerOSX::WindowID)wid {
+	window_id = wid;
+}
+
+- (BOOL)canBecomeKeyWindow {
+	// Required for NSBorderlessWindowMask windows.
+	DisplayServerOSX *ds = (DisplayServerOSX *)DisplayServer::get_singleton();
+	if (!ds || !ds->has_window(window_id)) {
+		return YES;
+	}
+
+	DisplayServerOSX::WindowData &wd = ds->get_window(window_id);
+	return !wd.no_focus;
+}
+
+- (BOOL)canBecomeMainWindow {
+	// Required for NSBorderlessWindowMask windows.
+	DisplayServerOSX *ds = (DisplayServerOSX *)DisplayServer::get_singleton();
+	if (!ds || !ds->has_window(window_id)) {
+		return YES;
+	}
+
+	DisplayServerOSX::WindowData &wd = ds->get_window(window_id);
+	return !wd.no_focus;
+}
+
+@end
diff --git a/platform/osx/godot_window_delegate.h b/platform/osx/godot_window_delegate.h
new file mode 100644
index 0000000000..8a1f681fcd
--- /dev/null
+++ b/platform/osx/godot_window_delegate.h
@@ -0,0 +1,47 @@
+/*************************************************************************/
+/*  godot_window_delegate.h                                              */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#ifndef GODOT_WINDOW_DELEGATE_H
+#define GODOT_WINDOW_DELEGATE_H
+
+#include "servers/display_server.h"
+
+#import <AppKit/AppKit.h>
+#import <Foundation/Foundation.h>
+
+@interface GodotWindowDelegate : NSObject <NSWindowDelegate> {
+	DisplayServer::WindowID window_id;
+}
+
+- (void)setWindowID:(DisplayServer::WindowID)wid;
+
+@end
+
+#endif //GODOT_WINDOW_DELEGATE_H
diff --git a/platform/osx/godot_window_delegate.mm b/platform/osx/godot_window_delegate.mm
new file mode 100644
index 0000000000..1742be987d
--- /dev/null
+++ b/platform/osx/godot_window_delegate.mm
@@ -0,0 +1,254 @@
+/*************************************************************************/
+/*  godot_window_delegate.mm                                             */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#include "godot_window_delegate.h"
+
+#include "display_server_osx.h"
+
+@implementation GodotWindowDelegate
+
+- (void)setWindowID:(DisplayServer::WindowID)wid {
+	window_id = wid;
+}
+
+- (BOOL)windowShouldClose:(id)sender {
+	DisplayServerOSX *ds = (DisplayServerOSX *)DisplayServer::get_singleton();
+	if (!ds || !ds->has_window(window_id)) {
+		return YES;
+	}
+
+	ds->send_window_event(ds->get_window(window_id), DisplayServerOSX::WINDOW_EVENT_CLOSE_REQUEST);
+	return NO;
+}
+
+- (void)windowWillClose:(NSNotification *)notification {
+	DisplayServerOSX *ds = (DisplayServerOSX *)DisplayServer::get_singleton();
+	if (!ds || !ds->has_window(window_id)) {
+		return;
+	}
+
+	DisplayServerOSX::WindowData &wd = ds->get_window(window_id);
+	while (wd.transient_children.size()) {
+		ds->window_set_transient(wd.transient_children.front()->get(), DisplayServerOSX::INVALID_WINDOW_ID);
+	}
+
+	if (wd.transient_parent != DisplayServerOSX::INVALID_WINDOW_ID) {
+		ds->window_set_transient(window_id, DisplayServerOSX::INVALID_WINDOW_ID);
+	}
+
+	ds->window_destroy(window_id);
+}
+
+- (void)windowDidEnterFullScreen:(NSNotification *)notification {
+	DisplayServerOSX *ds = (DisplayServerOSX *)DisplayServer::get_singleton();
+	if (!ds || !ds->has_window(window_id)) {
+		return;
+	}
+
+	DisplayServerOSX::WindowData &wd = ds->get_window(window_id);
+	wd.fullscreen = true;
+	// Reset window size limits.
+	[wd.window_object setContentMinSize:NSMakeSize(0, 0)];
+	[wd.window_object setContentMaxSize:NSMakeSize(FLT_MAX, FLT_MAX)];
+
+	// Force window resize event.
+	[self windowDidResize:notification];
+}
+
+- (void)windowDidExitFullScreen:(NSNotification *)notification {
+	DisplayServerOSX *ds = (DisplayServerOSX *)DisplayServer::get_singleton();
+	if (!ds || !ds->has_window(window_id)) {
+		return;
+	}
+
+	DisplayServerOSX::WindowData &wd = ds->get_window(window_id);
+	wd.fullscreen = false;
+
+	// Set window size limits.
+	const float scale = ds->screen_get_max_scale();
+	if (wd.min_size != Size2i()) {
+		Size2i size = wd.min_size / scale;
+		[wd.window_object setContentMinSize:NSMakeSize(size.x, size.y)];
+	}
+	if (wd.max_size != Size2i()) {
+		Size2i size = wd.max_size / scale;
+		[wd.window_object setContentMaxSize:NSMakeSize(size.x, size.y)];
+	}
+
+	// Restore resizability state.
+	if (wd.resize_disabled) {
+		[wd.window_object setStyleMask:[wd.window_object styleMask] & ~NSWindowStyleMaskResizable];
+	}
+
+	// Restore on-top state.
+	if (wd.on_top) {
+		[wd.window_object setLevel:NSFloatingWindowLevel];
+	}
+
+	// Force window resize event.
+	[self windowDidResize:notification];
+}
+
+- (void)windowDidChangeBackingProperties:(NSNotification *)notification {
+	DisplayServerOSX *ds = (DisplayServerOSX *)DisplayServer::get_singleton();
+	if (!ds || !ds->has_window(window_id)) {
+		return;
+	}
+
+	DisplayServerOSX::WindowData &wd = ds->get_window(window_id);
+
+	CGFloat new_scale_factor = [wd.window_object backingScaleFactor];
+	CGFloat old_scale_factor = [[[notification userInfo] objectForKey:@"NSBackingPropertyOldScaleFactorKey"] doubleValue];
+
+	if (new_scale_factor != old_scale_factor) {
+		// Set new display scale and window size.
+		const float scale = ds->screen_get_max_scale();
+		const NSRect content_rect = [wd.window_view frame];
+
+		wd.size.width = content_rect.size.width * scale;
+		wd.size.height = content_rect.size.height * scale;
+
+		ds->send_window_event(wd, DisplayServerOSX::WINDOW_EVENT_DPI_CHANGE);
+
+		CALayer *layer = [wd.window_view layer];
+		if (layer) {
+			layer.contentsScale = scale;
+		}
+
+		//Force window resize event
+		[self windowDidResize:notification];
+	}
+}
+
+- (void)windowDidResize:(NSNotification *)notification {
+	DisplayServerOSX *ds = (DisplayServerOSX *)DisplayServer::get_singleton();
+	if (!ds || !ds->has_window(window_id)) {
+		return;
+	}
+
+	DisplayServerOSX::WindowData &wd = ds->get_window(window_id);
+	const NSRect content_rect = [wd.window_view frame];
+	const float scale = ds->screen_get_max_scale();
+	wd.size.width = content_rect.size.width * scale;
+	wd.size.height = content_rect.size.height * scale;
+
+	CALayer *layer = [wd.window_view layer];
+	if (layer) {
+		layer.contentsScale = scale;
+	}
+
+	ds->window_resize(window_id, wd.size.width, wd.size.height);
+
+	if (!wd.rect_changed_callback.is_null()) {
+		Variant size = Rect2i(ds->window_get_position(window_id), ds->window_get_size(window_id));
+		Variant *sizep = &size;
+		Variant ret;
+		Callable::CallError ce;
+		wd.rect_changed_callback.call((const Variant **)&sizep, 1, ret, ce);
+	}
+}
+
+- (void)windowDidMove:(NSNotification *)notification {
+	DisplayServerOSX *ds = (DisplayServerOSX *)DisplayServer::get_singleton();
+	if (!ds || !ds->has_window(window_id)) {
+		return;
+	}
+
+	DisplayServerOSX::WindowData &wd = ds->get_window(window_id);
+	ds->release_pressed_events();
+
+	if (!wd.rect_changed_callback.is_null()) {
+		Variant size = Rect2i(ds->window_get_position(window_id), ds->window_get_size(window_id));
+		Variant *sizep = &size;
+		Variant ret;
+		Callable::CallError ce;
+		wd.rect_changed_callback.call((const Variant **)&sizep, 1, ret, ce);
+	}
+}
+
+- (void)windowDidBecomeKey:(NSNotification *)notification {
+	DisplayServerOSX *ds = (DisplayServerOSX *)DisplayServer::get_singleton();
+	if (!ds || !ds->has_window(window_id)) {
+		return;
+	}
+
+	DisplayServerOSX::WindowData &wd = ds->get_window(window_id);
+
+	if (ds->mouse_get_mode() == DisplayServer::MOUSE_MODE_CAPTURED) {
+		const NSRect content_rect = [wd.window_view frame];
+		NSRect point_in_window_rect = NSMakeRect(content_rect.size.width / 2, content_rect.size.height / 2, 0, 0);
+		NSPoint point_on_screen = [[wd.window_view window] convertRectToScreen:point_in_window_rect].origin;
+		CGPoint mouse_warp_pos = { point_on_screen.x, CGDisplayBounds(CGMainDisplayID()).size.height - point_on_screen.y };
+		CGWarpMouseCursorPosition(mouse_warp_pos);
+	} else {
+		ds->update_mouse_pos(wd, [wd.window_object mouseLocationOutsideOfEventStream]);
+	}
+
+	ds->set_last_focused_window(window_id);
+	ds->send_window_event(wd, DisplayServerOSX::WINDOW_EVENT_FOCUS_IN);
+}
+
+- (void)windowDidResignKey:(NSNotification *)notification {
+	DisplayServerOSX *ds = (DisplayServerOSX *)DisplayServer::get_singleton();
+	if (!ds || !ds->has_window(window_id)) {
+		return;
+	}
+
+	DisplayServerOSX::WindowData &wd = ds->get_window(window_id);
+
+	ds->release_pressed_events();
+	ds->send_window_event(wd, DisplayServerOSX::WINDOW_EVENT_FOCUS_OUT);
+}
+
+- (void)windowDidMiniaturize:(NSNotification *)notification {
+	DisplayServerOSX *ds = (DisplayServerOSX *)DisplayServer::get_singleton();
+	if (!ds || !ds->has_window(window_id)) {
+		return;
+	}
+
+	DisplayServerOSX::WindowData &wd = ds->get_window(window_id);
+
+	ds->release_pressed_events();
+	ds->send_window_event(wd, DisplayServerOSX::WINDOW_EVENT_FOCUS_OUT);
+}
+
+- (void)windowDidDeminiaturize:(NSNotification *)notification {
+	DisplayServerOSX *ds = (DisplayServerOSX *)DisplayServer::get_singleton();
+	if (!ds || !ds->has_window(window_id)) {
+		return;
+	}
+
+	DisplayServerOSX::WindowData &wd = ds->get_window(window_id);
+
+	ds->set_last_focused_window(window_id);
+	ds->send_window_event(wd, DisplayServerOSX::WINDOW_EVENT_FOCUS_IN);
+}
+
+@end
diff --git a/platform/osx/joypad_osx.cpp b/platform/osx/joypad_osx.cpp
index c2356f12cd..d518206f04 100644
--- a/platform/osx/joypad_osx.cpp
+++ b/platform/osx/joypad_osx.cpp
@@ -80,7 +80,7 @@ int joypad::get_hid_element_state(rec_element *p_element) const {
 		if (IOHIDDeviceGetValue(device_ref, p_element->ref, &valueRef) == kIOReturnSuccess) {
 			value = (SInt32)IOHIDValueGetIntegerValue(valueRef);
 
-			/* record min and max for auto calibration */
+			// Record min and max for auto calibration.
 			if (value < p_element->min) {
 				p_element->min = value;
 			}
@@ -179,7 +179,7 @@ void joypad::add_hid_element(IOHIDElementRef p_element) {
 				break;
 		}
 
-		if (list) { /* add to list */
+		if (list) { // Add to list.
 			rec_element element;
 
 			element.ref = p_element;
@@ -280,7 +280,7 @@ static String _hex_str(uint8_t p_byte) {
 
 bool JoypadOSX::configure_joypad(IOHIDDeviceRef p_device_ref, joypad *p_joy) {
 	p_joy->device_ref = p_device_ref;
-	/* get device name */
+	// Get device name.
 	String name;
 	char c_name[256];
 	CFTypeRef refCF = IOHIDDeviceGetProperty(p_device_ref, CFSTR(kIOHIDProductKey));
@@ -319,7 +319,7 @@ bool JoypadOSX::configure_joypad(IOHIDDeviceRef p_device_ref, joypad *p_joy) {
 		sprintf(uid, "%08x%08x%08x%08x", OSSwapHostToBigInt32(3), OSSwapHostToBigInt32(vendor), OSSwapHostToBigInt32(product_id), OSSwapHostToBigInt32(version));
 		input->joy_connection_changed(id, true, name, uid);
 	} else {
-		//bluetooth device
+		// Bluetooth device.
 		String guid = "05000000";
 		for (int i = 0; i < 12; i++) {
 			if (i < name.size())
@@ -445,7 +445,7 @@ static HatMask process_hat_value(int p_min, int p_max, int p_value, bool p_offse
 
 void JoypadOSX::poll_joypads() const {
 	while (CFRunLoopRunInMode(GODOT_JOY_LOOP_RUN_MODE, 0, TRUE) == kCFRunLoopRunHandledSource) {
-		/* no-op. Pending callbacks will fire. */
+		// No-op. Pending callbacks will fire.
 	}
 }
 
@@ -568,7 +568,7 @@ void JoypadOSX::config_hid_manager(CFArrayRef p_matching_array) const {
 	IOHIDManagerScheduleWithRunLoop(hid_manager, runloop, GODOT_JOY_LOOP_RUN_MODE);
 
 	while (CFRunLoopRunInMode(GODOT_JOY_LOOP_RUN_MODE, 0, TRUE) == kCFRunLoopRunHandledSource) {
-		/* no-op. Callback fires once per existing device. */
+		// No-op. Callback fires once per existing device.
 	}
 }
 
diff --git a/platform/osx/joypad_osx.h b/platform/osx/joypad_osx.h
index 8ea1033a77..4ca7fb1698 100644
--- a/platform/osx/joypad_osx.h
+++ b/platform/osx/joypad_osx.h
@@ -66,7 +66,7 @@ struct joypad {
 	int id = 0;
 	bool offset_hat = false;
 
-	io_service_t ffservice = 0; /* Interface for force feedback, 0 = no ff */
+	io_service_t ffservice = 0; // Interface for force feedback, 0 = no ff.
 	FFCONSTANTFORCE ff_constant_force;
 	FFDeviceObjectReference ff_device = nullptr;
 	FFEffectObjectReference ff_object = nullptr;
diff --git a/platform/osx/key_mapping_osx.h b/platform/osx/key_mapping_osx.h
new file mode 100644
index 0000000000..252cc907bb
--- /dev/null
+++ b/platform/osx/key_mapping_osx.h
@@ -0,0 +1,52 @@
+/*************************************************************************/
+/*  key_mapping_osx.h                                                    */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#ifndef KEY_MAPPING_OSX_H
+#define KEY_MAPPING_OSX_H
+
+#include "core/os/keyboard.h"
+
+class KeyMappingOSX {
+	KeyMappingOSX() {}
+
+	static bool is_numpad_key(unsigned int key);
+
+public:
+	// Mappings input.
+	static Key translate_key(unsigned int key);
+	static unsigned int unmap_key(Key key);
+	static Key remap_key(unsigned int key, unsigned int state);
+
+	// Mapping for menu shortcuts.
+	static String keycode_get_native_string(Key p_keycode);
+	static unsigned int keycode_get_native_mask(Key p_keycode);
+};
+
+#endif // KEY_MAPPING_OSX_H
diff --git a/platform/osx/key_mapping_osx.mm b/platform/osx/key_mapping_osx.mm
new file mode 100644
index 0000000000..fde9206824
--- /dev/null
+++ b/platform/osx/key_mapping_osx.mm
@@ -0,0 +1,477 @@
+/*************************************************************************/
+/*  key_mapping_osx.mm                                                   */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#include "key_mapping_osx.h"
+
+#include <Carbon/Carbon.h>
+#include <Cocoa/Cocoa.h>
+
+bool KeyMappingOSX::is_numpad_key(unsigned int key) {
+	static const unsigned int table[] = {
+		0x41, /* kVK_ANSI_KeypadDecimal */
+		0x43, /* kVK_ANSI_KeypadMultiply */
+		0x45, /* kVK_ANSI_KeypadPlus */
+		0x47, /* kVK_ANSI_KeypadClear */
+		0x4b, /* kVK_ANSI_KeypadDivide */
+		0x4c, /* kVK_ANSI_KeypadEnter */
+		0x4e, /* kVK_ANSI_KeypadMinus */
+		0x51, /* kVK_ANSI_KeypadEquals */
+		0x52, /* kVK_ANSI_Keypad0 */
+		0x53, /* kVK_ANSI_Keypad1 */
+		0x54, /* kVK_ANSI_Keypad2 */
+		0x55, /* kVK_ANSI_Keypad3 */
+		0x56, /* kVK_ANSI_Keypad4 */
+		0x57, /* kVK_ANSI_Keypad5 */
+		0x58, /* kVK_ANSI_Keypad6 */
+		0x59, /* kVK_ANSI_Keypad7 */
+		0x5b, /* kVK_ANSI_Keypad8 */
+		0x5c, /* kVK_ANSI_Keypad9 */
+		0x5f, /* kVK_JIS_KeypadComma */
+		0x00
+	};
+	for (int i = 0; table[i] != 0; i++) {
+		if (key == table[i]) {
+			return true;
+		}
+	}
+	return false;
+}
+
+// Keyboard symbol translation table.
+static const Key _osx_to_godot_table[128] = {
+	/* 00 */ Key::A,
+	/* 01 */ Key::S,
+	/* 02 */ Key::D,
+	/* 03 */ Key::F,
+	/* 04 */ Key::H,
+	/* 05 */ Key::G,
+	/* 06 */ Key::Z,
+	/* 07 */ Key::X,
+	/* 08 */ Key::C,
+	/* 09 */ Key::V,
+	/* 0a */ Key::SECTION, /* ISO Section */
+	/* 0b */ Key::B,
+	/* 0c */ Key::Q,
+	/* 0d */ Key::W,
+	/* 0e */ Key::E,
+	/* 0f */ Key::R,
+	/* 10 */ Key::Y,
+	/* 11 */ Key::T,
+	/* 12 */ Key::KEY_1,
+	/* 13 */ Key::KEY_2,
+	/* 14 */ Key::KEY_3,
+	/* 15 */ Key::KEY_4,
+	/* 16 */ Key::KEY_6,
+	/* 17 */ Key::KEY_5,
+	/* 18 */ Key::EQUAL,
+	/* 19 */ Key::KEY_9,
+	/* 1a */ Key::KEY_7,
+	/* 1b */ Key::MINUS,
+	/* 1c */ Key::KEY_8,
+	/* 1d */ Key::KEY_0,
+	/* 1e */ Key::BRACERIGHT,
+	/* 1f */ Key::O,
+	/* 20 */ Key::U,
+	/* 21 */ Key::BRACELEFT,
+	/* 22 */ Key::I,
+	/* 23 */ Key::P,
+	/* 24 */ Key::ENTER,
+	/* 25 */ Key::L,
+	/* 26 */ Key::J,
+	/* 27 */ Key::APOSTROPHE,
+	/* 28 */ Key::K,
+	/* 29 */ Key::SEMICOLON,
+	/* 2a */ Key::BACKSLASH,
+	/* 2b */ Key::COMMA,
+	/* 2c */ Key::SLASH,
+	/* 2d */ Key::N,
+	/* 2e */ Key::M,
+	/* 2f */ Key::PERIOD,
+	/* 30 */ Key::TAB,
+	/* 31 */ Key::SPACE,
+	/* 32 */ Key::QUOTELEFT,
+	/* 33 */ Key::BACKSPACE,
+	/* 34 */ Key::UNKNOWN,
+	/* 35 */ Key::ESCAPE,
+	/* 36 */ Key::META,
+	/* 37 */ Key::META,
+	/* 38 */ Key::SHIFT,
+	/* 39 */ Key::CAPSLOCK,
+	/* 3a */ Key::ALT,
+	/* 3b */ Key::CTRL,
+	/* 3c */ Key::SHIFT,
+	/* 3d */ Key::ALT,
+	/* 3e */ Key::CTRL,
+	/* 3f */ Key::UNKNOWN, /* Function */
+	/* 40 */ Key::UNKNOWN, /* F17 */
+	/* 41 */ Key::KP_PERIOD,
+	/* 42 */ Key::UNKNOWN,
+	/* 43 */ Key::KP_MULTIPLY,
+	/* 44 */ Key::UNKNOWN,
+	/* 45 */ Key::KP_ADD,
+	/* 46 */ Key::UNKNOWN,
+	/* 47 */ Key::NUMLOCK, /* Really KeypadClear... */
+	/* 48 */ Key::VOLUMEUP, /* VolumeUp */
+	/* 49 */ Key::VOLUMEDOWN, /* VolumeDown */
+	/* 4a */ Key::VOLUMEMUTE, /* Mute */
+	/* 4b */ Key::KP_DIVIDE,
+	/* 4c */ Key::KP_ENTER,
+	/* 4d */ Key::UNKNOWN,
+	/* 4e */ Key::KP_SUBTRACT,
+	/* 4f */ Key::UNKNOWN, /* F18 */
+	/* 50 */ Key::UNKNOWN, /* F19 */
+	/* 51 */ Key::EQUAL, /* KeypadEqual */
+	/* 52 */ Key::KP_0,
+	/* 53 */ Key::KP_1,
+	/* 54 */ Key::KP_2,
+	/* 55 */ Key::KP_3,
+	/* 56 */ Key::KP_4,
+	/* 57 */ Key::KP_5,
+	/* 58 */ Key::KP_6,
+	/* 59 */ Key::KP_7,
+	/* 5a */ Key::UNKNOWN, /* F20 */
+	/* 5b */ Key::KP_8,
+	/* 5c */ Key::KP_9,
+	/* 5d */ Key::YEN, /* JIS Yen */
+	/* 5e */ Key::UNDERSCORE, /* JIS Underscore */
+	/* 5f */ Key::COMMA, /* JIS KeypadComma */
+	/* 60 */ Key::F5,
+	/* 61 */ Key::F6,
+	/* 62 */ Key::F7,
+	/* 63 */ Key::F3,
+	/* 64 */ Key::F8,
+	/* 65 */ Key::F9,
+	/* 66 */ Key::UNKNOWN, /* JIS Eisu */
+	/* 67 */ Key::F11,
+	/* 68 */ Key::UNKNOWN, /* JIS Kana */
+	/* 69 */ Key::F13,
+	/* 6a */ Key::F16,
+	/* 6b */ Key::F14,
+	/* 6c */ Key::UNKNOWN,
+	/* 6d */ Key::F10,
+	/* 6e */ Key::MENU,
+	/* 6f */ Key::F12,
+	/* 70 */ Key::UNKNOWN,
+	/* 71 */ Key::F15,
+	/* 72 */ Key::INSERT, /* Really Help... */
+	/* 73 */ Key::HOME,
+	/* 74 */ Key::PAGEUP,
+	/* 75 */ Key::KEY_DELETE,
+	/* 76 */ Key::F4,
+	/* 77 */ Key::END,
+	/* 78 */ Key::F2,
+	/* 79 */ Key::PAGEDOWN,
+	/* 7a */ Key::F1,
+	/* 7b */ Key::LEFT,
+	/* 7c */ Key::RIGHT,
+	/* 7d */ Key::DOWN,
+	/* 7e */ Key::UP,
+	/* 7f */ Key::UNKNOWN,
+};
+
+// Translates a OS X keycode to a Godot keycode.
+Key KeyMappingOSX::translate_key(unsigned int key) {
+	if (key >= 128) {
+		return Key::UNKNOWN;
+	}
+
+	return _osx_to_godot_table[key];
+}
+
+// Translates a Godot keycode back to a OSX keycode.
+unsigned int KeyMappingOSX::unmap_key(Key key) {
+	for (int i = 0; i <= 126; i++) {
+		if (_osx_to_godot_table[i] == key) {
+			return i;
+		}
+	}
+	return 127;
+}
+
+struct _KeyCodeMap {
+	UniChar kchar;
+	Key kcode;
+};
+
+static const _KeyCodeMap _keycodes[55] = {
+	{ '`', Key::QUOTELEFT },
+	{ '~', Key::ASCIITILDE },
+	{ '0', Key::KEY_0 },
+	{ '1', Key::KEY_1 },
+	{ '2', Key::KEY_2 },
+	{ '3', Key::KEY_3 },
+	{ '4', Key::KEY_4 },
+	{ '5', Key::KEY_5 },
+	{ '6', Key::KEY_6 },
+	{ '7', Key::KEY_7 },
+	{ '8', Key::KEY_8 },
+	{ '9', Key::KEY_9 },
+	{ '-', Key::MINUS },
+	{ '_', Key::UNDERSCORE },
+	{ '=', Key::EQUAL },
+	{ '+', Key::PLUS },
+	{ 'q', Key::Q },
+	{ 'w', Key::W },
+	{ 'e', Key::E },
+	{ 'r', Key::R },
+	{ 't', Key::T },
+	{ 'y', Key::Y },
+	{ 'u', Key::U },
+	{ 'i', Key::I },
+	{ 'o', Key::O },
+	{ 'p', Key::P },
+	{ '[', Key::BRACELEFT },
+	{ ']', Key::BRACERIGHT },
+	{ '{', Key::BRACELEFT },
+	{ '}', Key::BRACERIGHT },
+	{ 'a', Key::A },
+	{ 's', Key::S },
+	{ 'd', Key::D },
+	{ 'f', Key::F },
+	{ 'g', Key::G },
+	{ 'h', Key::H },
+	{ 'j', Key::J },
+	{ 'k', Key::K },
+	{ 'l', Key::L },
+	{ ';', Key::SEMICOLON },
+	{ ':', Key::COLON },
+	{ '\'', Key::APOSTROPHE },
+	{ '\"', Key::QUOTEDBL },
+	{ '\\', Key::BACKSLASH },
+	{ '#', Key::NUMBERSIGN },
+	{ 'z', Key::Z },
+	{ 'x', Key::X },
+	{ 'c', Key::C },
+	{ 'v', Key::V },
+	{ 'b', Key::B },
+	{ 'n', Key::N },
+	{ 'm', Key::M },
+	{ ',', Key::COMMA },
+	{ '.', Key::PERIOD },
+	{ '/', Key::SLASH }
+};
+
+// Remap key according to current keyboard layout.
+Key KeyMappingOSX::remap_key(unsigned int key, unsigned int state) {
+	if (is_numpad_key(key)) {
+		return translate_key(key);
+	}
+
+	TISInputSourceRef current_keyboard = TISCopyCurrentKeyboardInputSource();
+	if (!current_keyboard) {
+		return translate_key(key);
+	}
+
+	CFDataRef layout_data = (CFDataRef)TISGetInputSourceProperty(current_keyboard, kTISPropertyUnicodeKeyLayoutData);
+	if (!layout_data) {
+		return translate_key(key);
+	}
+
+	const UCKeyboardLayout *keyboard_layout = (const UCKeyboardLayout *)CFDataGetBytePtr(layout_data);
+
+	UInt32 keys_down = 0;
+	UniChar chars[4];
+	UniCharCount real_length;
+
+	OSStatus err = UCKeyTranslate(keyboard_layout,
+			key,
+			kUCKeyActionDisplay,
+			(state >> 8) & 0xFF,
+			LMGetKbdType(),
+			kUCKeyTranslateNoDeadKeysBit,
+			&keys_down,
+			sizeof(chars) / sizeof(chars[0]),
+			&real_length,
+			chars);
+
+	if (err != noErr) {
+		return translate_key(key);
+	}
+
+	for (unsigned int i = 0; i < 55; i++) {
+		if (_keycodes[i].kchar == chars[0]) {
+			return _keycodes[i].kcode;
+		}
+	}
+	return translate_key(key);
+}
+
+struct _KeyCodeText {
+	Key code;
+	char32_t text;
+};
+
+static const _KeyCodeText _native_keycodes[] = {
+	/* clang-format off */
+		{Key::ESCAPE                        ,0x001B},
+		{Key::TAB                           ,0x0009},
+		{Key::BACKTAB                       ,0x007F},
+		{Key::BACKSPACE                     ,0x0008},
+		{Key::ENTER                         ,0x000D},
+		{Key::INSERT                        ,NSInsertFunctionKey},
+		{Key::KEY_DELETE                    ,0x007F},
+		{Key::PAUSE                         ,NSPauseFunctionKey},
+		{Key::PRINT                         ,NSPrintScreenFunctionKey},
+		{Key::SYSREQ                        ,NSSysReqFunctionKey},
+		{Key::CLEAR                         ,NSClearLineFunctionKey},
+		{Key::HOME                          ,0x2196},
+		{Key::END                           ,0x2198},
+		{Key::LEFT                          ,0x001C},
+		{Key::UP                            ,0x001E},
+		{Key::RIGHT                         ,0x001D},
+		{Key::DOWN                          ,0x001F},
+		{Key::PAGEUP                        ,0x21DE},
+		{Key::PAGEDOWN                      ,0x21DF},
+		{Key::NUMLOCK                       ,NSClearLineFunctionKey},
+		{Key::SCROLLLOCK                    ,NSScrollLockFunctionKey},
+		{Key::F1                            ,NSF1FunctionKey},
+		{Key::F2                            ,NSF2FunctionKey},
+		{Key::F3                            ,NSF3FunctionKey},
+		{Key::F4                            ,NSF4FunctionKey},
+		{Key::F5                            ,NSF5FunctionKey},
+		{Key::F6                            ,NSF6FunctionKey},
+		{Key::F7                            ,NSF7FunctionKey},
+		{Key::F8                            ,NSF8FunctionKey},
+		{Key::F9                            ,NSF9FunctionKey},
+		{Key::F10                           ,NSF10FunctionKey},
+		{Key::F11                           ,NSF11FunctionKey},
+		{Key::F12                           ,NSF12FunctionKey},
+		{Key::F13                           ,NSF13FunctionKey},
+		{Key::F14                           ,NSF14FunctionKey},
+		{Key::F15                           ,NSF15FunctionKey},
+		{Key::F16                           ,NSF16FunctionKey}, //* ... NSF35FunctionKey */
+		{Key::MENU                          ,NSMenuFunctionKey},
+		{Key::HELP                          ,NSHelpFunctionKey},
+		{Key::STOP                          ,NSStopFunctionKey},
+		{Key::LAUNCH0                       ,NSUserFunctionKey},
+		{Key::SPACE                         ,0x0020},
+		{Key::EXCLAM                        ,'!'},
+		{Key::QUOTEDBL                      ,'\"'},
+		{Key::NUMBERSIGN                    ,'#'},
+		{Key::DOLLAR                        ,'$'},
+		{Key::PERCENT                       ,'\%'},
+		{Key::AMPERSAND                     ,'&'},
+		{Key::APOSTROPHE                    ,'\''},
+		{Key::PARENLEFT                     ,'('},
+		{Key::PARENRIGHT                    ,')'},
+		{Key::ASTERISK                      ,'*'},
+		{Key::PLUS                          ,'+'},
+		{Key::COMMA                         ,','},
+		{Key::MINUS                         ,'-'},
+		{Key::PERIOD                        ,'.'},
+		{Key::SLASH                         ,'/'},
+		{Key::KEY_0                         ,'0'},
+		{Key::KEY_1                         ,'1'},
+		{Key::KEY_2                         ,'2'},
+		{Key::KEY_3                         ,'3'},
+		{Key::KEY_4                         ,'4'},
+		{Key::KEY_5                         ,'5'},
+		{Key::KEY_6                         ,'6'},
+		{Key::KEY_7                         ,'7'},
+		{Key::KEY_8                         ,'8'},
+		{Key::KEY_9                         ,'9'},
+		{Key::COLON                         ,':'},
+		{Key::SEMICOLON                     ,';'},
+		{Key::LESS                          ,'<'},
+		{Key::EQUAL                         ,'='},
+		{Key::GREATER                       ,'>'},
+		{Key::QUESTION                      ,'?'},
+		{Key::AT                            ,'@'},
+		{Key::A                             ,'a'},
+		{Key::B                             ,'b'},
+		{Key::C                             ,'c'},
+		{Key::D                             ,'d'},
+		{Key::E                             ,'e'},
+		{Key::F                             ,'f'},
+		{Key::G                             ,'g'},
+		{Key::H                             ,'h'},
+		{Key::I                             ,'i'},
+		{Key::J                             ,'j'},
+		{Key::K                             ,'k'},
+		{Key::L                             ,'l'},
+		{Key::M                             ,'m'},
+		{Key::N                             ,'n'},
+		{Key::O                             ,'o'},
+		{Key::P                             ,'p'},
+		{Key::Q                             ,'q'},
+		{Key::R                             ,'r'},
+		{Key::S                             ,'s'},
+		{Key::T                             ,'t'},
+		{Key::U                             ,'u'},
+		{Key::V                             ,'v'},
+		{Key::W                             ,'w'},
+		{Key::X                             ,'x'},
+		{Key::Y                             ,'y'},
+		{Key::Z                             ,'z'},
+		{Key::BRACKETLEFT                   ,'['},
+		{Key::BACKSLASH                     ,'\\'},
+		{Key::BRACKETRIGHT                  ,']'},
+		{Key::ASCIICIRCUM                   ,'^'},
+		{Key::UNDERSCORE                    ,'_'},
+		{Key::QUOTELEFT                     ,'`'},
+		{Key::BRACELEFT                     ,'{'},
+		{Key::BAR                           ,'|'},
+		{Key::BRACERIGHT                    ,'}'},
+		{Key::ASCIITILDE                    ,'~'},
+		{Key::NONE                          ,0x0000}
+	/* clang-format on */
+};
+
+String KeyMappingOSX::keycode_get_native_string(Key p_keycode) {
+	const _KeyCodeText *kct = &_native_keycodes[0];
+
+	while (kct->text) {
+		if (kct->code == p_keycode) {
+			return String::chr(kct->text);
+		}
+		kct++;
+	}
+	return String();
+}
+
+unsigned int KeyMappingOSX::keycode_get_native_mask(Key p_keycode) {
+	unsigned int mask = 0;
+	if ((p_keycode & KeyModifierMask::CTRL) != Key::NONE) {
+		mask |= NSEventModifierFlagControl;
+	}
+	if ((p_keycode & KeyModifierMask::ALT) != Key::NONE) {
+		mask |= NSEventModifierFlagOption;
+	}
+	if ((p_keycode & KeyModifierMask::SHIFT) != Key::NONE) {
+		mask |= NSEventModifierFlagShift;
+	}
+	if ((p_keycode & KeyModifierMask::META) != Key::NONE) {
+		mask |= NSEventModifierFlagCommand;
+	}
+	if ((p_keycode & KeyModifierMask::KPAD) != Key::NONE) {
+		mask |= NSEventModifierFlagNumericPad;
+	}
+	return mask;
+}
diff --git a/platform/osx/os_osx.h b/platform/osx/os_osx.h
index 60dec1fe3f..5bb5b3320e 100644
--- a/platform/osx/os_osx.h
+++ b/platform/osx/os_osx.h
@@ -40,9 +40,7 @@
 #include "servers/audio_server.h"
 
 class OS_OSX : public OS_Unix {
-	virtual void delete_main_loop() override;
-
-	bool force_quit;
+	bool force_quit = false;
 
 	JoypadOSX *joypad_osx = nullptr;
 
@@ -55,13 +53,15 @@ class OS_OSX : public OS_Unix {
 
 	CrashHandler crash_handler;
 
-	MainLoop *main_loop;
+	CFRunLoopObserverRef pre_wait_observer;
 
-	static void pre_wait_observer_cb(CFRunLoopObserverRef p_observer, CFRunLoopActivity p_activiy, void *p_context);
+	MainLoop *main_loop = nullptr;
 
-public:
 	String open_with_filename;
 
+	static _FORCE_INLINE_ String get_framework_executable(const String &p_path);
+	static void pre_wait_observer_cb(CFRunLoopObserverRef p_observer, CFRunLoopActivity p_activiy, void *p_context);
+
 protected:
 	virtual void initialize_core() override;
 	virtual void initialize() override;
@@ -70,8 +70,12 @@ protected:
 	virtual void initialize_joypads() override;
 
 	virtual void set_main_loop(MainLoop *p_main_loop) override;
+	virtual void delete_main_loop() override;
 
 public:
+	String get_open_with_filename() const;
+	void set_open_with_filename(const String &p_path);
+
 	virtual String get_name() const override;
 
 	virtual void alert(const String &p_alert, const String &p_title = "ALERT!") override;
@@ -89,26 +93,27 @@ public:
 
 	virtual String get_system_dir(SystemDir p_dir, bool p_shared_storage = true) const override;
 
-	Error shell_open(String p_uri) override;
+	virtual Error shell_open(String p_uri) override;
 
-	String get_locale() const override;
+	virtual String get_locale() const override;
 
 	virtual String get_executable_path() const override;
 	virtual Error create_process(const String &p_path, const List<String> &p_arguments, ProcessID *r_child_id = nullptr, bool p_open_console = false) override;
 	virtual Error create_instance(const List<String> &p_arguments, ProcessID *r_child_id = nullptr) override;
 
-	virtual String get_unique_id() const override; //++
+	virtual String get_unique_id() const override;
 
 	virtual bool _check_internal_feature_support(const String &p_feature) override;
 
-	void run();
-
 	virtual void disable_crash_handler() override;
 	virtual bool is_disable_crash_handler() const override;
 
 	virtual Error move_to_trash(const String &p_path) override;
 
+	void run();
+
 	OS_OSX();
+	~OS_OSX();
 };
 
 #endif
diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm
index 32d0e6dd94..9288e658cf 100644
--- a/platform/osx/os_osx.mm
+++ b/platform/osx/os_osx.mm
@@ -31,241 +31,45 @@
 #include "os_osx.h"
 
 #include "core/version_generated.gen.h"
+#include "main/main.h"
 
 #include "dir_access_osx.h"
 #include "display_server_osx.h"
-#include "main/main.h"
+#include "godot_application.h"
+#include "godot_application_delegate.h"
+#include "osx_terminal_logger.h"
 
 #include <dlfcn.h>
 #include <libproc.h>
 #include <mach-o/dyld.h>
-#include <os/log.h>
-
-#define DS_OSX ((DisplayServerOSX *)(DisplayServerOSX::get_singleton()))
-
-/*************************************************************************/
-/* GodotApplication                                                      */
-/*************************************************************************/
-
-@interface GodotApplication : NSApplication
-@end
-
-@implementation GodotApplication
-
-- (void)sendEvent:(NSEvent *)event {
-	if (DS_OSX) {
-		DS_OSX->_send_event(event);
-	}
-
-	// From http://cocoadev.com/index.pl?GameKeyboardHandlingAlmost
-	// This works around an AppKit bug, where key up events while holding
-	// down the command key don't get sent to the key window.
-	if ([event type] == NSEventTypeKeyUp && ([event modifierFlags] & NSEventModifierFlagCommand)) {
-		[[self keyWindow] sendEvent:event];
-	} else {
-		[super sendEvent:event];
-	}
-}
-
-@end
-
-/*************************************************************************/
-/* GodotApplicationDelegate                                              */
-/*************************************************************************/
-
-@interface GodotApplicationDelegate : NSObject
-- (void)forceUnbundledWindowActivationHackStep1;
-- (void)forceUnbundledWindowActivationHackStep2;
-- (void)forceUnbundledWindowActivationHackStep3;
-@end
-
-@implementation GodotApplicationDelegate
-
-- (void)forceUnbundledWindowActivationHackStep1 {
-	// Step 1: Switch focus to macOS SystemUIServer process.
-	// Required to perform step 2, TransformProcessType will fail if app is already the in focus.
-	for (NSRunningApplication *app in [NSRunningApplication runningApplicationsWithBundleIdentifier:@"com.apple.systemuiserver"]) {
-		[app activateWithOptions:NSApplicationActivateIgnoringOtherApps];
-		break;
-	}
-	[self performSelector:@selector(forceUnbundledWindowActivationHackStep2)
-			   withObject:nil
-			   afterDelay:0.02];
-}
-
-- (void)forceUnbundledWindowActivationHackStep2 {
-	// Step 2: Register app as foreground process.
-	ProcessSerialNumber psn = { 0, kCurrentProcess };
-	(void)TransformProcessType(&psn, kProcessTransformToForegroundApplication);
-	[self performSelector:@selector(forceUnbundledWindowActivationHackStep3) withObject:nil afterDelay:0.02];
-}
-
-- (void)forceUnbundledWindowActivationHackStep3 {
-	// Step 3: Switch focus back to app window.
-	[[NSRunningApplication currentApplication] activateWithOptions:NSApplicationActivateIgnoringOtherApps];
-}
-
-- (void)applicationDidFinishLaunching:(NSNotification *)notice {
-	NSString *nsappname = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleName"];
-	if (nsappname == nil || isatty(STDOUT_FILENO) || isatty(STDIN_FILENO) || isatty(STDERR_FILENO)) {
-		// If the executable is started from terminal or is not bundled, macOS WindowServer won't register and activate app window correctly (menu and title bar are grayed out and input ignored).
-		[self performSelector:@selector(forceUnbundledWindowActivationHackStep1) withObject:nil afterDelay:0.02];
-	}
-}
-
-- (void)applicationDidResignActive:(NSNotification *)notification {
-	if (OS::get_singleton()->get_main_loop()) {
-		OS::get_singleton()->get_main_loop()->notification(MainLoop::NOTIFICATION_APPLICATION_FOCUS_OUT);
-	}
-}
 
-- (void)applicationDidBecomeActive:(NSNotification *)notification {
-	if (OS::get_singleton()->get_main_loop()) {
-		OS::get_singleton()->get_main_loop()->notification(MainLoop::NOTIFICATION_APPLICATION_FOCUS_IN);
-	}
-}
-
-- (void)globalMenuCallback:(id)sender {
-	if (DS_OSX) {
-		return DS_OSX->_menu_callback(sender);
-	}
-}
-
-- (NSMenu *)applicationDockMenu:(NSApplication *)sender {
-	if (DS_OSX) {
-		return DS_OSX->_get_dock_menu();
+_FORCE_INLINE_ String OS_OSX::get_framework_executable(const String &p_path) {
+	// Append framework executable name, or return as is if p_path is not a framework.
+	DirAccessRef da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
+	if (da->dir_exists(p_path) && da->file_exists(p_path.plus_file(p_path.get_file().get_basename()))) {
+		return p_path.plus_file(p_path.get_file().get_basename());
 	} else {
-		return nullptr;
-	}
-}
-
-- (BOOL)application:(NSApplication *)sender openFile:(NSString *)filename {
-	// Note: may be called called before main loop init!
-	char *utfs = strdup([filename UTF8String]);
-	((OS_OSX *)OS_OSX::get_singleton())->open_with_filename.parse_utf8(utfs);
-	free(utfs);
-
-#ifdef TOOLS_ENABLED
-	// Open new instance
-	if (OS_OSX::get_singleton()->get_main_loop()) {
-		List<String> args;
-		args.push_back(((OS_OSX *)OS_OSX::get_singleton())->open_with_filename);
-		String exec = OS_OSX::get_singleton()->get_executable_path();
-		OS_OSX::get_singleton()->create_process(exec, args);
-	}
-#endif
-	return YES;
-}
-
-- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender {
-	if (DS_OSX) {
-		DS_OSX->_send_window_event(DS_OSX->windows[DisplayServerOSX::MAIN_WINDOW_ID], DisplayServerOSX::WINDOW_EVENT_CLOSE_REQUEST);
-	}
-	return NSTerminateCancel;
-}
-
-- (void)showAbout:(id)sender {
-	if (OS_OSX::get_singleton()->get_main_loop()) {
-		OS_OSX::get_singleton()->get_main_loop()->notification(MainLoop::NOTIFICATION_WM_ABOUT);
+		return p_path;
 	}
 }
 
-@end
-
-/*************************************************************************/
-/* OSXTerminalLogger                                                     */
-/*************************************************************************/
-
-class OSXTerminalLogger : public StdLogger {
-public:
-	virtual void log_error(const char *p_function, const char *p_file, int p_line, const char *p_code, const char *p_rationale, bool p_editor_notify = false, ErrorType p_type = ERR_ERROR) {
-		if (!should_log(true)) {
-			return;
-		}
-
-		const char *err_details;
-		if (p_rationale && p_rationale[0])
-			err_details = p_rationale;
-		else
-			err_details = p_code;
-
-		switch (p_type) {
-			case ERR_WARNING:
-				os_log_info(OS_LOG_DEFAULT,
-						"WARNING: %{public}s\nat: %{public}s (%{public}s:%i)",
-						err_details, p_function, p_file, p_line);
-				logf_error("\E[1;33mWARNING:\E[0;93m %s\n", err_details);
-				logf_error("\E[0;90m     at: %s (%s:%i)\E[0m\n", p_function, p_file, p_line);
-				break;
-			case ERR_SCRIPT:
-				os_log_error(OS_LOG_DEFAULT,
-						"SCRIPT ERROR: %{public}s\nat: %{public}s (%{public}s:%i)",
-						err_details, p_function, p_file, p_line);
-				logf_error("\E[1;35mSCRIPT ERROR:\E[0;95m %s\n", err_details);
-				logf_error("\E[0;90m          at: %s (%s:%i)\E[0m\n", p_function, p_file, p_line);
-				break;
-			case ERR_SHADER:
-				os_log_error(OS_LOG_DEFAULT,
-						"SHADER ERROR: %{public}s\nat: %{public}s (%{public}s:%i)",
-						err_details, p_function, p_file, p_line);
-				logf_error("\E[1;36mSHADER ERROR:\E[0;96m %s\n", err_details);
-				logf_error("\E[0;90m          at: %s (%s:%i)\E[0m\n", p_function, p_file, p_line);
-				break;
-			case ERR_ERROR:
-			default:
-				os_log_error(OS_LOG_DEFAULT,
-						"ERROR: %{public}s\nat: %{public}s (%{public}s:%i)",
-						err_details, p_function, p_file, p_line);
-				logf_error("\E[1;31mERROR:\E[0;91m %s\n", err_details);
-				logf_error("\E[0;90m   at: %s (%s:%i)\E[0m\n", p_function, p_file, p_line);
-				break;
-		}
-	}
-};
-
-/*************************************************************************/
-/* OS_OSX                                                                */
-/*************************************************************************/
-
-String OS_OSX::get_unique_id() const {
-	static String serial_number;
-
-	if (serial_number.is_empty()) {
-		io_service_t platformExpert = IOServiceGetMatchingService(kIOMasterPortDefault, IOServiceMatching("IOPlatformExpertDevice"));
-		CFStringRef serialNumberAsCFString = nullptr;
-		if (platformExpert) {
-			serialNumberAsCFString = (CFStringRef)IORegistryEntryCreateCFProperty(platformExpert, CFSTR(kIOPlatformSerialNumberKey), kCFAllocatorDefault, 0);
-			IOObjectRelease(platformExpert);
-		}
+void OS_OSX::pre_wait_observer_cb(CFRunLoopObserverRef p_observer, CFRunLoopActivity p_activiy, void *p_context) {
+	// Prevent main loop from sleeping and redraw window during resize / modal popups.
 
-		NSString *serialNumberAsNSString = nil;
-		if (serialNumberAsCFString) {
-			serialNumberAsNSString = [NSString stringWithString:(NSString *)serialNumberAsCFString];
-			CFRelease(serialNumberAsCFString);
+	if (get_singleton()->get_main_loop()) {
+		Main::force_redraw();
+		if (!Main::is_iterating()) { // Avoid cyclic loop.
+			Main::iteration();
 		}
-
-		serial_number = [serialNumberAsNSString UTF8String];
 	}
 
-	return serial_number;
+	CFRunLoopWakeUp(CFRunLoopGetCurrent()); // Prevent main loop from sleeping.
 }
 
-void OS_OSX::alert(const String &p_alert, const String &p_title) {
-	NSAlert *window = [[NSAlert alloc] init];
-	NSString *ns_title = [NSString stringWithUTF8String:p_title.utf8().get_data()];
-	NSString *ns_alert = [NSString stringWithUTF8String:p_alert.utf8().get_data()];
-
-	[window addButtonWithTitle:@"OK"];
-	[window setMessageText:ns_title];
-	[window setInformativeText:ns_alert];
-	[window setAlertStyle:NSAlertStyleWarning];
+void OS_OSX::initialize() {
+	crash_handler.initialize();
 
-	id key_window = [[NSApplication sharedApplication] keyWindow];
-	[window runModal];
-	[window release];
-	if (key_window) {
-		[key_window makeKeyAndOrderFront:nil];
-	}
+	initialize_core();
 }
 
 void OS_OSX::initialize_core() {
@@ -276,17 +80,6 @@ void OS_OSX::initialize_core() {
 	DirAccess::make_default<DirAccessOSX>(DirAccess::ACCESS_FILESYSTEM);
 }
 
-void OS_OSX::initialize_joypads() {
-	joypad_osx = memnew(JoypadOSX(Input::get_singleton()));
-}
-
-void OS_OSX::initialize() {
-	crash_handler.initialize();
-
-	initialize_core();
-	//ensure_user_data_dir();
-}
-
 void OS_OSX::finalize() {
 #ifdef COREMIDI_ENABLED
 	midi_driver.close();
@@ -299,42 +92,63 @@ void OS_OSX::finalize() {
 	}
 }
 
+void OS_OSX::initialize_joypads() {
+	joypad_osx = memnew(JoypadOSX(Input::get_singleton()));
+}
+
 void OS_OSX::set_main_loop(MainLoop *p_main_loop) {
 	main_loop = p_main_loop;
 }
 
 void OS_OSX::delete_main_loop() {
-	if (!main_loop)
+	if (!main_loop) {
 		return;
+	}
+
 	memdelete(main_loop);
 	main_loop = nullptr;
 }
 
+String OS_OSX::get_open_with_filename() const {
+	return open_with_filename;
+}
+
+void OS_OSX::set_open_with_filename(const String &p_path) {
+	open_with_filename = p_path;
+}
+
 String OS_OSX::get_name() const {
 	return "macOS";
 }
 
-_FORCE_INLINE_ String _get_framework_executable(const String p_path) {
-	// Append framework executable name, or return as is if p_path is not a framework.
-	DirAccessRef da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
-	if (da->dir_exists(p_path) && da->file_exists(p_path.plus_file(p_path.get_file().get_basename()))) {
-		return p_path.plus_file(p_path.get_file().get_basename());
-	} else {
-		return p_path;
+void OS_OSX::alert(const String &p_alert, const String &p_title) {
+	NSAlert *window = [[NSAlert alloc] init];
+	NSString *ns_title = [NSString stringWithUTF8String:p_title.utf8().get_data()];
+	NSString *ns_alert = [NSString stringWithUTF8String:p_alert.utf8().get_data()];
+
+	[window addButtonWithTitle:@"OK"];
+	[window setMessageText:ns_title];
+	[window setInformativeText:ns_alert];
+	[window setAlertStyle:NSAlertStyleWarning];
+
+	id key_window = [[NSApplication sharedApplication] keyWindow];
+	[window runModal];
+	if (key_window) {
+		[key_window makeKeyAndOrderFront:nil];
 	}
 }
 
 Error OS_OSX::open_dynamic_library(const String p_path, void *&p_library_handle, bool p_also_set_library_path) {
-	String path = _get_framework_executable(p_path);
+	String path = get_framework_executable(p_path);
 
 	if (!FileAccess::exists(path)) {
-		// This code exists so gdnative can load .dylib files from within the executable path.
-		path = _get_framework_executable(get_executable_path().get_base_dir().plus_file(p_path.get_file()));
+		// Load .dylib or framework from within the executable path.
+		path = get_framework_executable(get_executable_path().get_base_dir().plus_file(p_path.get_file()));
 	}
 
 	if (!FileAccess::exists(path)) {
-		// This code exists so gdnative can load .dylib files from a standard macOS location.
-		path = _get_framework_executable(get_executable_path().get_base_dir().plus_file("../Frameworks").plus_file(p_path.get_file()));
+		// Load .dylib or framework from a standard macOS location.
+		path = get_framework_executable(get_executable_path().get_base_dir().plus_file("../Frameworks").plus_file(p_path.get_file()));
 	}
 
 	p_library_handle = dlopen(path.utf8().get_data(), RTLD_NOW);
@@ -393,8 +207,8 @@ String OS_OSX::get_bundle_resource_dir() const {
 
 	NSBundle *main = [NSBundle mainBundle];
 	if (main) {
-		NSString *resourcePath = [main resourcePath];
-		ret.parse_utf8([resourcePath UTF8String]);
+		NSString *resource_path = [main resourcePath];
+		ret.parse_utf8([resource_path UTF8String]);
 	}
 	return ret;
 }
@@ -404,9 +218,9 @@ String OS_OSX::get_bundle_icon_path() const {
 
 	NSBundle *main = [NSBundle mainBundle];
 	if (main) {
-		NSString *iconPath = [[main infoDictionary] objectForKey:@"CFBundleIconFile"];
-		if (iconPath) {
-			ret.parse_utf8([iconPath UTF8String]);
+		NSString *icon_path = [[main infoDictionary] objectForKey:@"CFBundleIconFile"];
+		if (icon_path) {
+			ret.parse_utf8([icon_path UTF8String]);
 		}
 	}
 	return ret;
@@ -449,9 +263,7 @@ String OS_OSX::get_system_dir(SystemDir p_dir, bool p_shared_storage) const {
 	if (found) {
 		NSArray *paths = NSSearchPathForDirectoriesInDomains(id, NSUserDomainMask, YES);
 		if (paths && [paths count] >= 1) {
-			char *utfs = strdup([[paths firstObject] UTF8String]);
-			ret.parse_utf8(utfs);
-			free(utfs);
+			ret.parse_utf8([[paths firstObject] UTF8String]);
 		}
 	}
 
@@ -475,12 +287,9 @@ String OS_OSX::get_locale() const {
 }
 
 String OS_OSX::get_executable_path() const {
-	int ret;
-	pid_t pid;
 	char pathbuf[PROC_PIDPATHINFO_MAXSIZE];
-
-	pid = getpid();
-	ret = proc_pidpath(pid, pathbuf, sizeof(pathbuf));
+	int pid = getpid();
+	pid_t ret = proc_pidpath(pid, pathbuf, sizeof(pathbuf));
 	if (ret <= 0) {
 		return OS::get_executable_path();
 	} else {
@@ -491,18 +300,6 @@ String OS_OSX::get_executable_path() const {
 	}
 }
 
-Error OS_OSX::create_instance(const List<String> &p_arguments, ProcessID *r_child_id) {
-	// If executable is bundled, always execute editor instances as an app bundle to ensure app window is registered and activated correctly.
-	NSString *nsappname = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleName"];
-	if (nsappname != nil) {
-		String path;
-		path.parse_utf8([[[NSBundle mainBundle] bundlePath] UTF8String]);
-		return create_process(path, p_arguments, r_child_id, false);
-	} else {
-		return create_process(get_executable_path(), p_arguments, r_child_id, false);
-	}
-}
-
 Error OS_OSX::create_process(const String &p_path, const List<String> &p_arguments, ProcessID *r_child_id, bool p_open_console) {
 	if (@available(macOS 10.15, *)) {
 		// Use NSWorkspace if path is an .app bundle.
@@ -532,7 +329,6 @@ Error OS_OSX::create_process(const String &p_path, const List<String> &p_argumen
 												  dispatch_semaphore_signal(lock);
 											  }];
 			dispatch_semaphore_wait(lock, dispatch_time(DISPATCH_TIME_NOW, 20000000000)); // 20 sec timeout, wait for app to launch.
-			dispatch_release(lock);
 
 			if (err == OK) {
 				if (r_child_id) {
@@ -549,17 +345,66 @@ Error OS_OSX::create_process(const String &p_path, const List<String> &p_argumen
 	}
 }
 
-void OS_OSX::pre_wait_observer_cb(CFRunLoopObserverRef p_observer, CFRunLoopActivity p_activiy, void *p_context) {
-	// Prevent main loop from sleeping and redraw window during resize / modal popups.
+Error OS_OSX::create_instance(const List<String> &p_arguments, ProcessID *r_child_id) {
+	// If executable is bundled, always execute editor instances as an app bundle to ensure app window is registered and activated correctly.
+	NSString *nsappname = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleName"];
+	if (nsappname != nil) {
+		String path;
+		path.parse_utf8([[[NSBundle mainBundle] bundlePath] UTF8String]);
+		return create_process(path, p_arguments, r_child_id, false);
+	} else {
+		return create_process(get_executable_path(), p_arguments, r_child_id, false);
+	}
+}
 
-	if (get_singleton()->get_main_loop()) {
-		Main::force_redraw();
-		if (!Main::is_iterating()) { // Avoid cyclic loop.
-			Main::iteration();
+String OS_OSX::get_unique_id() const {
+	static String serial_number;
+
+	if (serial_number.is_empty()) {
+		io_service_t platform_expert = IOServiceGetMatchingService(kIOMasterPortDefault, IOServiceMatching("IOPlatformExpertDevice"));
+		CFStringRef serial_number_cf_string = nullptr;
+		if (platform_expert) {
+			serial_number_cf_string = (CFStringRef)IORegistryEntryCreateCFProperty(platform_expert, CFSTR(kIOPlatformSerialNumberKey), kCFAllocatorDefault, 0);
+			IOObjectRelease(platform_expert);
+		}
+
+		NSString *serial_number_ns_string = nil;
+		if (serial_number_cf_string) {
+			serial_number_ns_string = [NSString stringWithString:(__bridge NSString *)serial_number_cf_string];
+			CFRelease(serial_number_cf_string);
+		}
+
+		if (serial_number_ns_string) {
+			serial_number.parse_utf8([serial_number_ns_string UTF8String]);
 		}
 	}
 
-	CFRunLoopWakeUp(CFRunLoopGetCurrent()); // Prevent main loop from sleeping.
+	return serial_number;
+}
+
+bool OS_OSX::_check_internal_feature_support(const String &p_feature) {
+	return p_feature == "pc";
+}
+
+void OS_OSX::disable_crash_handler() {
+	crash_handler.disable();
+}
+
+bool OS_OSX::is_disable_crash_handler() const {
+	return crash_handler.is_disabled();
+}
+
+Error OS_OSX::move_to_trash(const String &p_path) {
+	NSFileManager *fm = [NSFileManager defaultManager];
+	NSURL *url = [NSURL fileURLWithPath:@(p_path.utf8().get_data())];
+	NSError *err;
+
+	if (![fm trashItemAtURL:url resultingItemURL:nil error:&err]) {
+		ERR_PRINT("trashItemAtURL error: " + String::utf8(err.localizedDescription.UTF8String));
+		return FAILED;
+	}
+
+	return OK;
 }
 
 void OS_OSX::run() {
@@ -571,14 +416,11 @@ void OS_OSX::run() {
 
 	main_loop->initialize();
 
-	CFRunLoopObserverRef pre_wait_observer = CFRunLoopObserverCreate(kCFAllocatorDefault, kCFRunLoopBeforeWaiting, true, 0, &pre_wait_observer_cb, nullptr);
-	CFRunLoopAddObserver(CFRunLoopGetCurrent(), pre_wait_observer, kCFRunLoopCommonModes);
-
 	bool quit = false;
 	while (!force_quit && !quit) {
 		@try {
 			if (DisplayServer::get_singleton()) {
-				DisplayServer::get_singleton()->process_events(); // get rid of pending events
+				DisplayServer::get_singleton()->process_events(); // Get rid of pending events.
 			}
 			joypad_osx->process_joypads();
 
@@ -590,25 +432,9 @@ void OS_OSX::run() {
 		}
 	};
 
-	CFRunLoopRemoveObserver(CFRunLoopGetCurrent(), pre_wait_observer, kCFRunLoopCommonModes);
-	CFRelease(pre_wait_observer);
-
 	main_loop->finalize();
 }
 
-Error OS_OSX::move_to_trash(const String &p_path) {
-	NSFileManager *fm = [NSFileManager defaultManager];
-	NSURL *url = [NSURL fileURLWithPath:@(p_path.utf8().get_data())];
-	NSError *err;
-
-	if (![fm trashItemAtURL:url resultingItemURL:nil error:&err]) {
-		ERR_PRINT("trashItemAtURL error: " + String::utf8(err.localizedDescription.UTF8String));
-		return FAILED;
-	}
-
-	return OK;
-}
-
 OS_OSX::OS_OSX() {
 	main_loop = nullptr;
 	force_quit = false;
@@ -623,17 +449,17 @@ OS_OSX::OS_OSX() {
 
 	DisplayServerOSX::register_osx_driver();
 
-	// Implicitly create shared NSApplication instance
+	// Implicitly create shared NSApplication instance.
 	[GodotApplication sharedApplication];
 
-	// In case we are unbundled, make us a proper UI application
+	// In case we are unbundled, make us a proper UI application.
 	[NSApp setActivationPolicy:NSApplicationActivationPolicyRegular];
 
 	// Menu bar setup must go between sharedApplication above and
 	// finishLaunching below, in order to properly emulate the behavior
-	// of NSApplicationMain
+	// of NSApplicationMain.
 
-	NSMenu *main_menu = [[[NSMenu alloc] initWithTitle:@""] autorelease];
+	NSMenu *main_menu = [[NSMenu alloc] initWithTitle:@""];
 	[NSApp setMainMenu:main_menu];
 	[NSApp finishLaunching];
 
@@ -641,7 +467,10 @@ OS_OSX::OS_OSX() {
 	ERR_FAIL_COND(!delegate);
 	[NSApp setDelegate:delegate];
 
-	//process application:openFile: event
+	pre_wait_observer = CFRunLoopObserverCreate(kCFAllocatorDefault, kCFRunLoopBeforeWaiting, true, 0, &pre_wait_observer_cb, nullptr);
+	CFRunLoopAddObserver(CFRunLoopGetCurrent(), pre_wait_observer, kCFRunLoopCommonModes);
+
+	// Process application:openFile: event.
 	while (true) {
 		NSEvent *event = [NSApp
 				nextEventMatchingMask:NSEventMaskAny
@@ -659,14 +488,7 @@ OS_OSX::OS_OSX() {
 	[NSApp activateIgnoringOtherApps:YES];
 }
 
-bool OS_OSX::_check_internal_feature_support(const String &p_feature) {
-	return p_feature == "pc";
-}
-
-void OS_OSX::disable_crash_handler() {
-	crash_handler.disable();
-}
-
-bool OS_OSX::is_disable_crash_handler() const {
-	return crash_handler.is_disabled();
+OS_OSX::~OS_OSX() {
+	CFRunLoopRemoveObserver(CFRunLoopGetCurrent(), pre_wait_observer, kCFRunLoopCommonModes);
+	CFRelease(pre_wait_observer);
 }
diff --git a/platform/osx/osx_terminal_logger.h b/platform/osx/osx_terminal_logger.h
new file mode 100644
index 0000000000..8413509c4b
--- /dev/null
+++ b/platform/osx/osx_terminal_logger.h
@@ -0,0 +1,44 @@
+/*************************************************************************/
+/*  osx_terminal_logger.h                                                */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#ifndef OSX_TERMINAL_LOGGER_H
+#define OSX_TERMINAL_LOGGER_H
+
+#ifdef OSX_ENABLED
+
+#include "core/io/logger.h"
+
+class OSXTerminalLogger : public StdLogger {
+public:
+	virtual void log_error(const char *p_function, const char *p_file, int p_line, const char *p_code, const char *p_rationale, bool p_editor_notify = false, ErrorType p_type = ERR_ERROR) override;
+};
+
+#endif // OSX_ENABLED
+#endif // OSX_TERMINAL_LOGGER_H
diff --git a/platform/osx/osx_terminal_logger.mm b/platform/osx/osx_terminal_logger.mm
new file mode 100644
index 0000000000..c1dca111a7
--- /dev/null
+++ b/platform/osx/osx_terminal_logger.mm
@@ -0,0 +1,81 @@
+/*************************************************************************/
+/*  osx_terminal_logger.mm                                               */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#include "osx_terminal_logger.h"
+
+#ifdef OSX_ENABLED
+
+#include <os/log.h>
+
+void OSXTerminalLogger::log_error(const char *p_function, const char *p_file, int p_line, const char *p_code, const char *p_rationale, bool p_editor_notify, ErrorType p_type) {
+	if (!should_log(true)) {
+		return;
+	}
+
+	const char *err_details;
+	if (p_rationale && p_rationale[0])
+		err_details = p_rationale;
+	else
+		err_details = p_code;
+
+	switch (p_type) {
+		case ERR_WARNING:
+			os_log_info(OS_LOG_DEFAULT,
+					"WARNING: %{public}s\nat: %{public}s (%{public}s:%i)",
+					err_details, p_function, p_file, p_line);
+			logf_error("\E[1;33mWARNING:\E[0;93m %s\n", err_details);
+			logf_error("\E[0;90m     at: %s (%s:%i)\E[0m\n", p_function, p_file, p_line);
+			break;
+		case ERR_SCRIPT:
+			os_log_error(OS_LOG_DEFAULT,
+					"SCRIPT ERROR: %{public}s\nat: %{public}s (%{public}s:%i)",
+					err_details, p_function, p_file, p_line);
+			logf_error("\E[1;35mSCRIPT ERROR:\E[0;95m %s\n", err_details);
+			logf_error("\E[0;90m          at: %s (%s:%i)\E[0m\n", p_function, p_file, p_line);
+			break;
+		case ERR_SHADER:
+			os_log_error(OS_LOG_DEFAULT,
+					"SHADER ERROR: %{public}s\nat: %{public}s (%{public}s:%i)",
+					err_details, p_function, p_file, p_line);
+			logf_error("\E[1;36mSHADER ERROR:\E[0;96m %s\n", err_details);
+			logf_error("\E[0;90m          at: %s (%s:%i)\E[0m\n", p_function, p_file, p_line);
+			break;
+		case ERR_ERROR:
+		default:
+			os_log_error(OS_LOG_DEFAULT,
+					"ERROR: %{public}s\nat: %{public}s (%{public}s:%i)",
+					err_details, p_function, p_file, p_line);
+			logf_error("\E[1;31mERROR:\E[0;91m %s\n", err_details);
+			logf_error("\E[0;90m   at: %s (%s:%i)\E[0m\n", p_function, p_file, p_line);
+			break;
+	}
+}
+
+#endif // OSX_ENABLED
diff --git a/platform/osx/vulkan_context_osx.mm b/platform/osx/vulkan_context_osx.mm
index f32fab1eee..bdabc24c28 100644
--- a/platform/osx/vulkan_context_osx.mm
+++ b/platform/osx/vulkan_context_osx.mm
@@ -44,7 +44,7 @@ Error VulkanContextOSX::window_create(DisplayServer::WindowID p_window_id, Displ
 	createInfo.sType = VK_STRUCTURE_TYPE_MACOS_SURFACE_CREATE_INFO_MVK;
 	createInfo.pNext = nullptr;
 	createInfo.flags = 0;
-	createInfo.pView = p_window;
+	createInfo.pView = (__bridge const void *)p_window;
 
 	VkSurfaceKHR surface;
 	VkResult err = vkCreateMacOSSurfaceMVK(get_instance(), &createInfo, nullptr, &surface);