When QEMU is launched on Mac OS X without any arguments, an open file dialog
appears. The user is then expected to select a file to boot QEMU with. This code
was not compatible with GCC 4.9 (user-built, not Apple supplied). This patch
greatly simplifes the open file dialog feature and makes it compatible with GCC
4.9.
Signed-off-by: John Arbuckle <programmingk...@gmail.com>
---
ui/cocoa.m | 59 +++++++++++++----------------------------------------------
1 files changed, 13 insertions(+), 46 deletions(-)
diff --git a/ui/cocoa.m b/ui/cocoa.m
index 334e6f6..3b33094 100644
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -814,7 +814,6 @@ QemuCocoaView *cocoaView;
{
}
- (void)startEmulationWithArgc:(int)argc argv:(char**)argv;
-- (void)openPanelDidEnd:(NSOpenPanel *)sheet returnCode:(NSInteger)returnCode
contextInfo:(void *)contextInfo;
- (void)doToggleFullScreen:(id)sender;
- (void)toggleFullScreen:(id)sender;
- (void)showQEMUDoc:(id)sender;
@@ -901,23 +900,21 @@ QemuCocoaView *cocoaView;
if( gArgc <= 1 || strncmp ((char *)gArgv[1], "-psn", 4) == 0) {
NSOpenPanel *op = [[NSOpenPanel alloc] init];
[op setPrompt:@"Boot image"];
- [op setMessage:@"Select the disk image you want to boot.\n\nHit the
\"Cancel\" button to quit"];
-#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6)
+ [op setMessage:@"Select the disk image you want to boot.\n"];
[op setAllowedFileTypes:supportedImageFileTypes];
- [op beginSheetModalForWindow:normalWindow
- completionHandler:^(NSInteger returnCode)
- { [self openPanelDidEnd:op
- returnCode:returnCode contextInfo:NULL ]; } ];
-#else
- // Compatibility code for pre-10.6, using deprecated method
- [op beginSheetForDirectory:nil file:nil types:filetypes
- modalForWindow:normalWindow modalDelegate:self
-
didEndSelector:@selector(openPanelDidEnd:returnCode:contextInfo:)
contextInfo:NULL];
-#endif
- } else {
- // or launch QEMU, with the global args
- [self startEmulationWithArgc:gArgc argv:(char **)gArgv];
+ if([op runModal] == NSFileHandlingPanelOKButton) {
+ /* Boot QEMU with selected image */
+ const char *file_path = [[[op URL] path] cStringUsingEncoding:
+
NSASCIIStringEncoding];
+ char *appName = g_strdup(gArgv[0]);
+ gArgv = g_new(char *, 3);
+ gArgv[0] = appName;
+ gArgv[1] = g_strdup("-hda");
+ gArgv[2] = g_strdup(file_path);
+ gArgc = 3;
+ }
}
+ [self startEmulationWithArgc:gArgc argv:(char **)gArgv];
}
- (void)applicationWillTerminate:(NSNotification *)aNotification
@@ -942,36 +939,6 @@ QemuCocoaView *cocoaView;
exit(status);
}
-- (void)openPanelDidEnd:(NSOpenPanel *)sheet returnCode:(NSInteger)returnCode
contextInfo:(void *)contextInfo
-{
- COCOA_DEBUG("QemuCocoaAppController: openPanelDidEnd\n");
-
- /* The NSFileHandlingPanelOKButton/NSFileHandlingPanelCancelButton values
for
- * returnCode strictly only apply for the 10.6-and-up
beginSheetModalForWindow
- * API. For the legacy pre-10.6 beginSheetForDirectory API they are
NSOKButton
- * and NSCancelButton. However conveniently the values are the same.
- * We use the non-legacy names because the others are deprecated in OSX
10.10.
- */
- if (returnCode == NSFileHandlingPanelCancelButton) {
- exit(0);
- } else if (returnCode == NSFileHandlingPanelOKButton) {
- char *img = (char*)[ [ [ sheet URL ] path ]
cStringUsingEncoding:NSASCIIStringEncoding];
-
- char **argv = g_new(char *, 4);
-
- [sheet close];
-
- argv[0] = g_strdup(gArgv[0]);
- argv[1] = g_strdup("-hda");
- argv[2] = g_strdup(img);
- argv[3] = NULL;
-
- // printf("Using argc %d argv %s -hda %s\n", 3, gArgv[0], img);
-
- [self startEmulationWithArgc:3 argv:(char**)argv];
- }
-}
-
/* We abstract the method called by the Enter Fullscreen menu item
* because Mac OS 10.7 and higher disables it. This is because of the
* menu item's old selector's name toggleFullScreen:
--
1.7.5.4
