OS X: Compiles now with Xcode 5. SDLMain updated to SDL 1.2.15, fixes input when running binary directly.

sc2/build/unix/build.config

@@ -593,7 +593,7 @@ uqm_install_osx() {
 				$PREPROC_C -D__MACOSX__ -include $HEADER - | \
 				awk '(/'$HEADER_FILE'/ && $2 == 1) { print $3; exit }' | \
 				$SED 's/.Headers.*$/"/'`
-		cp -r "$FRAMEWORK" "$INSTROOT/Frameworks"
+		cp -a "$FRAMEWORK" "$INSTROOT/Frameworks"
 	done
 
 	# Install game content (it should probably make a zipfile)

sc2/build/unix/config_proginfo_build

@@ -326,7 +326,7 @@ PROG_windres_VERSION='windres --version'
 
 ### Rez resource compiler (for MacOS X) ###
 PROG_Rez_NAME="Rez resource compiler (Apple Developer Tools)"
-PROG_Rez_FILE="/Developer/Tools/Rez"
+PROG_Rez_FILE="Rez"
 PROG_Rez_ACTION=""
 PROG_Rez_VERSION=''
 

sc2/src/darwin/SDLMain.h

@@ -5,15 +5,12 @@
     Feel free to customize this file to suit your needs
 */
 
-#import <Cocoa/Cocoa.h>
+#ifndef _SDLMain_h_
+#define _SDLMain_h_
 
-/* An internal Apple class used to setup Apple menus */
+#import <Cocoa/Cocoa.h>
-@interface NSAppleMenuController:NSObject {}
-- (void)controlMenu:(NSMenu *)aMenu;
-@end
 
 @interface SDLMain : NSObject
 @end
 
-@interface SDLApplication : NSApplication
+#endif /* _SDLMain_h_ */
-@end

sc2/src/darwin/SDLMain.m

@@ -3,122 +3,159 @@
        Non-NIB-Code & other changes: Max Horn <max@quendi.de>
 
     Feel free to customize this file to suit your needs
-
-	Modified for use with The Ur-Quan Masters by Nicolas Simonds
-	<uqm at submedia dot net>
 */
 
-#import "port.h"
+#include "SDL.h"
-#import SDL_INCLUDE(SDL.h)
+#include "SDLMain.h"
-#import "SDLMain.h"
+#include <sys/param.h> /* for MAXPATHLEN */
-#import <sys/param.h>
+#include <unistd.h>
-		/* for PATH_MAX */
+
-#import <string.h>
+/* For some reaon, Apple removed setAppleMenu from the headers in 10.4,
-		/* for strrchr() */
+ but the method still is there and works. To avoid warnings, we declare
-#import <unistd.h>
+ it ourselves here. */
+@interface NSApplication(SDL_Missing_Methods)
+- (void)setAppleMenu:(NSMenu *)menu;
+@end
+
+/* Use this flag to determine whether we use SDLMain.nib or not */
+#define		SDL_USE_NIB_FILE	0
+
+/* Use this flag to determine whether we use CPS (docking) or not */
+#define		SDL_USE_CPS		1
+#ifdef SDL_USE_CPS
+/* Portions of CPS.h */
+typedef struct CPSProcessSerNum
+{
+	UInt32		lo;
+	UInt32		hi;
+} CPSProcessSerNum;
+
+extern OSErr	CPSGetCurrentProcess( CPSProcessSerNum *psn);
+extern OSErr 	CPSEnableForegroundOperation( CPSProcessSerNum *psn, UInt32 _arg2, UInt32 _arg3, UInt32 _arg4, UInt32 _arg5);
+extern OSErr	CPSSetFrontProcess( CPSProcessSerNum *psn);
+
+#endif /* SDL_USE_CPS */
 
 static int    gArgc;
 static char  **gArgv;
 static BOOL   gFinderLaunch;
+static BOOL   gCalledAppMainline = FALSE;
 
-@implementation SDLApplication
+static NSString *getApplicationName(void)
+{
+    const NSDictionary *dict;
+    NSString *appName = 0;
+
+    /* Determine the application name */
+    dict = (const NSDictionary *)CFBundleGetInfoDictionary(CFBundleGetMainBundle());
+    if (dict)
+        appName = [dict objectForKey: @"CFBundleName"];
+    
+    if (![appName length])
+        appName = [[NSProcessInfo processInfo] processName];
+
+    return appName;
+}
+
+#if SDL_USE_NIB_FILE
+/* A helper category for NSString */
+@interface NSString (ReplaceSubString)
+- (NSString *)stringByReplacingRange:(NSRange)aRange with:(NSString *)aString;
+@end
+#endif
+
+@interface NSApplication (SDLApplication)
+@end
+
+@implementation NSApplication (SDLApplication)
 /* Invoked from the Quit menu item */
 - (void)terminate:(id)sender
 {
     /* Post a SDL_QUIT event */
     SDL_Event event;
     event.type = SDL_QUIT;
-	SDL_PushEvent (&event);
+    SDL_PushEvent(&event);
-	(void) sender;  /* Get rid of unused variable warning */
-}
-
-/* override NSApplication:sendEvent, to keep Cocoa from beeping on
-   non-command keystrokes */
-- (void)sendEvent:(NSEvent *)anEvent {
-	if (NSKeyDown == [anEvent type] || NSKeyUp == [anEvent type]) {
-		if ([anEvent modifierFlags] & NSCommandKeyMask)
-			[super sendEvent: anEvent];
-	} else
-		[super sendEvent: anEvent];
 }
 @end
 
 /* The main class of the application, the application's delegate */
 @implementation SDLMain
 
-static char *
-basename (char *path)
-{
-	char *base;
-
-	base = strrchr (path, '/');
-	if (base == NULL)
-		return path;
-
-	return (base + 1);
-}
-
 /* Set the working directory to the .app's parent directory */
 - (void) setupWorkingDirectory:(BOOL)shouldChdir
 {
-	char origindir[PATH_MAX];
+    if (shouldChdir)
-	char *c;
+    {
-
+        char parentdir[MAXPATHLEN];
-	if (!shouldChdir)
+        CFURLRef url = CFBundleCopyBundleURL(CFBundleGetMainBundle());
-		return;
+        CFURLRef url2 = CFURLCreateCopyDeletingLastPathComponent(0, url);
-
+        if (CFURLGetFileSystemRepresentation(url2, 1, (UInt8 *)parentdir, MAXPATHLEN)) {
-	strncpy (origindir, gArgv[0], sizeof origindir);
+            chdir(parentdir);   /* chdir to the binary app's parent */
-	origindir[sizeof origindir - 1] = '\0';
+        }
-
+        CFRelease(url);
-	c = basename (origindir);
+        CFRelease(url2);
-	if (c == origindir)
+    }
-		strcpy (origindir, ".");
-	else
-		*c = '\0';
-
-	/* chdir to the binary app's point of origin */
-	if (chdir (origindir) != 0)
-		abort ();
-	/* then chdir to the .app's parent */
-	if ( chdir ("../Resources/") != 0 )
-		abort();
 }
 
-void
+#if SDL_USE_NIB_FILE
-setupAppleMenu (void)
-{
-	NSMenu *appleMenu;
 
+/* Fix menu to contain the real app name instead of "SDL App" */
+- (void)fixMenu:(NSMenu *)aMenu withAppName:(NSString *)appName
+{
+    NSRange aRange;
+    NSEnumerator *enumerator;
+    NSMenuItem *menuItem;
+
+    aRange = [[aMenu title] rangeOfString:@"SDL App"];
+    if (aRange.length != 0)
+        [aMenu setTitle: [[aMenu title] stringByReplacingRange:aRange with:appName]];
+
+    enumerator = [[aMenu itemArray] objectEnumerator];
+    while ((menuItem = [enumerator nextObject]))
+    {
+        aRange = [[menuItem title] rangeOfString:@"SDL App"];
+        if (aRange.length != 0)
+            [menuItem setTitle: [[menuItem title] stringByReplacingRange:aRange with:appName]];
+        if ([menuItem hasSubmenu])
+            [self fixMenu:[menuItem submenu] withAppName:appName];
+    }
+}
+
+#else
+
+static void setApplicationMenu(void)
+{
+    /* warning: this code is very odd */
+    NSMenu *appleMenu;
     NSMenuItem *menuItem;
     NSString *title;
     NSString *appName;
     
-	appName = [NSString stringWithUTF8String:basename (gArgv[0])];
+    appName = getApplicationName();
-	appleMenu = [[NSMenu alloc] initWithTitle:appName];
+    appleMenu = [[NSMenu alloc] initWithTitle:@""];
     
     /* Add menu items */
-	title = [@"Hide " stringByAppendingString:appName];
+    title = [@"About " stringByAppendingString:appName];
-	[appleMenu addItemWithTitle:title action:@selector(hide:)
+    [appleMenu addItemWithTitle:title action:@selector(orderFrontStandardAboutPanel:) keyEquivalent:@""];
-			keyEquivalent:@"h"];
 
-	menuItem = (NSMenuItem *)[appleMenu addItemWithTitle:@"Hide Others"
+    [appleMenu addItem:[NSMenuItem separatorItem]];
-			action:@selector(hideOtherApplications:)
+
-			keyEquivalent:@"h"];
+    title = [@"Hide " stringByAppendingString:appName];
+    [appleMenu addItemWithTitle:title action:@selector(hide:) keyEquivalent:@"h"];
+
+    menuItem = (NSMenuItem *)[appleMenu addItemWithTitle:@"Hide Others" action:@selector(hideOtherApplications:) keyEquivalent:@"h"];
     [menuItem setKeyEquivalentModifierMask:(NSAlternateKeyMask|NSCommandKeyMask)];
 
-	[appleMenu addItemWithTitle:@"Show All"
+    [appleMenu addItemWithTitle:@"Show All" action:@selector(unhideAllApplications:) keyEquivalent:@""];
-			action:@selector(unhideAllApplications:)
-			keyEquivalent:@""];
 
     [appleMenu addItem:[NSMenuItem separatorItem]];
 
     title = [@"Quit " stringByAppendingString:appName];
-	[appleMenu addItemWithTitle:title action:@selector(terminate:)
+    [appleMenu addItemWithTitle:title action:@selector(terminate:) keyEquivalent:@"q"];
-			keyEquivalent:@"q"];
+
     
     /* Put menu into the menubar */
-	menuItem = [[NSMenuItem alloc] initWithTitle:@"" action:nil
+    menuItem = [[NSMenuItem alloc] initWithTitle:@"" action:nil keyEquivalent:@""];
-			keyEquivalent:@""];
     [menuItem setSubmenu:appleMenu];
     [[NSApp mainMenu] addItem:menuItem];
 
@@ -131,8 +168,7 @@ setupAppleMenu (void)
 }
 
 /* Create a window menu */
-void
+static void setupWindowMenu(void)
-setupWindowMenu (void)
 {
     NSMenu      *windowMenu;
     NSMenuItem  *windowMenuItem;
@@ -141,15 +177,12 @@ setupWindowMenu (void)
     windowMenu = [[NSMenu alloc] initWithTitle:@"Window"];
     
     /* "Minimize" item */
-	menuItem = [[NSMenuItem alloc] initWithTitle:@"Minimize"
+    menuItem = [[NSMenuItem alloc] initWithTitle:@"Minimize" action:@selector(performMiniaturize:) keyEquivalent:@"m"];
-			action:@selector(performMiniaturize:)
-			keyEquivalent:@"m"];
     [windowMenu addItem:menuItem];
     [menuItem release];
     
     /* Put menu into the menubar */
-	windowMenuItem = [[NSMenuItem alloc] initWithTitle:@"Window"
+    windowMenuItem = [[NSMenuItem alloc] initWithTitle:@"Window" action:nil keyEquivalent:@""];
-			action:nil keyEquivalent:@""];
     [windowMenuItem setSubmenu:windowMenu];
     [[NSApp mainMenu] addItem:windowMenuItem];
     
@@ -162,19 +195,29 @@ setupWindowMenu (void)
 }
 
 /* Replacement for NSApplicationMain */
-void
+static void CustomApplicationMain (int argc, char **argv)
-CustomApplicationMain (int argc, char **argv)
 {
     NSAutoreleasePool	*pool = [[NSAutoreleasePool alloc] init];
     SDLMain				*sdlMain;
 
     /* Ensure the application object is initialised */
-	[SDLApplication sharedApplication];
+    [NSApplication sharedApplication];
+    
+#ifdef SDL_USE_CPS
+    {
+        CPSProcessSerNum PSN;
+        /* Tell the dock about us */
+        if (!CPSGetCurrentProcess(&PSN))
+            if (!CPSEnableForegroundOperation(&PSN,0x03,0x3C,0x2C,0x1103))
+                if (!CPSSetFrontProcess(&PSN))
+                    [NSApplication sharedApplication];
+    }
+#endif /* SDL_USE_CPS */
 
     /* Set up the menubar */
     [NSApp setMainMenu:[[NSMenu alloc] init]];
-	setupAppleMenu ();
+    setApplicationMenu();
-	setupWindowMenu ();
+    setupWindowMenu();
 
     /* Create SDLMain and make it the app delegate */
     sdlMain = [[SDLMain alloc] init];
@@ -185,11 +228,60 @@ CustomApplicationMain (int argc, char **argv)
     
     [sdlMain release];
     [pool release];
-
-	(void) argc;  /* Get rid of unused variable warning */
-	(void) argv;  /* Get rid of unused variable warning */
 }
 
+#endif
+
+
+/*
+ * Catch document open requests...this lets us notice files when the app
+ *  was launched by double-clicking a document, or when a document was
+ *  dragged/dropped on the app's icon. You need to have a
+ *  CFBundleDocumentsType section in your Info.plist to get this message,
+ *  apparently.
+ *
+ * Files are added to gArgv, so to the app, they'll look like command line
+ *  arguments. Previously, apps launched from the finder had nothing but
+ *  an argv[0].
+ *
+ * This message may be received multiple times to open several docs on launch.
+ *
+ * This message is ignored once the app's mainline has been called.
+ */
+- (BOOL)application:(NSApplication *)theApplication openFile:(NSString *)filename
+{
+    const char *temparg;
+    size_t arglen;
+    char *arg;
+    char **newargv;
+
+    if (!gFinderLaunch)  /* MacOS is passing command line args. */
+        return FALSE;
+
+    if (gCalledAppMainline)  /* app has started, ignore this document. */
+        return FALSE;
+
+    temparg = [filename UTF8String];
+    arglen = SDL_strlen(temparg) + 1;
+    arg = (char *) SDL_malloc(arglen);
+    if (arg == NULL)
+        return FALSE;
+
+    newargv = (char **) realloc(gArgv, sizeof (char *) * (gArgc + 2));
+    if (newargv == NULL)
+    {
+        SDL_free(arg);
+        return FALSE;
+    }
+    gArgv = newargv;
+
+    SDL_strlcpy(arg, temparg, arglen);
+    gArgv[gArgc++] = arg;
+    gArgv[gArgc] = NULL;
+    return TRUE;
+}
+
+
 /* Called when the internal event loop has just started running */
 - (void) applicationDidFinishLaunching: (NSNotification *) note
 {
@@ -198,22 +290,24 @@ CustomApplicationMain (int argc, char **argv)
     /* Set the working directory to the .app's parent directory */
     [self setupWorkingDirectory:gFinderLaunch];
 
-	/* allow Cocoa to hear keystrokes like Command-Q, etc. */
+#if SDL_USE_NIB_FILE
-	setenv ("SDL_ENABLEAPPEVENTS", "1", 1);
+    /* Set the main menu to contain the real app name instead of "SDL App" */
+    [self fixMenu:[NSApp mainMenu] withAppName:getApplicationName()];
+#endif
 
     /* Hand off to main application code */
+    gCalledAppMainline = TRUE;
     status = SDL_main (gArgc, gArgv);
 
     /* We're done, thank you for playing */
-	exit (status);
+    exit(status);
-
-	(void) note;  /* Get rid of unused variable warning */
 }
 @end
 
+
 @implementation NSString (ReplaceSubString)
 
-- (NSString *) stringByReplacingRange:(NSRange)aRange with:(NSString *)aString
+- (NSString *)stringByReplacingRange:(NSRange)aRange with:(NSString *)aString
 {
     unsigned int bufferSize;
     unsigned int selfLen = [self length];
@@ -223,7 +317,7 @@ CustomApplicationMain (int argc, char **argv)
     NSString *result;
 
     bufferSize = selfLen + aStringLen - aRange.length;
-	buffer = NSAllocateMemoryPages (bufferSize * sizeof (unichar));
+    buffer = (unichar *)NSAllocateMemoryPages(bufferSize*sizeof(unichar));
     
     /* Get first part into buffer */
     localRange.location = 0;
@@ -233,53 +327,55 @@ CustomApplicationMain (int argc, char **argv)
     /* Get middle part into buffer */
     localRange.location = 0;
     localRange.length = aStringLen;
-	[aString getCharacters:(buffer + aRange.location) range:localRange];
+    [aString getCharacters:(buffer+aRange.location) range:localRange];
      
     /* Get last part into buffer */
     localRange.location = aRange.location + aRange.length;
     localRange.length = selfLen - localRange.location;
-	[self getCharacters:(buffer + aRange.location+aStringLen)
+    [self getCharacters:(buffer+aRange.location+aStringLen) range:localRange];
-			range:localRange];
     
     /* Build output string */
     result = [NSString stringWithCharacters:buffer length:bufferSize];
     
-	NSDeallocateMemoryPages (buffer, bufferSize);
+    NSDeallocateMemoryPages(buffer, bufferSize);
     
     return result;
 }
 
 @end
 
+
+
 #ifdef main
 #  undef main
 #endif
 
+
 /* Main entry point to executable - should *not* be SDL_main! */
-int
+int main (int argc, char **argv)
-main (int argc, char **argv)
 {
     /* Copy the arguments into a global variable */
-	int i;
+    /* This is passed if we are launched by double-clicking */
-
+    if ( argc >= 2 && strncmp (argv[1], "-psn", 4) == 0 ) {
-	/* If we are launched by double-clicking, argv[1] is "-psn_<some_number> */
+        gArgv = (char **) SDL_malloc(sizeof (char *) * 2);
-	if ( argc >= 2 && strncmp (argv[1], "-psn_", 5) == 0 ) {
+        gArgv[0] = argv[0];
+        gArgv[1] = NULL;
         gArgc = 1;
         gFinderLaunch = YES;
     } else {
+        int i;
         gArgc = argc;
+        gArgv = (char **) SDL_malloc(sizeof (char *) * (argc+1));
+        for (i = 0; i <= argc; i++)
+            gArgv[i] = argv[i];
         gFinderLaunch = NO;
     }
-	gArgv = (char **) malloc (sizeof *gArgv * (gArgc + 1));
-	if (gArgv == NULL)
-		abort ();
-	for (i = 0; i < gArgc; i++)
-		gArgv[i] = argv[i];
-	gArgv[i] = NULL;
 
+#if SDL_USE_NIB_FILE
+    NSApplicationMain (argc, argv);
+#else
     CustomApplicationMain (argc, argv);
-	free (gArgv);
+#endif
     return 0;
 }
 
-