Moved all the Menu Item initailizations from Window to Application. W…

…ARNING: I have no idea how all this works. This could be buggy. I highly recommend the person who approves of this push to please take a look at it and fix any bugs. Because I have no clue why this worked, and I don't have any more patience with fixing whatever will be thrown in the future.

.gitignore

@@ -40,4 +40,3 @@ tests/arm7tdmi/tests
 tests/m68000/tests
 thirdparty/libchdr/deps/zlib-*/zconf.h
 thirdparty/libchdr/deps/zlib-*/zconf.h.included
-ares/build*

hiro/cocoa/application.cpp

@@ -2,6 +2,103 @@
 
 @implementation CocoaDelegate : NSObject
 
+-(void) constructMenu {
+    NSBundle* bundle = [NSBundle mainBundle];
+    NSDictionary* dictionary = [bundle infoDictionary];
+    NSString* applicationName = [dictionary objectForKey:@"CFBundleDisplayName"];
+
+    menuBar = [[NSMenu alloc] init];
+
+    NSMenuItem* item;
+    string text;
+
+    rootMenu = [[NSMenu alloc] init];
+    item = [[NSMenuItem alloc] initWithTitle:@"" action:nil keyEquivalent:@""];
+    [item setSubmenu:rootMenu];
+    [menuBar addItem:item];
+
+    item = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@"About %@…", applicationName] action:@selector(menuAbout) keyEquivalent:@""];
+    [item setTarget:self];
+    [rootMenu addItem:item];
+    [rootMenu addItem:[NSMenuItem separatorItem]];
+
+    item = [[NSMenuItem alloc] initWithTitle:@"Preferences…" action:@selector(menuPreferences) keyEquivalent:@""];
+    [item setTarget:self];
+    item.keyEquivalentModifierMask = NSEventModifierFlagCommand;
+    item.keyEquivalent = @",";
+    [rootMenu addItem:item];
+
+    [rootMenu addItem:[NSMenuItem separatorItem]];
+
+    NSMenu* servicesMenu = [[NSMenu alloc] initWithTitle:@"Services"];
+    item = [[NSMenuItem alloc] initWithTitle:@"Services" action:nil keyEquivalent:@""];
+    [item setTarget:self];
+    [item setSubmenu:servicesMenu];
+    [rootMenu addItem:item];
+    [rootMenu addItem:[NSMenuItem separatorItem]];
+    [NSApp setServicesMenu:servicesMenu];
+
+    item = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@"Hide %@", applicationName] action:@selector(hide:) keyEquivalent:@""];
+    [item setTarget:NSApp];
+    item.keyEquivalentModifierMask = NSEventModifierFlagCommand;
+    item.keyEquivalent = @"h";
+    [rootMenu addItem:item];
+
+    item = [[NSMenuItem alloc] initWithTitle:@"Hide Others" action:@selector(hideOtherApplications:) keyEquivalent:@""];
+    [item setTarget:NSApp];
+    [item setTarget:NSApp];
+    item.keyEquivalentModifierMask = NSEventModifierFlagCommand | NSEventModifierFlagOption;
+    item.keyEquivalent = @"h";
+    [rootMenu addItem:item];
+
+    item = [[NSMenuItem alloc] initWithTitle:@"Show All" action:@selector(unhideAllApplications:) keyEquivalent:@""];
+    [item setTarget:NSApp];
+    [rootMenu addItem:item];
+
+    [rootMenu addItem:[NSMenuItem separatorItem]];
+
+    item = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@"Quit %@", applicationName] action:@selector(menuQuit) keyEquivalent:@""];
+    [item setTarget:self];
+    item.keyEquivalentModifierMask = NSEventModifierFlagCommand;
+    item.keyEquivalent = @"q";
+    [rootMenu addItem:item];
+
+    item = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@"Edit"] action:nil keyEquivalent:@""];
+    editMenu = [[NSMenu alloc] init];
+    [item setSubmenu:editMenu];
+    [menuBar addItem:item];
+
+    item = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@"Cut"] action:@selector(cut:) keyEquivalent:@"x"];
+    item.keyEquivalentModifierMask = NSEventModifierFlagCommand;
+    [editMenu addItem:item];
+
+    item = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@"Copy"] action:@selector(copy:) keyEquivalent:@"c"];
+    item.keyEquivalentModifierMask = NSEventModifierFlagCommand;
+    [editMenu addItem:item];
+
+    item = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@"Paste"] action:@selector(paste:) keyEquivalent:@"v"];
+    item.keyEquivalentModifierMask = NSEventModifierFlagCommand;
+    [editMenu addItem:item];
+
+    item = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@"Select All"] action:@selector(selectAll:) keyEquivalent:@"a"];
+    item.keyEquivalentModifierMask = NSEventModifierFlagCommand;
+    [editMenu addItem:item];
+
+    [NSApp setMainMenu:menuBar];
+}
+
+-(void) menuAbout {
+  hiro::Application::Cocoa::doAbout();
+}
+
+-(void) menuPreferences {
+  hiro::Application::Cocoa::doPreferences();
+}
+
+-(void) menuQuit {
+  hiro::Application::Cocoa::doQuit();
+}
+
 -(NSApplicationTerminateReply) applicationShouldTerminate:(NSApplication*)sender {
   using hiro::Application;
   if(Application::state().cocoa.onQuit) Application::Cocoa::doQuit();
@@ -115,6 +212,7 @@ auto pApplication::initialize() -> void {
     cocoaDelegate = [[CocoaDelegate alloc] init];
     [NSApp setDelegate:cocoaDelegate];
   }
+  [cocoaDelegate constructMenu];
 }
 
 }

