diff options
Diffstat (limited to 'platform/macos/display_server_macos.mm')
| -rw-r--r-- | platform/macos/display_server_macos.mm | 1279 |
1 files changed, 34 insertions, 1245 deletions
diff --git a/platform/macos/display_server_macos.mm b/platform/macos/display_server_macos.mm index 2d6e614a05..29bc60bd2a 100644 --- a/platform/macos/display_server_macos.mm +++ b/platform/macos/display_server_macos.mm @@ -65,66 +65,6 @@ #import <IOKit/hid/IOHIDKeys.h> #import <IOKit/hid/IOHIDLib.h> -#define MENU_TAG_START 0x00004447 -#define MENU_TAG_END 0xFFFF4447 - -const NSMenu *DisplayServerMacOS::_get_menu_root(const String &p_menu_root) const { - const NSMenu *menu = nullptr; - if (p_menu_root == "" || p_menu_root.to_lower() == "_main") { - // Main menu. - menu = [NSApp mainMenu]; - } else if (p_menu_root.to_lower() == "_dock") { - // macOS dock menu. - menu = dock_menu; - } else if (p_menu_root.to_lower() == "_apple") { - // macOS Apple menu. - menu = apple_menu; - } else if (p_menu_root.to_lower() == "_window") { - // macOS Window menu. - menu = window_menu; - } else if (p_menu_root.to_lower() == "_help") { - // macOS Help menu. - menu = help_menu; - } else { - // Submenu. - if (submenu.has(p_menu_root)) { - menu = submenu[p_menu_root].menu; - } - } - return menu; -} - -NSMenu *DisplayServerMacOS::_get_menu_root(const String &p_menu_root) { - NSMenu *menu = nullptr; - if (p_menu_root == "" || p_menu_root.to_lower() == "_main") { - // Main menu. - menu = [NSApp mainMenu]; - } else if (p_menu_root.to_lower() == "_dock") { - // macOS dock menu. - menu = dock_menu; - } else if (p_menu_root.to_lower() == "_apple") { - // macOS Apple menu. - menu = apple_menu; - } else if (p_menu_root.to_lower() == "_window") { - // macOS Window menu. - menu = window_menu; - } else if (p_menu_root.to_lower() == "_help") { - // macOS Help menu. - menu = help_menu; - } else { - // Submenu. - if (!submenu.has(p_menu_root)) { - NSMenu *n_menu = [[NSMenu alloc] initWithTitle:[NSString stringWithUTF8String:p_menu_root.utf8().get_data()]]; - [n_menu setAutoenablesItems:NO]; - [n_menu setDelegate:menu_delegate]; - submenu[p_menu_root].menu = n_menu; - submenu_inv[n_menu] = p_menu_root; - } - menu = submenu[p_menu_root].menu; - } - return menu; -} - DisplayServerMacOS::WindowID DisplayServerMacOS::_create_window(WindowMode p_mode, VSyncMode p_vsync_mode, const Rect2i &p_rect) { WindowID id; const float scale = screen_get_max_scale(); @@ -620,42 +560,6 @@ NSCursor *DisplayServerMacOS::_cursor_from_selector(SEL p_selector, SEL p_fallba return [NSCursor arrowCursor]; } -NSMenu *DisplayServerMacOS::get_dock_menu() const { - return dock_menu; -} - -void DisplayServerMacOS::menu_open(NSMenu *p_menu) { - if (submenu_inv.has(p_menu)) { - MenuData &md = submenu[submenu_inv[p_menu]]; - md.is_open = true; - if (md.open.is_valid()) { - Variant ret; - Callable::CallError ce; - - md.open.callp(nullptr, 0, ret, ce); - if (ce.error != Callable::CallError::CALL_OK) { - ERR_PRINT(vformat("Failed to execute menu open callback: %s.", Variant::get_callable_error_text(md.open, nullptr, 0, ce))); - } - } - } -} - -void DisplayServerMacOS::menu_close(NSMenu *p_menu) { - if (submenu_inv.has(p_menu)) { - MenuData &md = submenu[submenu_inv[p_menu]]; - md.is_open = false; - if (md.close.is_valid()) { - Variant ret; - Callable::CallError ce; - - md.close.callp(nullptr, 0, ret, ce); - if (ce.error != Callable::CallError::CALL_OK) { - ERR_PRINT(vformat("Failed to execute menu close callback: %s.", Variant::get_callable_error_text(md.close, nullptr, 0, ce))); - } - } - } -} - void DisplayServerMacOS::menu_callback(id p_sender) { if (![p_sender representedObject]) { return; @@ -839,7 +743,11 @@ void DisplayServerMacOS::window_resize(WindowID p_window, int p_width, int p_hei bool DisplayServerMacOS::has_feature(Feature p_feature) const { switch (p_feature) { - case FEATURE_GLOBAL_MENU: +#ifndef DISABLE_DEPRECATED + case FEATURE_GLOBAL_MENU: { + return (native_menu && native_menu->has_feature(NativeMenu::FEATURE_GLOBAL_MENU)); + } break; +#endif case FEATURE_SUBWINDOWS: //case FEATURE_TOUCHSCREEN: case FEATURE_MOUSE: @@ -884,1135 +792,6 @@ Callable DisplayServerMacOS::_help_get_action_callback() const { return help_action_callback; } -bool DisplayServerMacOS::_is_menu_opened(NSMenu *p_menu) const { - if (submenu_inv.has(p_menu)) { - const MenuData &md = submenu[submenu_inv[p_menu]]; - if (md.is_open) { - return true; - } - } - for (NSInteger i = (p_menu == [NSApp mainMenu]) ? 1 : 0; i < [p_menu numberOfItems]; i++) { - const NSMenuItem *menu_item = [p_menu itemAtIndex:i]; - if ([menu_item submenu]) { - if (_is_menu_opened([menu_item submenu])) { - return true; - } - } - } - return false; -} - -int DisplayServerMacOS::_get_system_menu_start(const NSMenu *p_menu) const { - if (p_menu == [NSApp mainMenu]) { // Skip Apple menu. - return 1; - } - if (p_menu == apple_menu || p_menu == window_menu || p_menu == help_menu) { - int count = [p_menu numberOfItems]; - for (int i = 0; i < count; i++) { - NSMenuItem *menu_item = [p_menu itemAtIndex:i]; - if (menu_item.tag == MENU_TAG_START) { - return i + 1; - } - } - } - return 0; -} - -int DisplayServerMacOS::_get_system_menu_count(const NSMenu *p_menu) const { - if (p_menu == [NSApp mainMenu]) { // Skip Apple, Window and Help menu. - return [p_menu numberOfItems] - 3; - } - if (p_menu == apple_menu || p_menu == window_menu || p_menu == help_menu) { - int start = 0; - int count = [p_menu numberOfItems]; - for (int i = 0; i < count; i++) { - NSMenuItem *menu_item = [p_menu itemAtIndex:i]; - if (menu_item.tag == MENU_TAG_START) { - start = i + 1; - } - if (menu_item.tag == MENU_TAG_END) { - return i - start; - } - } - } - return [p_menu numberOfItems]; -} - -NSMenuItem *DisplayServerMacOS::_menu_add_item(const String &p_menu_root, const String &p_label, Key p_accel, int p_index, int *r_out) { - NSMenu *menu = _get_menu_root(p_menu_root); - if (menu) { - String keycode = KeyMappingMacOS::keycode_get_native_string(p_accel & KeyModifierMask::CODE_MASK); - NSMenuItem *menu_item; - int item_start = _get_system_menu_start(menu); - int item_count = _get_system_menu_count(menu); - if (p_index < 0) { - p_index = item_start + item_count; - } else { - p_index += item_start; - p_index = CLAMP(p_index, item_start, item_start + item_count); - } - menu_item = [menu insertItemWithTitle:[NSString stringWithUTF8String:p_label.utf8().get_data()] action:@selector(globalMenuCallback:) keyEquivalent:[NSString stringWithUTF8String:keycode.utf8().get_data()] atIndex:p_index]; - *r_out = p_index - item_start; - return menu_item; - } - return nullptr; -} - -int DisplayServerMacOS::global_menu_add_item(const String &p_menu_root, const String &p_label, const Callable &p_callback, const Callable &p_key_callback, const Variant &p_tag, Key p_accel, int p_index) { - _THREAD_SAFE_METHOD_ - - int out = -1; - NSMenuItem *menu_item = _menu_add_item(p_menu_root, p_label, p_accel, p_index, &out); - if (menu_item) { - GodotMenuItem *obj = [[GodotMenuItem alloc] init]; - obj->callback = p_callback; - obj->key_callback = p_key_callback; - obj->meta = p_tag; - obj->checkable_type = CHECKABLE_TYPE_NONE; - obj->max_states = 0; - obj->state = 0; - [menu_item setKeyEquivalentModifierMask:KeyMappingMacOS::keycode_get_native_mask(p_accel)]; - [menu_item setRepresentedObject:obj]; - } - return out; -} - -int DisplayServerMacOS::global_menu_add_check_item(const String &p_menu_root, const String &p_label, const Callable &p_callback, const Callable &p_key_callback, const Variant &p_tag, Key p_accel, int p_index) { - _THREAD_SAFE_METHOD_ - - int out = -1; - NSMenuItem *menu_item = _menu_add_item(p_menu_root, p_label, p_accel, p_index, &out); - if (menu_item) { - GodotMenuItem *obj = [[GodotMenuItem alloc] init]; - obj->callback = p_callback; - obj->key_callback = p_key_callback; - obj->meta = p_tag; - obj->checkable_type = CHECKABLE_TYPE_CHECK_BOX; - obj->max_states = 0; - obj->state = 0; - [menu_item setKeyEquivalentModifierMask:KeyMappingMacOS::keycode_get_native_mask(p_accel)]; - [menu_item setRepresentedObject:obj]; - } - return out; -} - -int DisplayServerMacOS::global_menu_add_icon_item(const String &p_menu_root, const Ref<Texture2D> &p_icon, const String &p_label, const Callable &p_callback, const Callable &p_key_callback, const Variant &p_tag, Key p_accel, int p_index) { - _THREAD_SAFE_METHOD_ - - int out = -1; - NSMenuItem *menu_item = _menu_add_item(p_menu_root, p_label, p_accel, p_index, &out); - if (menu_item) { - GodotMenuItem *obj = [[GodotMenuItem alloc] init]; - obj->callback = p_callback; - obj->key_callback = p_key_callback; - obj->meta = p_tag; - obj->checkable_type = CHECKABLE_TYPE_NONE; - obj->max_states = 0; - obj->state = 0; - if (p_icon.is_valid()) { - obj->img = p_icon->get_image(); - obj->img = obj->img->duplicate(); - if (obj->img->is_compressed()) { - obj->img->decompress(); - } - obj->img->resize(16, 16, Image::INTERPOLATE_LANCZOS); - [menu_item setImage:_convert_to_nsimg(obj->img)]; - } - [menu_item setKeyEquivalentModifierMask:KeyMappingMacOS::keycode_get_native_mask(p_accel)]; - [menu_item setRepresentedObject:obj]; - } - return out; -} - -int DisplayServerMacOS::global_menu_add_icon_check_item(const String &p_menu_root, const Ref<Texture2D> &p_icon, const String &p_label, const Callable &p_callback, const Callable &p_key_callback, const Variant &p_tag, Key p_accel, int p_index) { - _THREAD_SAFE_METHOD_ - - int out = -1; - NSMenuItem *menu_item = _menu_add_item(p_menu_root, p_label, p_accel, p_index, &out); - if (menu_item) { - GodotMenuItem *obj = [[GodotMenuItem alloc] init]; - obj->callback = p_callback; - obj->key_callback = p_key_callback; - obj->meta = p_tag; - obj->checkable_type = CHECKABLE_TYPE_CHECK_BOX; - obj->max_states = 0; - obj->state = 0; - if (p_icon.is_valid()) { - obj->img = p_icon->get_image(); - obj->img = obj->img->duplicate(); - if (obj->img->is_compressed()) { - obj->img->decompress(); - } - obj->img->resize(16, 16, Image::INTERPOLATE_LANCZOS); - [menu_item setImage:_convert_to_nsimg(obj->img)]; - } - [menu_item setKeyEquivalentModifierMask:KeyMappingMacOS::keycode_get_native_mask(p_accel)]; - [menu_item setRepresentedObject:obj]; - } - return out; -} - -int DisplayServerMacOS::global_menu_add_radio_check_item(const String &p_menu_root, const String &p_label, const Callable &p_callback, const Callable &p_key_callback, const Variant &p_tag, Key p_accel, int p_index) { - _THREAD_SAFE_METHOD_ - - int out = -1; - NSMenuItem *menu_item = _menu_add_item(p_menu_root, p_label, p_accel, p_index, &out); - if (menu_item) { - GodotMenuItem *obj = [[GodotMenuItem alloc] init]; - obj->callback = p_callback; - obj->key_callback = p_key_callback; - obj->meta = p_tag; - obj->checkable_type = CHECKABLE_TYPE_RADIO_BUTTON; - obj->max_states = 0; - obj->state = 0; - [menu_item setKeyEquivalentModifierMask:KeyMappingMacOS::keycode_get_native_mask(p_accel)]; - [menu_item setRepresentedObject:obj]; - } - return out; -} - -int DisplayServerMacOS::global_menu_add_icon_radio_check_item(const String &p_menu_root, const Ref<Texture2D> &p_icon, const String &p_label, const Callable &p_callback, const Callable &p_key_callback, const Variant &p_tag, Key p_accel, int p_index) { - _THREAD_SAFE_METHOD_ - - int out = -1; - NSMenuItem *menu_item = _menu_add_item(p_menu_root, p_label, p_accel, p_index, &out); - if (menu_item) { - GodotMenuItem *obj = [[GodotMenuItem alloc] init]; - obj->callback = p_callback; - obj->key_callback = p_key_callback; - obj->meta = p_tag; - obj->checkable_type = CHECKABLE_TYPE_RADIO_BUTTON; - obj->max_states = 0; - obj->state = 0; - if (p_icon.is_valid()) { - obj->img = p_icon->get_image(); - obj->img = obj->img->duplicate(); - if (obj->img->is_compressed()) { - obj->img->decompress(); - } - obj->img->resize(16, 16, Image::INTERPOLATE_LANCZOS); - [menu_item setImage:_convert_to_nsimg(obj->img)]; - } - [menu_item setKeyEquivalentModifierMask:KeyMappingMacOS::keycode_get_native_mask(p_accel)]; - [menu_item setRepresentedObject:obj]; - } - return out; -} - -int DisplayServerMacOS::global_menu_add_multistate_item(const String &p_menu_root, const String &p_label, int p_max_states, int p_default_state, const Callable &p_callback, const Callable &p_key_callback, const Variant &p_tag, Key p_accel, int p_index) { - _THREAD_SAFE_METHOD_ - - int out = -1; - NSMenuItem *menu_item = _menu_add_item(p_menu_root, p_label, p_accel, p_index, &out); - if (menu_item) { - GodotMenuItem *obj = [[GodotMenuItem alloc] init]; - obj->callback = p_callback; - obj->key_callback = p_key_callback; - obj->meta = p_tag; - obj->checkable_type = CHECKABLE_TYPE_NONE; - obj->max_states = p_max_states; - obj->state = p_default_state; - [menu_item setKeyEquivalentModifierMask:KeyMappingMacOS::keycode_get_native_mask(p_accel)]; - [menu_item setRepresentedObject:obj]; - } - return out; -} - -void DisplayServerMacOS::global_menu_set_popup_callbacks(const String &p_menu_root, const Callable &p_open_callback, const Callable &p_close_callback) { - _THREAD_SAFE_METHOD_ - - if (p_menu_root != "" && p_menu_root.to_lower() != "_main" && p_menu_root.to_lower() != "_dock") { - // Submenu. - if (!submenu.has(p_menu_root)) { - NSMenu *n_menu = [[NSMenu alloc] initWithTitle:[NSString stringWithUTF8String:p_menu_root.utf8().get_data()]]; - [n_menu setAutoenablesItems:NO]; - [n_menu setDelegate:menu_delegate]; - submenu[p_menu_root].menu = n_menu; - submenu_inv[n_menu] = p_menu_root; - } - submenu[p_menu_root].open = p_open_callback; - submenu[p_menu_root].close = p_close_callback; - } -} - -int DisplayServerMacOS::global_menu_add_submenu_item(const String &p_menu_root, const String &p_label, const String &p_submenu, int p_index) { - _THREAD_SAFE_METHOD_ - - NSMenu *menu = _get_menu_root(p_menu_root); - NSMenu *sub_menu = _get_menu_root(p_submenu); - int out = -1; - if (menu && sub_menu) { - if (sub_menu == menu) { - ERR_PRINT("Can't set submenu to self!"); - return -1; - } - if ([sub_menu supermenu]) { - ERR_PRINT("Can't set submenu to menu that is already a submenu of some other menu!"); - return -1; - } - NSMenuItem *menu_item; - int item_start = _get_system_menu_start(menu); - int item_count = _get_system_menu_count(menu); - if (p_index < 0) { - p_index = item_start + item_count; - } else { - p_index += item_start; - p_index = CLAMP(p_index, item_start, item_start + item_count); - } - menu_item = [menu insertItemWithTitle:[NSString stringWithUTF8String:p_label.utf8().get_data()] action:nil keyEquivalent:@"" atIndex:p_index]; - out = p_index - item_start; - - GodotMenuItem *obj = [[GodotMenuItem alloc] init]; - obj->callback = Callable(); - obj->checkable_type = CHECKABLE_TYPE_NONE; - obj->max_states = 0; - obj->state = 0; - [menu_item setRepresentedObject:obj]; - - [sub_menu setTitle:[NSString stringWithUTF8String:p_label.utf8().get_data()]]; - [menu setSubmenu:sub_menu forItem:menu_item]; - } - return out; -} - -int DisplayServerMacOS::global_menu_add_separator(const String &p_menu_root, int p_index) { - _THREAD_SAFE_METHOD_ - - NSMenu *menu = _get_menu_root(p_menu_root); - if (menu) { - if (menu == [NSApp mainMenu]) { // Do not add separators into main menu. - return -1; - } - int item_start = _get_system_menu_start(menu); - int item_count = _get_system_menu_count(menu); - if (p_index < 0) { - p_index = item_start + item_count; - } else { - p_index += item_start; - p_index = CLAMP(p_index, item_start, item_start + item_count); - } - [menu insertItem:[NSMenuItem separatorItem] atIndex:p_index]; - return p_index - item_start; - } - return -1; -} - -int DisplayServerMacOS::global_menu_get_item_index_from_text(const String &p_menu_root, const String &p_text) const { - _THREAD_SAFE_METHOD_ - - const NSMenu *menu = _get_menu_root(p_menu_root); - if (menu) { - int item_start = _get_system_menu_start(menu); - return [menu indexOfItemWithTitle:[NSString stringWithUTF8String:p_text.utf8().get_data()]] - item_start; - } - - return -1; -} - -int DisplayServerMacOS::global_menu_get_item_index_from_tag(const String &p_menu_root, const Variant &p_tag) const { - _THREAD_SAFE_METHOD_ - - const NSMenu *menu = _get_menu_root(p_menu_root); - if (menu) { - int item_start = _get_system_menu_start(menu); - int item_count = _get_system_menu_count(menu); - for (NSInteger i = item_start; i < item_start + item_count; i++) { - const NSMenuItem *menu_item = [menu itemAtIndex:i]; - if (menu_item) { - const GodotMenuItem *obj = [menu_item representedObject]; - if (obj && obj->meta == p_tag) { - return i - item_start; - } - } - } - } - - return -1; -} - -bool DisplayServerMacOS::global_menu_is_item_checked(const String &p_menu_root, int p_idx) const { - _THREAD_SAFE_METHOD_ - - const NSMenu *menu = _get_menu_root(p_menu_root); - if (menu) { - ERR_FAIL_COND_V(p_idx < 0, false); - int item_start = _get_system_menu_start(menu); - int item_count = _get_system_menu_count(menu); - p_idx += item_start; - ERR_FAIL_COND_V(p_idx >= item_start + item_count, false); - const NSMenuItem *menu_item = [menu itemAtIndex:p_idx]; - if (menu_item) { - return ([menu_item state] == NSControlStateValueOn); - } - } - return false; -} - -bool DisplayServerMacOS::global_menu_is_item_checkable(const String &p_menu_root, int p_idx) const { - _THREAD_SAFE_METHOD_ - - const NSMenu *menu = _get_menu_root(p_menu_root); - if (menu) { - ERR_FAIL_COND_V(p_idx < 0, false); - int item_start = _get_system_menu_start(menu); - int item_count = _get_system_menu_count(menu); - p_idx += item_start; - ERR_FAIL_COND_V(p_idx >= item_start + item_count, false); - const NSMenuItem *menu_item = [menu itemAtIndex:p_idx]; - if (menu_item) { - GodotMenuItem *obj = [menu_item representedObject]; - if (obj) { - return obj->checkable_type == CHECKABLE_TYPE_CHECK_BOX; - } - } - } - return false; -} - -bool DisplayServerMacOS::global_menu_is_item_radio_checkable(const String &p_menu_root, int p_idx) const { - _THREAD_SAFE_METHOD_ - - const NSMenu *menu = _get_menu_root(p_menu_root); - if (menu) { - ERR_FAIL_COND_V(p_idx < 0, false); - int item_start = _get_system_menu_start(menu); - int item_count = _get_system_menu_count(menu); - p_idx += item_start; - ERR_FAIL_COND_V(p_idx >= item_start + item_count, false); - const NSMenuItem *menu_item = [menu itemAtIndex:p_idx]; - if (menu_item) { - GodotMenuItem *obj = [menu_item representedObject]; - if (obj) { - return obj->checkable_type == CHECKABLE_TYPE_RADIO_BUTTON; - } - } - } - return false; -} - -Callable DisplayServerMacOS::global_menu_get_item_callback(const String &p_menu_root, int p_idx) const { - _THREAD_SAFE_METHOD_ - - const NSMenu *menu = _get_menu_root(p_menu_root); - if (menu) { - ERR_FAIL_COND_V(p_idx < 0, Callable()); - int item_start = _get_system_menu_start(menu); - int item_count = _get_system_menu_count(menu); - p_idx += item_start; - ERR_FAIL_COND_V(p_idx >= item_start + item_count, Callable()); - const NSMenuItem *menu_item = [menu itemAtIndex:p_idx]; - if (menu_item) { - GodotMenuItem *obj = [menu_item representedObject]; - if (obj) { - return obj->callback; - } - } - } - return Callable(); -} - -Callable DisplayServerMacOS::global_menu_get_item_key_callback(const String &p_menu_root, int p_idx) const { - _THREAD_SAFE_METHOD_ - - const NSMenu *menu = _get_menu_root(p_menu_root); - if (menu) { - ERR_FAIL_COND_V(p_idx < 0, Callable()); - int item_start = _get_system_menu_start(menu); - int item_count = _get_system_menu_count(menu); - p_idx += item_start; - ERR_FAIL_COND_V(p_idx >= item_start + item_count, Callable()); - const NSMenuItem *menu_item = [menu itemAtIndex:p_idx]; - if (menu_item) { - GodotMenuItem *obj = [menu_item representedObject]; - if (obj) { - return obj->key_callback; - } - } - } - return Callable(); -} - -Variant DisplayServerMacOS::global_menu_get_item_tag(const String &p_menu_root, int p_idx) const { - _THREAD_SAFE_METHOD_ - - const NSMenu *menu = _get_menu_root(p_menu_root); - if (menu) { - ERR_FAIL_COND_V(p_idx < 0, Variant()); - int item_start = _get_system_menu_start(menu); - int item_count = _get_system_menu_count(menu); - p_idx += item_start; - ERR_FAIL_COND_V(p_idx >= item_start + item_count, Variant()); - const NSMenuItem *menu_item = [menu itemAtIndex:p_idx]; - if (menu_item) { - GodotMenuItem *obj = [menu_item representedObject]; - if (obj) { - return obj->meta; - } - } - } - return Variant(); -} - -String DisplayServerMacOS::global_menu_get_item_text(const String &p_menu_root, int p_idx) const { - _THREAD_SAFE_METHOD_ - - const NSMenu *menu = _get_menu_root(p_menu_root); - if (menu) { - ERR_FAIL_COND_V(p_idx < 0, String()); - int item_start = _get_system_menu_start(menu); - int item_count = _get_system_menu_count(menu); - p_idx += item_start; - ERR_FAIL_COND_V(p_idx >= item_start + item_count, String()); - const NSMenuItem *menu_item = [menu itemAtIndex:p_idx]; - if (menu_item) { - return String::utf8([[menu_item title] UTF8String]); - } - } - return String(); -} - -String DisplayServerMacOS::global_menu_get_item_submenu(const String &p_menu_root, int p_idx) const { - _THREAD_SAFE_METHOD_ - - const NSMenu *menu = _get_menu_root(p_menu_root); - if (menu) { - ERR_FAIL_COND_V(p_idx < 0, String()); - int item_start = _get_system_menu_start(menu); - int item_count = _get_system_menu_count(menu); - p_idx += item_start; - ERR_FAIL_COND_V(p_idx >= item_start + item_count, String()); - const NSMenuItem *menu_item = [menu itemAtIndex:p_idx]; - if (menu_item) { - NSMenu *sub_menu = [menu_item submenu]; - if (sub_menu && submenu_inv.has(sub_menu)) { - return submenu_inv[sub_menu]; - } - } - } - return String(); -} - -Key DisplayServerMacOS::global_menu_get_item_accelerator(const String &p_menu_root, int p_idx) const { - _THREAD_SAFE_METHOD_ - - const NSMenu *menu = _get_menu_root(p_menu_root); - if (menu) { - ERR_FAIL_COND_V(p_idx < 0, Key::NONE); - int item_start = _get_system_menu_start(menu); - int item_count = _get_system_menu_count(menu); - p_idx += item_start; - ERR_FAIL_COND_V(p_idx >= item_start + item_count, Key::NONE); - const NSMenuItem *menu_item = [menu itemAtIndex:p_idx]; - if (menu_item) { - String ret = String::utf8([[menu_item keyEquivalent] UTF8String]); - Key keycode = find_keycode(ret); - NSUInteger mask = [menu_item keyEquivalentModifierMask]; - if (mask & NSEventModifierFlagControl) { - keycode |= KeyModifierMask::CTRL; - } - if (mask & NSEventModifierFlagOption) { - keycode |= KeyModifierMask::ALT; - } - if (mask & NSEventModifierFlagShift) { - keycode |= KeyModifierMask::SHIFT; - } - if (mask & NSEventModifierFlagCommand) { - keycode |= KeyModifierMask::META; - } - if (mask & NSEventModifierFlagNumericPad) { - keycode |= KeyModifierMask::KPAD; - } - return keycode; - } - } - return Key::NONE; -} - -bool DisplayServerMacOS::global_menu_is_item_disabled(const String &p_menu_root, int p_idx) const { - _THREAD_SAFE_METHOD_ - - const NSMenu *menu = _get_menu_root(p_menu_root); - if (menu) { - ERR_FAIL_COND_V(p_idx < 0, false); - int item_start = _get_system_menu_start(menu); - int item_count = _get_system_menu_count(menu); - p_idx += item_start; - ERR_FAIL_COND_V(p_idx >= item_start + item_count, false); - const NSMenuItem *menu_item = [menu itemAtIndex:p_idx]; - if (menu_item) { - return ![menu_item isEnabled]; - } - } - return false; -} - -bool DisplayServerMacOS::global_menu_is_item_hidden(const String &p_menu_root, int p_idx) const { - _THREAD_SAFE_METHOD_ - - const NSMenu *menu = _get_menu_root(p_menu_root); - if (menu) { - ERR_FAIL_COND_V(p_idx < 0, false); - int item_start = _get_system_menu_start(menu); - int item_count = _get_system_menu_count(menu); - p_idx += item_start; - ERR_FAIL_COND_V(p_idx >= item_start + item_count, false); - const NSMenuItem *menu_item = [menu itemAtIndex:p_idx]; - if (menu_item) { - return [menu_item isHidden]; - } - } - return false; -} - -String DisplayServerMacOS::global_menu_get_item_tooltip(const String &p_menu_root, int p_idx) const { - _THREAD_SAFE_METHOD_ - - const NSMenu *menu = _get_menu_root(p_menu_root); - if (menu) { - ERR_FAIL_COND_V(p_idx < 0, String()); - int item_start = _get_system_menu_start(menu); - int item_count = _get_system_menu_count(menu); - p_idx += item_start; - ERR_FAIL_COND_V(p_idx >= item_start + item_count, String()); - const NSMenuItem *menu_item = [menu itemAtIndex:p_idx]; - if (menu_item) { - return String::utf8([[menu_item toolTip] UTF8String]); - } - } - return String(); -} - -int DisplayServerMacOS::global_menu_get_item_state(const String &p_menu_root, int p_idx) const { - _THREAD_SAFE_METHOD_ - - const NSMenu *menu = _get_menu_root(p_menu_root); - if (menu) { - ERR_FAIL_COND_V(p_idx < 0, 0); - int item_start = _get_system_menu_start(menu); - int item_count = _get_system_menu_count(menu); - p_idx += item_start; - ERR_FAIL_COND_V(p_idx >= item_start + item_count, 0); - const NSMenuItem *menu_item = [menu itemAtIndex:p_idx]; - if (menu_item) { - GodotMenuItem *obj = [menu_item representedObject]; - if (obj) { - return obj->state; - } - } - } - return 0; -} - -int DisplayServerMacOS::global_menu_get_item_max_states(const String &p_menu_root, int p_idx) const { - _THREAD_SAFE_METHOD_ - - const NSMenu *menu = _get_menu_root(p_menu_root); - if (menu) { - ERR_FAIL_COND_V(p_idx < 0, 0); - int item_start = _get_system_menu_start(menu); - int item_count = _get_system_menu_count(menu); - p_idx += item_start; - ERR_FAIL_COND_V(p_idx >= item_start + item_count, 0); - const NSMenuItem *menu_item = [menu itemAtIndex:p_idx]; - if (menu_item) { - GodotMenuItem *obj = [menu_item representedObject]; - if (obj) { - return obj->max_states; - } - } - } - return 0; -} - -Ref<Texture2D> DisplayServerMacOS::global_menu_get_item_icon(const String &p_menu_root, int p_idx) const { - _THREAD_SAFE_METHOD_ - - const NSMenu *menu = _get_menu_root(p_menu_root); - if (menu) { - ERR_FAIL_COND_V(p_idx < 0, Ref<Texture2D>()); - int item_start = _get_system_menu_start(menu); - int item_count = _get_system_menu_count(menu); - p_idx += item_start; - ERR_FAIL_COND_V(p_idx >= item_start + item_count, Ref<Texture2D>()); - const NSMenuItem *menu_item = [menu itemAtIndex:p_idx]; - if (menu_item) { - GodotMenuItem *obj = [menu_item representedObject]; - if (obj) { - if (obj->img.is_valid()) { - return ImageTexture::create_from_image(obj->img); - } - } - } - } - return Ref<Texture2D>(); -} - -int DisplayServerMacOS::global_menu_get_item_indentation_level(const String &p_menu_root, int p_idx) const { - _THREAD_SAFE_METHOD_ - - const NSMenu *menu = _get_menu_root(p_menu_root); - if (menu) { - ERR_FAIL_COND_V(p_idx < 0, 0); - int item_start = _get_system_menu_start(menu); - int item_count = _get_system_menu_count(menu); - p_idx += item_start; - ERR_FAIL_COND_V(p_idx >= item_start + item_count, 0); - const NSMenuItem *menu_item = [menu itemAtIndex:p_idx]; - if (menu_item) { - return [menu_item indentationLevel]; - } - } - return 0; -} - -void DisplayServerMacOS::global_menu_set_item_checked(const String &p_menu_root, int p_idx, bool p_checked) { - _THREAD_SAFE_METHOD_ - - NSMenu *menu = _get_menu_root(p_menu_root); - if (menu) { - ERR_FAIL_COND(p_idx < 0); - int item_start = _get_system_menu_start(menu); - int item_count = _get_system_menu_count(menu); - p_idx += item_start; - ERR_FAIL_COND(p_idx >= item_start + item_count); - NSMenuItem *menu_item = [menu itemAtIndex:p_idx]; - if (menu_item) { - if (p_checked) { - [menu_item setState:NSControlStateValueOn]; - } else { - [menu_item setState:NSControlStateValueOff]; - } - } - } -} - -void DisplayServerMacOS::global_menu_set_item_checkable(const String &p_menu_root, int p_idx, bool p_checkable) { - _THREAD_SAFE_METHOD_ - - NSMenu *menu = _get_menu_root(p_menu_root); - if (menu) { - ERR_FAIL_COND(p_idx < 0); - int item_start = _get_system_menu_start(menu); - int item_count = _get_system_menu_count(menu); - p_idx += item_start; - ERR_FAIL_COND(p_idx >= item_start + item_count); - NSMenuItem *menu_item = [menu itemAtIndex:p_idx]; - if (menu_item) { - GodotMenuItem *obj = [menu_item representedObject]; - ERR_FAIL_NULL(obj); - obj->checkable_type = (p_checkable) ? CHECKABLE_TYPE_CHECK_BOX : CHECKABLE_TYPE_NONE; - } - } -} - -void DisplayServerMacOS::global_menu_set_item_radio_checkable(const String &p_menu_root, int p_idx, bool p_checkable) { - _THREAD_SAFE_METHOD_ - - NSMenu *menu = _get_menu_root(p_menu_root); - if (menu) { - ERR_FAIL_COND(p_idx < 0); - int item_start = _get_system_menu_start(menu); - int item_count = _get_system_menu_count(menu); - p_idx += item_start; - ERR_FAIL_COND(p_idx >= item_start + item_count); - NSMenuItem *menu_item = [menu itemAtIndex:p_idx]; - if (menu_item) { - GodotMenuItem *obj = [menu_item representedObject]; - ERR_FAIL_NULL(obj); - obj->checkable_type = (p_checkable) ? CHECKABLE_TYPE_RADIO_BUTTON : CHECKABLE_TYPE_NONE; - } - } -} - -void DisplayServerMacOS::global_menu_set_item_callback(const String &p_menu_root, int p_idx, const Callable &p_callback) { - _THREAD_SAFE_METHOD_ - - NSMenu *menu = _get_menu_root(p_menu_root); - if (menu) { - ERR_FAIL_COND(p_idx < 0); - int item_start = _get_system_menu_start(menu); - int item_count = _get_system_menu_count(menu); - p_idx += item_start; - ERR_FAIL_COND(p_idx >= item_start + item_count); - NSMenuItem *menu_item = [menu itemAtIndex:p_idx]; - if (menu_item) { - GodotMenuItem *obj = [menu_item representedObject]; - ERR_FAIL_NULL(obj); - obj->callback = p_callback; - } - } -} - -void DisplayServerMacOS::global_menu_set_item_hover_callbacks(const String &p_menu_root, int p_idx, const Callable &p_callback) { - _THREAD_SAFE_METHOD_ - - NSMenu *menu = _get_menu_root(p_menu_root); - if (menu) { - ERR_FAIL_COND(p_idx < 0); - int item_start = _get_system_menu_start(menu); - int item_count = _get_system_menu_count(menu); - p_idx += item_start; - ERR_FAIL_COND(p_idx >= item_start + item_count); - NSMenuItem *menu_item = [menu itemAtIndex:p_idx]; - if (menu_item) { - GodotMenuItem *obj = [menu_item representedObject]; - ERR_FAIL_NULL(obj); - obj->hover_callback = p_callback; - } - } -} - -void DisplayServerMacOS::global_menu_set_item_key_callback(const String &p_menu_root, int p_idx, const Callable &p_key_callback) { - _THREAD_SAFE_METHOD_ - - NSMenu *menu = _get_menu_root(p_menu_root); - if (menu) { - ERR_FAIL_COND(p_idx < 0); - int item_start = _get_system_menu_start(menu); - int item_count = _get_system_menu_count(menu); - p_idx += item_start; - ERR_FAIL_COND(p_idx >= item_start + item_count); - NSMenuItem *menu_item = [menu itemAtIndex:p_idx]; - if (menu_item) { - GodotMenuItem *obj = [menu_item representedObject]; - ERR_FAIL_NULL(obj); - obj->key_callback = p_key_callback; - } - } -} - -void DisplayServerMacOS::global_menu_set_item_tag(const String &p_menu_root, int p_idx, const Variant &p_tag) { - _THREAD_SAFE_METHOD_ - - NSMenu *menu = _get_menu_root(p_menu_root); - if (menu) { - ERR_FAIL_COND(p_idx < 0); - int item_start = _get_system_menu_start(menu); - int item_count = _get_system_menu_count(menu); - p_idx += item_start; - ERR_FAIL_COND(p_idx >= item_start + item_count); - NSMenuItem *menu_item = [menu itemAtIndex:p_idx]; - if (menu_item) { - GodotMenuItem *obj = [menu_item representedObject]; - ERR_FAIL_NULL(obj); - obj->meta = p_tag; - } - } -} - -void DisplayServerMacOS::global_menu_set_item_text(const String &p_menu_root, int p_idx, const String &p_text) { - _THREAD_SAFE_METHOD_ - - NSMenu *menu = _get_menu_root(p_menu_root); - if (menu) { - ERR_FAIL_COND(p_idx < 0); - int item_start = _get_system_menu_start(menu); - int item_count = _get_system_menu_count(menu); - p_idx += item_start; - ERR_FAIL_COND(p_idx >= item_start + item_count); - NSMenuItem *menu_item = [menu itemAtIndex:p_idx]; - if (menu_item) { - [menu_item setTitle:[NSString stringWithUTF8String:p_text.utf8().get_data()]]; - NSMenu *sub_menu = [menu_item submenu]; - if (sub_menu) { - [sub_menu setTitle:[NSString stringWithUTF8String:p_text.utf8().get_data()]]; - } - } - } -} - -void DisplayServerMacOS::global_menu_set_item_submenu(const String &p_menu_root, int p_idx, const String &p_submenu) { - _THREAD_SAFE_METHOD_ - - NSMenu *menu = _get_menu_root(p_menu_root); - if (menu && p_submenu.is_empty()) { - ERR_FAIL_COND(p_idx < 0); - int item_start = _get_system_menu_start(menu); - int item_count = _get_system_menu_count(menu); - p_idx += item_start; - ERR_FAIL_COND(p_idx >= item_start + item_count); - NSMenuItem *menu_item = [menu itemAtIndex:p_idx]; - if (menu_item) { - if ([menu_item submenu] && _is_menu_opened([menu_item submenu])) { - ERR_PRINT("Can't remove open menu!"); - return; - } - [menu setSubmenu:nil forItem:menu_item]; - } - return; - } - - NSMenu *sub_menu = _get_menu_root(p_submenu); - if (menu && sub_menu) { - if (sub_menu == menu) { - ERR_PRINT("Can't set submenu to self!"); - return; - } - if ([sub_menu supermenu]) { - ERR_PRINT("Can't set submenu to menu that is already a submenu of some other menu!"); - return; - } - ERR_FAIL_COND(p_idx < 0); - int item_start = _get_system_menu_start(menu); - int item_count = _get_system_menu_count(menu); - p_idx += item_start; - ERR_FAIL_COND(p_idx >= item_start + item_count); - NSMenuItem *menu_item = [menu itemAtIndex:p_idx]; - if (menu_item) { - [menu setSubmenu:sub_menu forItem:menu_item]; - } - } -} - -void DisplayServerMacOS::global_menu_set_item_accelerator(const String &p_menu_root, int p_idx, Key p_keycode) { - _THREAD_SAFE_METHOD_ - - NSMenu *menu = _get_menu_root(p_menu_root); - if (menu) { - ERR_FAIL_COND(p_idx < 0); - int item_start = _get_system_menu_start(menu); - int item_count = _get_system_menu_count(menu); - p_idx += item_start; - ERR_FAIL_COND(p_idx >= item_start + item_count); - NSMenuItem *menu_item = [menu itemAtIndex:p_idx]; - if (menu_item) { - if (p_keycode == Key::NONE) { - [menu_item setKeyEquivalent:@""]; - } else { - [menu_item setKeyEquivalentModifierMask:KeyMappingMacOS::keycode_get_native_mask(p_keycode)]; - String keycode = KeyMappingMacOS::keycode_get_native_string(p_keycode & KeyModifierMask::CODE_MASK); - [menu_item setKeyEquivalent:[NSString stringWithUTF8String:keycode.utf8().get_data()]]; - } - } - } -} - -void DisplayServerMacOS::global_menu_set_item_disabled(const String &p_menu_root, int p_idx, bool p_disabled) { - _THREAD_SAFE_METHOD_ - - NSMenu *menu = _get_menu_root(p_menu_root); - if (menu) { - ERR_FAIL_COND(p_idx < 0); - int item_start = _get_system_menu_start(menu); - int item_count = _get_system_menu_count(menu); - p_idx += item_start; - ERR_FAIL_COND(p_idx >= item_start + item_count); - NSMenuItem *menu_item = [menu itemAtIndex:p_idx]; - if (menu_item) { - [menu_item setEnabled:(!p_disabled)]; - } - } -} - -void DisplayServerMacOS::global_menu_set_item_hidden(const String &p_menu_root, int p_idx, bool p_hidden) { - _THREAD_SAFE_METHOD_ - - NSMenu *menu = _get_menu_root(p_menu_root); - if (menu) { - ERR_FAIL_COND(p_idx < 0); - int item_start = _get_system_menu_start(menu); - int item_count = _get_system_menu_count(menu); - p_idx += item_start; - ERR_FAIL_COND(p_idx >= item_start + item_count); - NSMenuItem *menu_item = [menu itemAtIndex:p_idx]; - if (menu_item) { - [menu_item setHidden:p_hidden]; - } - } -} - -void DisplayServerMacOS::global_menu_set_item_tooltip(const String &p_menu_root, int p_idx, const String &p_tooltip) { - _THREAD_SAFE_METHOD_ - - NSMenu *menu = _get_menu_root(p_menu_root); - if (menu) { - ERR_FAIL_COND(p_idx < 0); - int item_start = _get_system_menu_start(menu); - int item_count = _get_system_menu_count(menu); - p_idx += item_start; - ERR_FAIL_COND(p_idx >= item_start + item_count); - NSMenuItem *menu_item = [menu itemAtIndex:p_idx]; - if (menu_item) { - [menu_item setToolTip:[NSString stringWithUTF8String:p_tooltip.utf8().get_data()]]; - } - } -} - -void DisplayServerMacOS::global_menu_set_item_state(const String &p_menu_root, int p_idx, int p_state) { - _THREAD_SAFE_METHOD_ - - NSMenu *menu = _get_menu_root(p_menu_root); - if (menu) { - ERR_FAIL_COND(p_idx < 0); - int item_start = _get_system_menu_start(menu); - int item_count = _get_system_menu_count(menu); - p_idx += item_start; - ERR_FAIL_COND(p_idx >= item_start + item_count); - NSMenuItem *menu_item = [menu itemAtIndex:p_idx]; - if (menu_item) { - GodotMenuItem *obj = [menu_item representedObject]; - ERR_FAIL_NULL(obj); - obj->state = p_state; - } - } -} - -void DisplayServerMacOS::global_menu_set_item_max_states(const String &p_menu_root, int p_idx, int p_max_states) { - _THREAD_SAFE_METHOD_ - - NSMenu *menu = _get_menu_root(p_menu_root); - if (menu) { - ERR_FAIL_COND(p_idx < 0); - int item_start = _get_system_menu_start(menu); - int item_count = _get_system_menu_count(menu); - p_idx += item_start; - ERR_FAIL_COND(p_idx >= item_start + item_count); - NSMenuItem *menu_item = [menu itemAtIndex:p_idx]; - if (menu_item) { - GodotMenuItem *obj = [menu_item representedObject]; - ERR_FAIL_NULL(obj); - obj->max_states = p_max_states; - } - } -} - -void DisplayServerMacOS::global_menu_set_item_icon(const String &p_menu_root, int p_idx, const Ref<Texture2D> &p_icon) { - _THREAD_SAFE_METHOD_ - - NSMenu *menu = _get_menu_root(p_menu_root); - if (menu) { - ERR_FAIL_COND(p_idx < 0); - int item_start = _get_system_menu_start(menu); - int item_count = _get_system_menu_count(menu); - p_idx += item_start; - ERR_FAIL_COND(p_idx >= item_start + item_count); - NSMenuItem *menu_item = [menu itemAtIndex:p_idx]; - if (menu_item) { - GodotMenuItem *obj = [menu_item representedObject]; - ERR_FAIL_NULL(obj); - if (p_icon.is_valid()) { - obj->img = p_icon->get_image(); - obj->img = obj->img->duplicate(); - if (obj->img->is_compressed()) { - obj->img->decompress(); - } - obj->img->resize(16, 16, Image::INTERPOLATE_LANCZOS); - [menu_item setImage:_convert_to_nsimg(obj->img)]; - } else { - obj->img = Ref<Image>(); - [menu_item setImage:nil]; - } - } - } -} - -void DisplayServerMacOS::global_menu_set_item_indentation_level(const String &p_menu_root, int p_idx, int p_level) { - _THREAD_SAFE_METHOD_ - - NSMenu *menu = _get_menu_root(p_menu_root); - if (menu) { - ERR_FAIL_COND(p_idx < 0); - int item_start = _get_system_menu_start(menu); - int item_count = _get_system_menu_count(menu); - p_idx += item_start; - ERR_FAIL_COND(p_idx >= item_start + item_count); - NSMenuItem *menu_item = [menu itemAtIndex:p_idx]; - if (menu_item) { - [menu_item setIndentationLevel:p_level]; - } - } -} - -int DisplayServerMacOS::global_menu_get_item_count(const String &p_menu_root) const { - _THREAD_SAFE_METHOD_ - - const NSMenu *menu = _get_menu_root(p_menu_root); - if (menu) { - return _get_system_menu_count(menu); - } else { - return 0; - } -} - -void DisplayServerMacOS::global_menu_remove_item(const String &p_menu_root, int p_idx) { - _THREAD_SAFE_METHOD_ - - NSMenu *menu = _get_menu_root(p_menu_root); - if (menu) { - ERR_FAIL_COND(p_idx < 0); - int item_start = _get_system_menu_start(menu); - int item_count = _get_system_menu_count(menu); - p_idx += item_start; - ERR_FAIL_COND(p_idx >= item_start + item_count); - NSMenuItem *menu_item = [menu itemAtIndex:p_idx]; - if ([menu_item submenu] && _is_menu_opened([menu_item submenu])) { - ERR_PRINT("Can't remove open menu!"); - return; - } - [menu removeItemAtIndex:p_idx]; - } -} - -void DisplayServerMacOS::global_menu_clear(const String &p_menu_root) { - _THREAD_SAFE_METHOD_ - - NSMenu *menu = _get_menu_root(p_menu_root); - if (menu) { - if (_is_menu_opened(menu)) { - ERR_PRINT("Can't remove open menu!"); - return; - } - - if (menu == apple_menu) { - int start = _get_system_menu_start(apple_menu); - int count = _get_system_menu_count(apple_menu); - for (int i = start + count - 1; i >= start; i--) { - [apple_menu removeItemAtIndex:i]; - } - } else if (menu == window_menu) { - int start = _get_system_menu_start(window_menu); - int count = _get_system_menu_count(window_menu); - for (int i = start + count - 1; i >= start; i--) { - [window_menu removeItemAtIndex:i]; - } - } else if (menu == help_menu) { - int start = _get_system_menu_start(help_menu); - int count = _get_system_menu_count(help_menu); - for (int i = start + count - 1; i >= start; i--) { - [help_menu removeItemAtIndex:i]; - } - } else { - [menu removeAllItems]; - } - - // Restore Apple, Window and Help menu. - if (menu == [NSApp mainMenu]) { - NSMenuItem *menu_item = [menu addItemWithTitle:@"" action:nil keyEquivalent:@""]; - [menu setSubmenu:apple_menu forItem:menu_item]; - - menu_item = [menu addItemWithTitle:@"Window" action:nil keyEquivalent:@""]; - [menu setSubmenu:window_menu forItem:menu_item]; - - menu_item = [menu addItemWithTitle:@"Help" action:nil keyEquivalent:@""]; - [menu setSubmenu:help_menu forItem:menu_item]; - } - - if (submenu.has(p_menu_root)) { - submenu_inv.erase(submenu[p_menu_root].menu); - submenu.erase(p_menu_root); - } - } -} - -Dictionary DisplayServerMacOS::global_menu_get_system_menu_roots() const { - Dictionary out; - out["_dock"] = "@Dock"; - out["_apple"] = "@Apple"; - out["_window"] = "Window"; - out["_help"] = "Help"; - return out; -} - bool DisplayServerMacOS::tts_is_speaking() const { ERR_FAIL_NULL_V_MSG(tts, false, "Enable the \"audio/general/text_to_speech\" project setting to use text-to-speech."); return [tts isSpeaking]; @@ -4690,6 +3469,8 @@ DisplayServerMacOS::DisplayServerMacOS(const String &p_rendering_driver, WindowM tts = [[TTS_MacOS alloc] init]; } + native_menu = memnew(NativeMenuMacOS); + NSMenuItem *menu_item; NSString *title; @@ -4701,47 +3482,47 @@ DisplayServerMacOS::DisplayServerMacOS(const String &p_rendering_driver, WindowM menu_delegate = [[GodotMenuDelegate alloc] init]; // Setup Dock menu. - dock_menu = [[NSMenu alloc] initWithTitle:@"_dock"]; + NSMenu *dock_menu = [[NSMenu alloc] initWithTitle:@"_dock"]; [dock_menu setAutoenablesItems:NO]; [dock_menu setDelegate:menu_delegate]; // Setup Apple menu. - apple_menu = [[NSMenu alloc] initWithTitle:@""]; + NSMenu *application_menu = [[NSMenu alloc] initWithTitle:@""]; title = [NSString stringWithFormat:NSLocalizedString(@"About %@", nil), nsappname]; - [apple_menu addItemWithTitle:title action:@selector(showAbout:) keyEquivalent:@""]; - [apple_menu setAutoenablesItems:NO]; - [apple_menu setDelegate:menu_delegate]; + [application_menu addItemWithTitle:title action:@selector(showAbout:) keyEquivalent:@""]; + [application_menu setAutoenablesItems:NO]; + [application_menu setDelegate:menu_delegate]; - [apple_menu addItem:[NSMenuItem separatorItem]]; + [application_menu addItem:[NSMenuItem separatorItem]]; - menu_item = [apple_menu addItemWithTitle:@"_start_" action:nil keyEquivalent:@""]; + menu_item = [application_menu addItemWithTitle:@"_start_" action:nil keyEquivalent:@""]; menu_item.hidden = YES; menu_item.tag = MENU_TAG_START; - menu_item = [apple_menu addItemWithTitle:@"_end_" action:nil keyEquivalent:@""]; + menu_item = [application_menu addItemWithTitle:@"_end_" action:nil keyEquivalent:@""]; menu_item.hidden = YES; menu_item.tag = MENU_TAG_END; NSMenu *services = [[NSMenu alloc] initWithTitle:@""]; - menu_item = [apple_menu addItemWithTitle:NSLocalizedString(@"Services", nil) action:nil keyEquivalent:@""]; - [apple_menu setSubmenu:services forItem:menu_item]; + menu_item = [application_menu addItemWithTitle:NSLocalizedString(@"Services", nil) action:nil keyEquivalent:@""]; + [application_menu setSubmenu:services forItem:menu_item]; [NSApp setServicesMenu:services]; - [apple_menu addItem:[NSMenuItem separatorItem]]; + [application_menu addItem:[NSMenuItem separatorItem]]; title = [NSString stringWithFormat:NSLocalizedString(@"Hide %@", nil), nsappname]; - [apple_menu addItemWithTitle:title action:@selector(hide:) keyEquivalent:@"h"]; + [application_menu addItemWithTitle:title action:@selector(hide:) keyEquivalent:@"h"]; - menu_item = [apple_menu addItemWithTitle:NSLocalizedString(@"Hide Others", nil) action:@selector(hideOtherApplications:) keyEquivalent:@"h"]; + menu_item = [application_menu addItemWithTitle:NSLocalizedString(@"Hide Others", nil) action:@selector(hideOtherApplications:) keyEquivalent:@"h"]; [menu_item setKeyEquivalentModifierMask:(NSEventModifierFlagOption | NSEventModifierFlagCommand)]; - [apple_menu addItemWithTitle:NSLocalizedString(@"Show all", nil) action:@selector(unhideAllApplications:) keyEquivalent:@""]; + [application_menu addItemWithTitle:NSLocalizedString(@"Show all", nil) action:@selector(unhideAllApplications:) keyEquivalent:@""]; - [apple_menu addItem:[NSMenuItem separatorItem]]; + [application_menu addItem:[NSMenuItem separatorItem]]; title = [NSString stringWithFormat:NSLocalizedString(@"Quit %@", nil), nsappname]; - [apple_menu addItemWithTitle:title action:@selector(terminate:) keyEquivalent:@"q"]; + [application_menu addItemWithTitle:title action:@selector(terminate:) keyEquivalent:@"q"]; - window_menu = [[NSMenu alloc] initWithTitle:NSLocalizedString(@"Window", nil)]; + NSMenu *window_menu = [[NSMenu alloc] initWithTitle:NSLocalizedString(@"Window", nil)]; [window_menu addItemWithTitle:NSLocalizedString(@"Minimize", nil) action:@selector(performMiniaturize:) keyEquivalent:@"m"]; [window_menu addItemWithTitle:NSLocalizedString(@"Zoom", nil) action:@selector(performZoom:) keyEquivalent:@""]; [window_menu addItem:[NSMenuItem separatorItem]]; @@ -4754,7 +3535,7 @@ DisplayServerMacOS::DisplayServerMacOS(const String &p_rendering_driver, WindowM menu_item.hidden = YES; menu_item.tag = MENU_TAG_END; - help_menu = [[NSMenu alloc] initWithTitle:NSLocalizedString(@"Help", nil)]; + NSMenu *help_menu = [[NSMenu alloc] initWithTitle:NSLocalizedString(@"Help", nil)]; menu_item = [help_menu addItemWithTitle:@"_start_" action:nil keyEquivalent:@""]; menu_item.hidden = YES; menu_item.tag = MENU_TAG_START; @@ -4768,7 +3549,7 @@ DisplayServerMacOS::DisplayServerMacOS(const String &p_rendering_driver, WindowM // 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]; + [main_menu setSubmenu:application_menu forItem:menu_item]; menu_item = [main_menu addItemWithTitle:NSLocalizedString(@"Window", nil) action:nil keyEquivalent:@""]; [main_menu setSubmenu:window_menu forItem:menu_item]; @@ -4778,6 +3559,8 @@ DisplayServerMacOS::DisplayServerMacOS(const String &p_rendering_driver, WindowM [main_menu setAutoenablesItems:NO]; + native_menu->_register_system_menus(main_menu, application_menu, window_menu, help_menu, dock_menu); + //!!!!!!!!!!!!!!!!!!!!!!!!!! //TODO - do Vulkan and OpenGL support checks, driver selection and fallback rendering_driver = p_rendering_driver; @@ -4879,6 +3662,12 @@ DisplayServerMacOS::~DisplayServerMacOS() { [[NSStatusBar systemStatusBar] removeStatusItem:E->value.item]; } + // Destroy native menu. + if (native_menu) { + memdelete(native_menu); + native_menu = nullptr; + } + // Destroy all windows. for (HashMap<WindowID, WindowData>::Iterator E = windows.begin(); E;) { HashMap<WindowID, WindowData>::Iterator F = E; |