OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Merge remote-tracking branch 'afaerber-or/cocoa-for-upstream' into staging

Browse Source 
# By Peter Maydell
# Via Andreas Färber
* afaerber-or/cocoa-for-upstream:
  cocoa: Avoid deprecated NSOpenPanel beginSheetForDirectory
  cocoa: Avoid deprecated NSOpenPanel filename method
  cocoa: Avoid deprecated CPS* functions
  cocoa: Fix leaks of NSScreen and NSConcreteMapTable
This commit is contained in:
Anthony Liguori 2013-05-29 08:13:09 -05:00
commit 1afd566ce9
1 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
ui/cocoa.m
View File

@ -35,6 +35,9 @@
#ifndef MAC_OS_X_VERSION_10_5 #ifndef MAC_OS_X_VERSION_10_5
#define MAC_OS_X_VERSION_10_5 1050 #define MAC_OS_X_VERSION_10_5 1050
#endif #endif
#ifndef MAC_OS_X_VERSION_10_6
#define MAC_OS_X_VERSION_10_6 1060
#endif
//#define DEBUG //#define DEBUG
@ -771,9 +774,20 @@ QemuCocoaView *cocoaView;
NSOpenPanel *op = [[NSOpenPanel alloc] init]; NSOpenPanel *op = [[NSOpenPanel alloc] init];
[op setPrompt:@"Boot image"]; [op setPrompt:@"Boot image"];
[op setMessage:@"Select the disk image you want to boot.\n\nHit the \"Cancel\" button to quit"]; [op setMessage:@"Select the disk image you want to boot.\n\nHit the \"Cancel\" button to quit"];
[op beginSheetForDirectory:nil file:nil types:[NSArray arrayWithObjects:@"img",@"iso",@"dmg",@"qcow",@"cow",@"cloop",@"vmdk",nil] NSArray *filetypes = [NSArray arrayWithObjects:@"img", @"iso", @"dmg",
@"qcow", @"cow", @"cloop", @"vmdk", nil];
#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6)
[op setAllowedFileTypes:filetypes];
[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 modalForWindow:normalWindow modalDelegate:self
didEndSelector:@selector(openPanelDidEnd:returnCode:contextInfo:) contextInfo:NULL]; didEndSelector:@selector(openPanelDidEnd:returnCode:contextInfo:) contextInfo:NULL];
#endif
} else { } else {
// or launch QEMU, with the global args // or launch QEMU, with the global args
[self startEmulationWithArgc:gArgc argv:(char **)gArgv]; [self startEmulationWithArgc:gArgc argv:(char **)gArgv];
@ -810,7 +824,7 @@ QemuCocoaView *cocoaView;
exit(0); exit(0);
} else if(returnCode == NSOKButton) { } else if(returnCode == NSOKButton) {
const char *bin = "qemu"; const char *bin = "qemu";
char *img = (char*)[ [ sheet filename ] cStringUsingEncoding:NSASCIIStringEncoding]; char *img = (char*)[ [ [ sheet URL ] path ] cStringUsingEncoding:NSASCIIStringEncoding];
char **argv = (char**)malloc( sizeof(char*)*3 ); char **argv = (char**)malloc( sizeof(char*)*3 );
@ -851,22 +865,10 @@ QemuCocoaView *cocoaView;
// Dock Connection
typedef struct CPSProcessSerNum
{
UInt32 lo;
UInt32 hi;
} CPSProcessSerNum;
OSErr CPSGetCurrentProcess( CPSProcessSerNum *psn);
OSErr CPSEnableForegroundOperation( CPSProcessSerNum *psn, UInt32 _arg2, UInt32 _arg3, UInt32 _arg4, UInt32 _arg5);
OSErr CPSSetFrontProcess( CPSProcessSerNum *psn);
int main (int argc, const char * argv[]) { int main (int argc, const char * argv[]) {
gArgc = argc; gArgc = argc;
gArgv = (char **)argv; gArgv = (char **)argv;
CPSProcessSerNum PSN;
int i; int i;
/* In case we don't need to display a window, let's not do that */ /* In case we don't need to display a window, let's not do that */
@ -890,12 +892,13 @@ int main (int argc, const char * argv[]) {
} }
NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init]; NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
[NSApplication sharedApplication];
if (!CPSGetCurrentProcess(&PSN)) // Pull this console process up to being a fully-fledged graphical
if (!CPSEnableForegroundOperation(&PSN,0x03,0x3C,0x2C,0x1103)) // app with a menubar and Dock icon
if (!CPSSetFrontProcess(&PSN)) ProcessSerialNumber psn = { 0, kCurrentProcess };
[NSApplication sharedApplication]; TransformProcessType(&psn, kProcessTransformToForegroundApplication);
[NSApplication sharedApplication];
// Add menus // Add menus
NSMenu *menu; NSMenu *menu;
@ -960,6 +963,8 @@ int main (int argc, const char * argv[]) {
static void cocoa_update(DisplayChangeListener *dcl, static void cocoa_update(DisplayChangeListener *dcl,
int x, int y, int w, int h) int x, int y, int w, int h)
{ {
NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
COCOA_DEBUG("qemu_cocoa: cocoa_update\n"); COCOA_DEBUG("qemu_cocoa: cocoa_update\n");
NSRect rect; NSRect rect;
@ -973,18 +978,24 @@ static void cocoa_update(DisplayChangeListener *dcl,
h * [cocoaView cdy]); h * [cocoaView cdy]);
} }
[cocoaView setNeedsDisplayInRect:rect]; [cocoaView setNeedsDisplayInRect:rect];
[pool release];
} }
static void cocoa_switch(DisplayChangeListener *dcl, static void cocoa_switch(DisplayChangeListener *dcl,
DisplaySurface *surface) DisplaySurface *surface)
{ {
COCOA_DEBUG("qemu_cocoa: cocoa_resize\n"); NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
COCOA_DEBUG("qemu_cocoa: cocoa_switch\n");
[cocoaView switchSurface:surface]; [cocoaView switchSurface:surface];
[pool release];
} }
static void cocoa_refresh(DisplayChangeListener *dcl) static void cocoa_refresh(DisplayChangeListener *dcl)
{ {
NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
COCOA_DEBUG("qemu_cocoa: cocoa_refresh\n"); COCOA_DEBUG("qemu_cocoa: cocoa_refresh\n");
if (kbd_mouse_is_absolute()) { if (kbd_mouse_is_absolute()) {
@ -1007,6 +1018,7 @@ static void cocoa_refresh(DisplayChangeListener *dcl)
} }
} while(event != nil); } while(event != nil);
graphic_hw_update(NULL); graphic_hw_update(NULL);
[pool release];
} }
static void cocoa_cleanup(void) static void cocoa_cleanup(void)