hiro/cocoa/application.hpp

@@ -1,7 +1,15 @@
 #if defined(Hiro_Application)
 
 @interface CocoaDelegate : NSObject <NSApplicationDelegate> {
+@public
+  NSMenu* menuBar;
+  NSMenu* rootMenu;
+  NSMenu* editMenu;
 }
+-(void) constructMenu;
+-(void) menuAbout;
+-(void) menuPreferences;
+-(void) menuQuit;
 -(NSApplicationTerminateReply) applicationShouldTerminate:(NSApplication*)sender;
 -(BOOL) applicationShouldHandleReopen:(NSApplication*)application hasVisibleWindows:(BOOL)flag;
 -(void) run:(NSTimer*)timer;

hiro/cocoa/widget/text-edit.cpp

@@ -17,15 +17,6 @@
   return self;
 }
 
-- (BOOL) validateMenuItem:(NSMenuItem *) menuItem {
-  SEL action = menuItem.action;
-  if (action == @selector(copy:) ||
-        action == @selector(selectAll:)) {
-    return YES;
-  }
-  return [super validateMenuItem:menuItem];
-}
-
 -(NSTextView*) content {
   return content;
 }

hiro/cocoa/widget/text-edit.hpp

@@ -1,11 +1,10 @@
 #if defined(Hiro_TextEdit)
 
-@interface CocoaTextEdit : NSScrollView <NSTextViewDelegate, NSMenuItemValidation> {
+@interface CocoaTextEdit : NSScrollView <NSTextViewDelegate> {
 @public
   hiro::mTextEdit* textEdit;
   NSTextView* content;
 }
--(BOOL) validateMenuItem:(NSMenuItem *) menuItem;
 -(id) initWith:(hiro::mTextEdit&)textEdit;
 -(NSTextView*) content;
 -(void) configure;

hiro/cocoa/window.cpp

@@ -4,7 +4,7 @@
 
 -(id) initWith:(hiro::mWindow&)windowReference {
   window = &windowReference;
-
+    
   NSUInteger style = NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | NSWindowStyleMaskMiniaturizable;
   if(window->state.resizable) style |= NSWindowStyleMaskResizable;
 
@@ -19,76 +19,7 @@
     NSString* applicationName = [dictionary objectForKey:@"CFBundleDisplayName"];
     string hiroName = hiro::Application::state().name ? hiro::Application::state().name : string{"hiro"};
     if(applicationName == nil) applicationName = [NSString stringWithUTF8String:hiroName];
-
-    menuBar = [[NSMenu alloc] init];
-
-    NSMenuItem* item;
-    string text;
-
-    rootMenu = [[NSMenu alloc] init];
-    item = [[NSMenuItem alloc] initWithTitle:@"" action:nil keyEquivalent:@""];
-    [item setSubmenu:rootMenu];
-    [menuBar addItem:item];
-
-    item = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@"About %@…", applicationName] action:@selector(menuAbout) keyEquivalent:@""];
-    [item setTarget:self];
-    [rootMenu addItem:item];
-    [rootMenu addItem:[NSMenuItem separatorItem]];
-
-    item = [[NSMenuItem alloc] initWithTitle:@"Preferences…" action:@selector(menuPreferences) keyEquivalent:@""];
-    [item setTarget:self];
-    item.keyEquivalentModifierMask = NSEventModifierFlagCommand;
-    item.keyEquivalent = @",";
-    [rootMenu addItem:item];
-
-    [rootMenu addItem:[NSMenuItem separatorItem]];
-
-    NSMenu* servicesMenu = [[NSMenu alloc] initWithTitle:@"Services"];
-    item = [[NSMenuItem alloc] initWithTitle:@"Services" action:nil keyEquivalent:@""];
-    [item setTarget:self];
-    [item setSubmenu:servicesMenu];
-    [rootMenu addItem:item];
-    [rootMenu addItem:[NSMenuItem separatorItem]];
-    [NSApp setServicesMenu:servicesMenu];
-
-    item = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@"Hide %@", applicationName] action:@selector(hide:) keyEquivalent:@""];
-    [item setTarget:NSApp];
-    item.keyEquivalentModifierMask = NSEventModifierFlagCommand;
-    item.keyEquivalent = @"h";
-    [rootMenu addItem:item];
-
-    item = [[NSMenuItem alloc] initWithTitle:@"Hide Others" action:@selector(hideOtherApplications:) keyEquivalent:@""];
-    [item setTarget:NSApp];
-    [item setTarget:NSApp];
-    item.keyEquivalentModifierMask = NSEventModifierFlagCommand | NSEventModifierFlagOption;
-    item.keyEquivalent = @"h";
-    [rootMenu addItem:item];
-
-    item = [[NSMenuItem alloc] initWithTitle:@"Show All" action:@selector(unhideAllApplications:) keyEquivalent:@""];
-    [item setTarget:NSApp];
-    [rootMenu addItem:item];
-
-    [rootMenu addItem:[NSMenuItem separatorItem]];
-
-    item = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@"Quit %@", applicationName] action:@selector(menuQuit) keyEquivalent:@""];
-    [item setTarget:self];
-    item.keyEquivalentModifierMask = NSEventModifierFlagCommand;
-    item.keyEquivalent = @"q";
-    [rootMenu addItem:item];
-
-    item = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@"Edit"] action:nil keyEquivalent:@""];
-    editMenu = [[NSMenu alloc] init];
-    [item setSubmenu:editMenu];
-    [menuBar addItem:item];
 
