X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgraphics%2Fcocoa%2Fcocoadisplay.m;h=af4145faa05446ce49a00c88e9e49df489e97422;hb=0775bf72fa8debd94b050e201469957e62c4bfe3;hp=3445c176cad0911337030543c1e52ae30f441c36;hpb=88c49198486808f1b53f4417c387feb478e9b1c7;p=libs%2Fgui.git

diff --git a/source/graphics/cocoa/cocoadisplay.m b/source/graphics/cocoa/cocoadisplay.m
index 3445c17..af4145f 100644
--- a/source/graphics/cocoa/cocoadisplay.m
+++ b/source/graphics/cocoa/cocoadisplay.m
@@ -1,5 +1,10 @@
+#include <stdlib.h>
+#include <string.h>
 #import <AppKit/NSApplication.h>
+#import <AppKit/NSEvent.h>
+#import <Foundation/NSAutoReleasePool.h>
 #import <Foundation/NSRunLoop.h>
+#import <ApplicationServices/ApplicationServices.h>
 #include "cocoadisplay.h"
 
 void convert_event(NSEvent *, CocoaEvent *);
@@ -7,19 +12,20 @@ void convert_event(NSEvent *, CocoaEvent *);
 struct _CocoaDisplay
 {
 	NSApplication *app;
+	NSAutoreleasePool *arp;
 	CFMutableArrayRef event_queue;
 };
 
+void make_foreground_app(NSApplication *);
 const void *copy_event(CFAllocatorRef, const void *);
 void free_event(CFAllocatorRef, const void *);
 
 CocoaDisplay *create_display()
 {
 	CocoaDisplay *display = (CocoaDisplay *)malloc(sizeof(CocoaDisplay));
+	display->arp = [[NSAutoreleasePool alloc] init];
 	display->app = [NSApplication sharedApplication];
-	// This makes windows appear when run from terminal
-	if([display->app respondsToSelector:@selector(setActivationPolicy:)])
-		[display->app setActivationPolicy:NSApplicationActivationPolicyRegular];
+	make_foreground_app(display->app);
 	[display->app finishLaunching];
 
 	CFArrayCallBacks callbacks;
@@ -33,9 +39,28 @@ CocoaDisplay *create_display()
 	return display;
 }
 
+void make_foreground_app(NSApplication *app)
+{
+#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
+	// This makes windows appear when run from terminal
+	if([app respondsToSelector:@selector(setActivationPolicy:)])
+	{
+		[app setActivationPolicy:NSApplicationActivationPolicyRegular];
+		return;
+	}
+#else
+	(void)app;
+#endif
+
+	ProcessSerialNumber psn = { 0, kCurrentProcess };
+	TransformProcessType(&psn, kProcessTransformToForegroundApplication);
+	SetFrontProcess(&psn);
+}
+
 void destroy_display(CocoaDisplay *display)
 {
 	CFRelease(display->event_queue);
+	[display->arp release];
 	free(display);
 }
 
@@ -56,8 +81,10 @@ bool get_event(CocoaDisplay *display, CocoaEvent *buf)
 	NSEvent *event = [display->app nextEventMatchingMask:NSAnyEventMask untilDate:nil inMode:NSDefaultRunLoopMode dequeue:YES];
 	if(event)
 	{
+		[event retain];
 		[display->app sendEvent:event];
 		convert_event(event, buf);
+		[event release];
 		return true;
 	}