From 0775bf72fa8debd94b050e201469957e62c4bfe3 Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Sat, 11 Oct 2014 16:24:36 +0300
Subject: [PATCH] Fix application activation on OS X <10.6

---
 source/graphics/cocoa/cocoadisplay.m | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/source/graphics/cocoa/cocoadisplay.m b/source/graphics/cocoa/cocoadisplay.m
index c6485a7..af4145f 100644
--- a/source/graphics/cocoa/cocoadisplay.m
+++ b/source/graphics/cocoa/cocoadisplay.m
@@ -4,6 +4,7 @@
 #import <AppKit/NSEvent.h>
 #import <Foundation/NSAutoReleasePool.h>
 #import <Foundation/NSRunLoop.h>
+#import <ApplicationServices/ApplicationServices.h>
 #include "cocoadisplay.h"
 
 void convert_event(NSEvent *, CocoaEvent *);
@@ -15,6 +16,7 @@ struct _CocoaDisplay
 	CFMutableArrayRef event_queue;
 };
 
+void make_foreground_app(NSApplication *);
 const void *copy_event(CFAllocatorRef, const void *);
 void free_event(CFAllocatorRef, const void *);
 
@@ -23,11 +25,7 @@ CocoaDisplay *create_display()
 	CocoaDisplay *display = (CocoaDisplay *)malloc(sizeof(CocoaDisplay));
 	display->arp = [[NSAutoreleasePool alloc] init];
 	display->app = [NSApplication sharedApplication];
-#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
-	// This makes windows appear when run from terminal
-	if([display->app respondsToSelector:@selector(setActivationPolicy:)])
-		[display->app setActivationPolicy:NSApplicationActivationPolicyRegular];
-#endif
+	make_foreground_app(display->app);
 	[display->app finishLaunching];
 
 	CFArrayCallBacks callbacks;
@@ -41,6 +39,24 @@ 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);
-- 
2.45.2