scawful/yaze
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename InitializeCocoa to yaze_run_cocoa_app_delegate and update its implementation; streamline Cocoa app delegate handling

Browse Source
This commit is contained in:
scawful
2024-11-13 09:16:46 -05:00
parent c306b0d20c
commit ab7fa2ecac
3 changed files with 87 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/core/platform/app_delegate.h
View File

@@ -40,7 +40,7 @@
extern "C" { extern "C" {
#endif #endif
void InitializeCocoa(); void yaze_run_cocoa_app_delegate(const char *filename);
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"

120
src/app/core/platform/app_delegate.mm
View File

@@ -40,19 +40,23 @@
NSMenuItem *fileMenuItem = [mainMenu itemWithTitle:@"File"]; NSMenuItem *fileMenuItem = [mainMenu itemWithTitle:@"File"];
if (!fileMenuItem) { if (!fileMenuItem) {
NSMenu *fileMenu = [[NSMenu alloc] initWithTitle:@"File"]; NSMenu *fileMenu = [[NSMenu alloc] initWithTitle:@"File"];
fileMenuItem = [[NSMenuItem alloc] initWithTitle:@"File" action:nil keyEquivalent:@""]; fileMenuItem = [[NSMenuItem alloc] initWithTitle:@"File"
action:nil
keyEquivalent:@""];
[fileMenuItem setSubmenu:fileMenu]; [fileMenuItem setSubmenu:fileMenu];
NSMenuItem *openItem = [[NSMenuItem alloc] initWithTitle:@"Open" NSMenuItem *openItem =
action:@selector(openFileAction:) [[NSMenuItem alloc] initWithTitle:@"Open"
keyEquivalent:@"o"]; action:@selector(openFileAction:)
keyEquivalent:@"o"];
[fileMenu addItem:openItem]; [fileMenu addItem:openItem];
// Open Recent // Open Recent
NSMenu *openRecentMenu = [[NSMenu alloc] initWithTitle:@"Open Recent"]; NSMenu *openRecentMenu = [[NSMenu alloc] initWithTitle:@"Open Recent"];
NSMenuItem *openRecentMenuItem = [[NSMenuItem alloc] initWithTitle:@"Open Recent" NSMenuItem *openRecentMenuItem =
action:nil [[NSMenuItem alloc] initWithTitle:@"Open Recent"
keyEquivalent:@""]; action:nil
keyEquivalent:@""];
[openRecentMenuItem setSubmenu:openRecentMenu]; [openRecentMenuItem setSubmenu:openRecentMenu];
[fileMenu addItem:openRecentMenuItem]; [fileMenu addItem:openRecentMenuItem];
@@ -60,7 +64,9 @@
[fileMenu addItem:[NSMenuItem separatorItem]]; [fileMenu addItem:[NSMenuItem separatorItem]];
// Save // Save
NSMenuItem *saveItem = [[NSMenuItem alloc] initWithTitle:@"Save" action:nil keyEquivalent:@"s"]; NSMenuItem *saveItem = [[NSMenuItem alloc] initWithTitle:@"Save"
action:nil
keyEquivalent:@"s"];
[fileMenu addItem:saveItem]; [fileMenu addItem:saveItem];
// Separator // Separator
@@ -74,9 +80,10 @@
[optionsMenuItem setSubmenu:optionsMenu]; [optionsMenuItem setSubmenu:optionsMenu];
// Flag checkmark field // Flag checkmark field
NSMenuItem *flagItem = [[NSMenuItem alloc] initWithTitle:@"Flag" NSMenuItem *flagItem =
action:@selector(toggleFlagAction:) [[NSMenuItem alloc] initWithTitle:@"Flag"
keyEquivalent:@""]; action:@selector(toggleFlagAction:)
keyEquivalent:@""];
[flagItem setTarget:self]; [flagItem setTarget:self];
[flagItem setState:NSControlStateValueOff]; [flagItem setState:NSControlStateValueOff];
[optionsMenu addItem:flagItem]; [optionsMenu addItem:flagItem];
@@ -88,26 +95,35 @@
NSMenuItem *editMenuItem = [mainMenu itemWithTitle:@"Edit"]; NSMenuItem *editMenuItem = [mainMenu itemWithTitle:@"Edit"];
if (!editMenuItem) { if (!editMenuItem) {
NSMenu *editMenu = [[NSMenu alloc] initWithTitle:@"Edit"]; NSMenu *editMenu = [[NSMenu alloc] initWithTitle:@"Edit"];
editMenuItem = [[NSMenuItem alloc] initWithTitle:@"Edit" action:nil keyEquivalent:@""]; editMenuItem = [[NSMenuItem alloc] initWithTitle:@"Edit"
action:nil
keyEquivalent:@""];
[editMenuItem setSubmenu:editMenu]; [editMenuItem setSubmenu:editMenu];
NSMenuItem *undoItem = [[NSMenuItem alloc] initWithTitle:@"Undo" action:nil keyEquivalent:@"z"]; NSMenuItem *undoItem = [[NSMenuItem alloc] initWithTitle:@"Undo"
action:nil
keyEquivalent:@"z"];
[editMenu addItem:undoItem]; [editMenu addItem:undoItem];
NSMenuItem *redoItem = [[NSMenuItem alloc] initWithTitle:@"Redo" action:nil keyEquivalent:@"Z"]; NSMenuItem *redoItem = [[NSMenuItem alloc] initWithTitle:@"Redo"
action:nil
keyEquivalent:@"Z"];
[editMenu addItem:redoItem]; [editMenu addItem:redoItem];
// Add a separator // Add a separator
[editMenu addItem:[NSMenuItem separatorItem]]; [editMenu addItem:[NSMenuItem separatorItem]];
NSMenuItem *cutItem = [[NSMenuItem alloc] initWithTitle:@"Cut" NSMenuItem *cutItem =
action:@selector(cutAction:) [[NSMenuItem alloc] initWithTitle:@"Cut"
keyEquivalent:@"x"]; action:@selector(cutAction:)
keyEquivalent:@"x"];
[editMenu addItem:cutItem]; [editMenu addItem:cutItem];
NSMenuItem *copyItem = [[NSMenuItem alloc] initWithTitle:@"Copy" action:nil keyEquivalent:@"c"]; NSMenuItem *copyItem = [[NSMenuItem alloc] initWithTitle:@"Copy"
action:nil
keyEquivalent:@"c"];
[editMenu addItem:copyItem]; [editMenu addItem:copyItem];
NSMenuItem *pasteItem = [[NSMenuItem alloc] initWithTitle:@"Paste" NSMenuItem *pasteItem = [[NSMenuItem alloc] initWithTitle:@"Paste"
@@ -131,34 +147,40 @@
NSMenuItem *viewMenuItem = [mainMenu itemWithTitle:@"View"]; NSMenuItem *viewMenuItem = [mainMenu itemWithTitle:@"View"];
if (!viewMenuItem) { if (!viewMenuItem) {
NSMenu *viewMenu = [[NSMenu alloc] initWithTitle:@"View"]; NSMenu *viewMenu = [[NSMenu alloc] initWithTitle:@"View"];
viewMenuItem = [[NSMenuItem alloc] initWithTitle:@"View" action:nil keyEquivalent:@""]; viewMenuItem = [[NSMenuItem alloc] initWithTitle:@"View"
action:nil
keyEquivalent:@""];
[viewMenuItem setSubmenu:viewMenu]; [viewMenuItem setSubmenu:viewMenu];
// Emulator view button // Emulator view button
NSMenuItem *emulatorViewItem = [[NSMenuItem alloc] initWithTitle:@"Emulator View" NSMenuItem *emulatorViewItem =
action:nil [[NSMenuItem alloc] initWithTitle:@"Emulator View"
keyEquivalent:@"1"]; action:nil
keyEquivalent:@"1"];
[viewMenu addItem:emulatorViewItem]; [viewMenu addItem:emulatorViewItem];
// Hex Editor View // Hex Editor View
NSMenuItem *hexEditorViewItem = [[NSMenuItem alloc] initWithTitle:@"Hex Editor View" NSMenuItem *hexEditorViewItem =
action:nil [[NSMenuItem alloc] initWithTitle:@"Hex Editor View"
keyEquivalent:@"2"]; action:nil
keyEquivalent:@"2"];
[viewMenu addItem:hexEditorViewItem]; [viewMenu addItem:hexEditorViewItem];
// Disassembly view button // Disassembly view button
NSMenuItem *disassemblyViewItem = [[NSMenuItem alloc] initWithTitle:@"Disassembly View" NSMenuItem *disassemblyViewItem =
action:nil [[NSMenuItem alloc] initWithTitle:@"Disassembly View"
keyEquivalent:@"3"]; action:nil
keyEquivalent:@"3"];
[viewMenu addItem:disassemblyViewItem]; [viewMenu addItem:disassemblyViewItem];
// Memory view button // Memory view button
NSMenuItem *memoryViewItem = [[NSMenuItem alloc] initWithTitle:@"Memory View" NSMenuItem *memoryViewItem =
action:nil [[NSMenuItem alloc] initWithTitle:@"Memory View"
keyEquivalent:@"4"]; action:nil
keyEquivalent:@"4"];
[viewMenu addItem:memoryViewItem]; [viewMenu addItem:memoryViewItem];
@@ -166,9 +188,10 @@
[viewMenu addItem:[NSMenuItem separatorItem]]; [viewMenu addItem:[NSMenuItem separatorItem]];
// Toggle fullscreen button // Toggle fullscreen button
NSMenuItem *toggleFullscreenItem = [[NSMenuItem alloc] initWithTitle:@"Toggle Fullscreen" NSMenuItem *toggleFullscreenItem =
action:nil [[NSMenuItem alloc] initWithTitle:@"Toggle Fullscreen"
keyEquivalent:@"f"]; action:nil
keyEquivalent:@"f"];
[viewMenu addItem:toggleFullscreenItem]; [viewMenu addItem:toggleFullscreenItem];
@@ -178,13 +201,16 @@
NSMenuItem *helpMenuItem = [mainMenu itemWithTitle:@"Help"]; NSMenuItem *helpMenuItem = [mainMenu itemWithTitle:@"Help"];
if (!helpMenuItem) { if (!helpMenuItem) {
NSMenu *helpMenu = [[NSMenu alloc] initWithTitle:@"Help"]; NSMenu *helpMenu = [[NSMenu alloc] initWithTitle:@"Help"];
helpMenuItem = [[NSMenuItem alloc] initWithTitle:@"Help" action:nil keyEquivalent:@""]; helpMenuItem = [[NSMenuItem alloc] initWithTitle:@"Help"
action:nil
keyEquivalent:@""];
[helpMenuItem setSubmenu:helpMenu]; [helpMenuItem setSubmenu:helpMenu];
// URL to online documentation // URL to online documentation
NSMenuItem *documentationItem = [[NSMenuItem alloc] initWithTitle:@"Documentation" NSMenuItem *documentationItem =
action:nil [[NSMenuItem alloc] initWithTitle:@"Documentation"
keyEquivalent:@"?"]; action:nil
keyEquivalent:@"?"];
[helpMenu addItem:documentationItem]; [helpMenu addItem:documentationItem];
[mainMenu insertItem:helpMenuItem atIndex:4]; [mainMenu insertItem:helpMenuItem atIndex:4];
@@ -207,7 +233,8 @@
- (void)openFileAction:(id)sender { - (void)openFileAction:(id)sender {
if (!yaze::app::SharedRom::shared_rom_ if (!yaze::app::SharedRom::shared_rom_
->LoadFromFile(yaze::app::core::FileDialogWrapper::ShowOpenFileDialog()) ->LoadFromFile(
yaze::app::core::FileDialogWrapper::ShowOpenFileDialog())
.ok()) { .ok()) {
NSAlert *alert = [[NSAlert alloc] init]; NSAlert *alert = [[NSAlert alloc] init];
[alert setMessageText:@"Error"]; [alert setMessageText:@"Error"];
@@ -225,13 +252,26 @@
NSLog(@"Open Recent File action triggered"); NSLog(@"Open Recent File action triggered");
} }
extern "C" void InitializeCocoa() { extern "C" void yaze_run_cocoa_app_delegate(const char *filename) {
@autoreleasepool { @autoreleasepool {
AppDelegate *delegate = [[AppDelegate alloc] init]; AppDelegate *delegate = [[AppDelegate alloc] init];
[NSApplication sharedApplication]; [NSApplication sharedApplication];
[NSApp setDelegate:delegate]; [NSApp setDelegate:delegate];
[NSApp finishLaunching]; [NSApp finishLaunching];
} }
yaze::app::core::Controller controller;
RETURN_VOID_IF_ERROR(controller.OnEntry(filename));
while (controller.IsActive()) {
@autoreleasepool {
controller.OnInput();
if (auto status = controller.OnLoad(); !status.ok()) {
break;
}
controller.DoRender();
}
}
controller.OnExit();
} }
@end @end

9
src/app/yaze.cc
View File

@@ -32,13 +32,14 @@ int main(int argc, char** argv) {
rom_filename = argv[1]; rom_filename = argv[1];
} }
#ifdef __APPLE__
yaze_run_cocoa_app_delegate(rom_filename.c_str());
return EXIT_SUCCESS;
#endif
core::Controller controller; core::Controller controller;
EXIT_IF_ERROR(controller.OnEntry(rom_filename)) EXIT_IF_ERROR(controller.OnEntry(rom_filename))
#ifdef __APPLE__
InitializeCocoa();
#endif
while (controller.IsActive()) { while (controller.IsActive()) {
controller.OnInput(); controller.OnInput();
if (auto status = controller.OnLoad(); !status.ok()) { if (auto status = controller.OnLoad(); !status.ok()) {