Add macOS DisplayServer implementation.

Change global menu to use Callable, add support for check items and submenus.

1 files changed, 10 insertions, 233 deletions

diff --git a/platform/osx/os_osx.h b/platform/osx/os_osx.h
index de8a9345e3..d2c67cff9f 100644
--- a/platform/osx/os_osx.h
+++ b/platform/osx/os_osx.h
@@ -31,56 +31,20 @@
 #ifndef OS_OSX_H
 #define OS_OSX_H
 
-#define BitMap _QDBitMap // Suppress deprecated QuickDraw definition.
-
-#include "core/input/inpu_filter.h"
+#include "core/input/input_filter.h"
 #include "crash_handler_osx.h"
 #include "drivers/coreaudio/audio_driver_coreaudio.h"
 #include "drivers/coremidi/midi_driver_coremidi.h"
 #include "drivers/unix/os_unix.h"
 #include "joypad_osx.h"
 #include "servers/audio_server.h"
-#include "servers/visual/rasterizer.h"
-#include "servers/visual/visual_server_wrap_mt.h"
-#include "servers/visual_server.h"
-
-#if defined(OPENGL_ENABLED)
-#include "context_gl_osx.h"
-#endif
-
-#if defined(VULKAN_ENABLED)
-#include "drivers/vulkan/rendering_device_vulkan.h"
-#include "platform/osx/vulkan_context_osx.h"
-#endif
-
-#include <AppKit/AppKit.h>
-#include <AppKit/NSCursor.h>
-#include <ApplicationServices/ApplicationServices.h>
-#include <CoreVideo/CoreVideo.h>
-
-#undef BitMap
-#undef CursorShape
 
 class OS_OSX : public OS_Unix {
-public:
-	struct KeyEvent {
-		unsigned int osx_state;
-		bool pressed;
-		bool echo;
-		bool raw;
-		uint32_t keycode;
-		uint32_t physical_keycode;
-		uint32_t unicode;
-	};
-
-	Vector<KeyEvent> key_event_buffer;
-	int key_event_pos;
+	virtual void delete_main_loop();
 
 	bool force_quit;
-	VisualServer *visual_server;
 
-	List<String> args;
-	MainLoop *main_loop;
+	JoypadOSX *joypad_osx;
 
 #ifdef COREAUDIO_ENABLED
 	AudioDriverCoreAudio audio_driver;
@@ -89,143 +53,27 @@ public:
 	MIDIDriverCoreMidi midi_driver;
 #endif
 
-	InputDefault *input;
-	JoypadOSX *joypad_osx;
-
-	/* objc */
-
-	CGEventSourceRef eventSource;
-
-	void process_events();
-	void process_key_events();
-
-	//          pthread_key_t   current;
-	bool mouse_grab;
-	Point2 mouse_pos;
-
-	id delegate;
-	id window_delegate;
-	id window_object;
-	id window_view;
-	id autoreleasePool;
-	id cursor;
-
-#if defined(OPENGL_ENABLED)
-	ContextGL_OSX *context_gles2;
-#endif
-
-#if defined(VULKAN_ENABLED)
-	VulkanContextOSX *context_vulkan;
-	RenderingDeviceVulkan *rendering_device_vulkan;
-#endif
-
-	bool layered_window;
-
-	CursorShape cursor_shape;
-	NSCursor *cursors[CURSOR_MAX];
-	Map<CursorShape, Vector<Variant>> cursors_cache;
-	MouseMode mouse_mode;
-
-	String title;
-	bool minimized;
-	bool maximized;
-	bool zoomed;
-	bool resizable;
-	bool window_focused;
-
-	Size2 window_size;
-	Rect2 restore_rect;
-
-	String open_with_filename;
-
-	Point2 im_position;
-	bool im_active;
-	String im_text;
-	Point2 im_selection;
-
-	Size2 min_size;
-	Size2 max_size;
-
 	CrashHandler crash_handler;
 
-	float _mouse_scale(float p_scale) {
-		if (_display_scale() > 1.0)
-			return p_scale;
-		else
-			return 1.0;
-	}
-
-	float _display_scale() const;
-	float _display_scale(id screen) const;
-
-	void _update_window();
-
-	int video_driver_index;
-	virtual int get_current_video_driver() const;
-
-	struct GlobalMenuItem {
-		String label;
-		Variant signal;
-		Variant meta;
-
-		GlobalMenuItem() {
-			//NOP
-		}
-
-		GlobalMenuItem(const String &p_label, const Variant &p_signal, const Variant &p_meta) {
-			label = p_label;
-			signal = p_signal;
-			meta = p_meta;
-		}
-	};
-
-	Map<String, Vector<GlobalMenuItem>> global_menus;
+	MainLoop *main_loop;
 
-	void _update_global_menu();
+public:
+	String open_with_filename;
 
 protected:
 	virtual void initialize_core();
-	virtual Error initialize(const VideoMode &p_desired, int p_video_driver, int p_audio_driver);
+	virtual void initialize();
 	virtual void finalize();
 
+	virtual void initialize_joypads();
+
 	virtual void set_main_loop(MainLoop *p_main_loop);
-	virtual void delete_main_loop();
 
 public:
-	static OS_OSX *singleton;
-
-	void global_menu_add_item(const String &p_menu, const String &p_label, const Variant &p_signal, const Variant &p_meta);
-	void global_menu_add_separator(const String &p_menu);
-	void global_menu_remove_item(const String &p_menu, int p_idx);
-	void global_menu_clear(const String &p_menu);
-
-	void wm_minimized(bool p_minimized);
-
 	virtual String get_name() const;
 
-	virtual void alert(const String &p_alert, const String &p_title = "ALERT!");
-
 	virtual Error open_dynamic_library(const String p_path, void *&p_library_handle, bool p_also_set_library_path = false);
 
-	virtual void set_cursor_shape(CursorShape p_shape);
-	virtual CursorShape get_cursor_shape() const;
-	virtual void set_custom_mouse_cursor(const RES &p_cursor, CursorShape p_shape, const Vector2 &p_hotspot);
-
-	virtual void set_mouse_show(bool p_show);
-	virtual void set_mouse_grab(bool p_grab);
-	virtual bool is_mouse_grab_enabled() const;
-	virtual void warp_mouse_position(const Point2 &p_to);
-	virtual Point2 get_mouse_position() const;
-	virtual int get_mouse_button_state() const;
-	void update_real_mouse_position();
-	virtual void set_window_title(const String &p_title);
-
-	virtual Size2 get_window_size() const;
-	virtual Size2 get_real_window_size() const;
-
-	virtual void set_native_icon(const String &p_filename);
-	virtual void set_icon(const Ref<Image> &p_icon);
-
 	virtual MainLoop *get_main_loop() const;
 
 	virtual String get_config_path() const;
@@ -236,95 +84,24 @@ public:
 
 	virtual String get_system_dir(SystemDir p_dir) const;
 
-	virtual bool can_draw() const;
-
-	virtual void set_clipboard(const String &p_text);
-	virtual String get_clipboard() const;
-
-	virtual void release_rendering_thread();
-	virtual void make_rendering_thread();
-	virtual void swap_buffers();
-
 	Error shell_open(String p_uri);
-	void push_input(const Ref<InputEvent> &p_event);
 
 	String get_locale() const;
 
-	virtual void set_video_mode(const VideoMode &p_video_mode, int p_screen = 0);
-	virtual VideoMode get_video_mode(int p_screen = 0) const;
-	virtual void get_fullscreen_mode_list(List<VideoMode> *p_list, int p_screen = 0) const;
-
 	virtual String get_executable_path() const;
 
-	virtual LatinKeyboardVariant get_latin_keyboard_variant() const;
-
-	virtual void move_window_to_foreground();
-
-	virtual int get_screen_count() const;
-	virtual int get_current_screen() const;
-	virtual void set_current_screen(int p_screen);
-	virtual Point2 get_screen_position(int p_screen = -1) const;
-	virtual Size2 get_screen_size(int p_screen = -1) const;
-	virtual int get_screen_dpi(int p_screen = -1) const;
-
-	virtual Point2 get_window_position() const;
-	virtual void set_window_position(const Point2 &p_position);
-	virtual Size2 get_max_window_size() const;
-	virtual Size2 get_min_window_size() const;
-	virtual void set_min_window_size(const Size2 p_size);
-	virtual void set_max_window_size(const Size2 p_size);
-	virtual void set_window_size(const Size2 p_size);
-	virtual void set_window_fullscreen(bool p_enabled);
-	virtual bool is_window_fullscreen() const;
-	virtual void set_window_resizable(bool p_enabled);
-	virtual bool is_window_resizable() const;
-	virtual void set_window_minimized(bool p_enabled);
-	virtual bool is_window_minimized() const;
-	virtual void set_window_maximized(bool p_enabled);
-	virtual bool is_window_maximized() const;
-	virtual void set_window_always_on_top(bool p_enabled);
-	virtual bool is_window_always_on_top() const;
-	virtual bool is_window_focused() const;
-	virtual void request_attention();
-	virtual String get_joy_guid(int p_device) const;
-
-	virtual void set_borderless_window(bool p_borderless);
-	virtual bool get_borderless_window();
-
-	virtual bool get_window_per_pixel_transparency_enabled() const;
-	virtual void set_window_per_pixel_transparency_enabled(bool p_enabled);
-
-	virtual void set_ime_active(const bool p_active);
-	virtual void set_ime_position(const Point2 &p_pos);
-	virtual Point2 get_ime_selection() const;
-	virtual String get_ime_text() const;
-
-	virtual String get_unique_id() const;
+	virtual String get_unique_id() const; //++
 
 	virtual bool _check_internal_feature_support(const String &p_feature);
 
-	virtual void _set_use_vsync(bool p_enable);
-	//virtual bool is_vsync_enabled() const;
-
 	void run();
 
-	void set_mouse_mode(MouseMode p_mode);
-	MouseMode get_mouse_mode() const;
-
 	void disable_crash_handler();
 	bool is_disable_crash_handler() const;
 
 	virtual Error move_to_trash(const String &p_path);
 
-	void force_process_input();
-
 	OS_OSX();
-
-private:
-	Point2 get_native_screen_position(int p_screen) const;
-	Point2 get_native_window_position() const;
-	void set_native_window_position(const Point2 &p_position);
-	Point2 get_screens_origin() const;
 };
 
 #endif