-    item = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@"Copy"] action:@selector(copy:) keyEquivalent:@"c"];
-    item.keyEquivalentModifierMask = NSEventModifierFlagCommand;
-    [editMenu addItem:item];
-
-    item = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@"Select All"] action:@selector(selectAll:) keyEquivalent:@"a"];
-    item.keyEquivalentModifierMask = NSEventModifierFlagCommand;
-    [editMenu addItem:item];
-
     statusBar = [[NSTextField alloc] initWithFrame:NSMakeRect(0, 0, 0, 0)];
     [statusBar setAlignment:NSTextAlignmentLeft];
     [statusBar setBordered:YES];
@@ -111,12 +42,6 @@
   return YES;
 }
 
--(void) windowDidBecomeMain:(NSNotification*)notification {
-  if(window->state.menuBar) {
-    [NSApp setMainMenu:menuBar];
-  }
-}
-
 -(void) windowDidMove:(NSNotification*)notification {
   if(auto p = window->self()) p->moveEvent();
 }
@@ -144,19 +69,7 @@
 }
 
 -(NSMenu*) menuBar {
-  return menuBar;
-}
-
--(void) menuAbout {
-  hiro::Application::Cocoa::doAbout();
-}
-
--(void) menuPreferences {
-  hiro::Application::Cocoa::doPreferences();
-}
-
--(void) menuQuit {
-  hiro::Application::Cocoa::doQuit();
+  return [NSApp mainMenu];
 }
 
 -(NSTextField*) statusBar {
@@ -177,12 +90,6 @@ namespace hiro {
 
 auto pWindow::construct() -> void {
   cocoaWindow = [[CocoaWindow alloc] initWith:self()];
-
-  static bool once = true;
-  if(once) {
-    once = false;
-    [NSApp setMainMenu:[cocoaWindow menuBar]];
-  }
 }
 
 auto pWindow::destruct() -> void {

hiro/cocoa/window.hpp

@@ -1,27 +1,20 @@
 #if defined(Hiro_Window)
 
-@interface CocoaWindow : NSWindow <NSWindowDelegate, NSMenuDelegate> {
+@interface CocoaWindow : NSWindow <NSWindowDelegate> {
 @public
   hiro::mWindow* window;
-  NSMenu* menuBar;
-  NSMenu* rootMenu;
-  NSMenu* editMenu;
   NSMenuItem* disableGatekeeper;
   NSTextField* statusBar;
 }
 -(id) initWith:(hiro::mWindow&)window;
 -(BOOL) canBecomeKeyWindow;
 -(BOOL) canBecomeMainWindow;
--(void) windowDidBecomeMain:(NSNotification*)notification;
 -(void) windowDidMove:(NSNotification*)notification;
 -(void) windowDidResize:(NSNotification*)notification;
 -(BOOL) windowShouldClose:(id)sender;
 -(NSDragOperation) draggingEntered:(id<NSDraggingInfo>)sender;
 -(BOOL) performDragOperation:(id<NSDraggingInfo>)sender;
 -(NSMenu*) menuBar;
--(void) menuAbout;
--(void) menuPreferences;
--(void) menuQuit;
 -(NSTextField*) statusBar;
 @end