added "Whitespace and line Endings cleanup" by GreYFoX

3 files changed, 243 insertions, 243 deletions

diff --git a/src/osxlaunch/client.h b/src/osxlaunch/client.h
index be59d0b9..450b8543 100644
--- a/src/osxlaunch/client.h
+++ b/src/osxlaunch/client.h
@@ -1,10 +1,10 @@
 #ifndef OSXLAUNCH_CLIENT_H
 #define OSXLAUNCH_CLIENT_H
-/*   SDLMain.m - main entry point for our Cocoa-ized SDL app
-       Initial Version: Darrell Walisser <dwaliss1@purdue.edu>
-       Non-NIB-Code & other changes: Max Horn <max@quendi.de>
+/*	SDLMain.m - main entry point for our Cocoa-ized SDL app
+		Initial Version: Darrell Walisser <dwaliss1@purdue.edu>
+		Non-NIB-Code & other changes: Max Horn <max@quendi.de>
 
-    Feel free to customize this file to suit your needs
+	Feel free to customize this file to suit your needs
 */
 
 #import <Cocoa/Cocoa.h>
diff --git a/src/osxlaunch/client.m b/src/osxlaunch/client.m
index c6e6203e..6de919e2 100644
--- a/src/osxlaunch/client.m
+++ b/src/osxlaunch/client.m
@@ -1,8 +1,8 @@
-/*   SDLMain.m - main entry point for our Cocoa-ized SDL app
-       Initial Version: Darrell Walisser <dwaliss1@purdue.edu>
-       Non-NIB-Code & other changes: Max Horn <max@quendi.de>
+/*	SDLMain.m - main entry point for our Cocoa-ized SDL app
+		Initial Version: Darrell Walisser <dwaliss1@purdue.edu>
+		Non-NIB-Code & other changes: Max Horn <max@quendi.de>
 
-    Feel free to customize this file to suit your needs
+	Feel free to customize this file to suit your needs
 */
 
 #import <SDL.h>
@@ -36,25 +36,25 @@ extern OSErr	CPSSetFrontProcess( CPSProcessSerNum *psn);
 
 #endif /* SDL_USE_CPS */
 
-static int    gArgc;
-static char  **gArgv;
-static BOOL   gFinderLaunch;
-static BOOL   gCalledAppMainline = FALSE;
+static int gArgc;
+static char **gArgv;
+static BOOL gFinderLaunch;
+static BOOL gCalledAppMainline = FALSE;
 
 static NSString *getApplicationName(void)
 {
-    NSDictionary *dict;
-    NSString *appName = 0;
-
-    /* Determine the application name */
-    dict = (NSDictionary *)CFBundleGetInfoDictionary(CFBundleGetMainBundle());
-    if (dict)
-        appName = [dict objectForKey: @"CFBundleName"];
-    
-    if (![appName length])
-        appName = [[NSProcessInfo processInfo] processName];
-
-    return appName;
+	NSDictionary *dict;
+	NSString *appName = 0;
+
+	/* Determine the application name */
+	dict = (NSDictionary *)CFBundleGetInfoDictionary(CFBundleGetMainBundle());
+	if (dict)
+		appName = [dict objectForKey: @"CFBundleName"];
+
+	if (![appName length])
+		appName = [[NSProcessInfo processInfo] processName];
+
+	return appName;
 }
 
 #if SDL_USE_NIB_FILE
@@ -71,10 +71,10 @@ static NSString *getApplicationName(void)
 /* 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);
+	/* Post a SDL_QUIT event */
+	SDL_Event event;
+	event.type = SDL_QUIT;
+	SDL_PushEvent(&event);
 }
 @end
 
@@ -93,133 +93,133 @@ static NSString *getApplicationName(void)
 /* 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];
-    }
-    [ aMenu sizeToFit ];
+	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];
+	}
+	[ aMenu sizeToFit ];
 }
 
 #else
 
 static void setApplicationMenu(void)
 {
-    /* warning: this code is very odd */
-    NSMenu *appleMenu;
-    NSMenuItem *menuItem;
-    NSString *title;
-    NSString *appName;
-    
-    appName = getApplicationName();
-    appleMenu = [[NSMenu alloc] initWithTitle:@""];
-    
-    /* Add menu items */
-    title = [@"About " stringByAppendingString:appName];
-    [appleMenu addItemWithTitle:title action:@selector(orderFrontStandardAboutPanel:) keyEquivalent:@""];
-
-    [appleMenu addItem:[NSMenuItem separatorItem]];
-
-    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" action:@selector(unhideAllApplications:) keyEquivalent:@""];
-
-    [appleMenu addItem:[NSMenuItem separatorItem]];
-
-    title = [@"Quit " stringByAppendingString:appName];
-    [appleMenu addItemWithTitle:title action:@selector(terminate:) keyEquivalent:@"q"];
-
-    
-    /* Put menu into the menubar */
-    menuItem = [[NSMenuItem alloc] initWithTitle:@"" action:nil keyEquivalent:@""];
-    [menuItem setSubmenu:appleMenu];
-    [[NSApp mainMenu] addItem:menuItem];
-
-    /* Tell the application object that this is now the application menu */
-    [NSApp setAppleMenu:appleMenu];
-
-    /* Finally give up our references to the objects */
-    [appleMenu release];
-    [menuItem release];
+	/* warning: this code is very odd */
+	NSMenu *appleMenu;
+	NSMenuItem *menuItem;
+	NSString *title;
+	NSString *appName;
+
+	appName = getApplicationName();
+	appleMenu = [[NSMenu alloc] initWithTitle:@""];
+
+	/* Add menu items */
+	title = [@"About " stringByAppendingString:appName];
+	[appleMenu addItemWithTitle:title action:@selector(orderFrontStandardAboutPanel:) keyEquivalent:@""];
+
+	[appleMenu addItem:[NSMenuItem separatorItem]];
+
+	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" action:@selector(unhideAllApplications:) keyEquivalent:@""];
+
+	[appleMenu addItem:[NSMenuItem separatorItem]];
+
+	title = [@"Quit " stringByAppendingString:appName];
+	[appleMenu addItemWithTitle:title action:@selector(terminate:) keyEquivalent:@"q"];
+
+
+	/* Put menu into the menubar */
+	menuItem = [[NSMenuItem alloc] initWithTitle:@"" action:nil keyEquivalent:@""];
+	[menuItem setSubmenu:appleMenu];
+	[[NSApp mainMenu] addItem:menuItem];
+
+	/* Tell the application object that this is now the application menu */
+	[NSApp setAppleMenu:appleMenu];
+
+	/* Finally give up our references to the objects */
+	[appleMenu release];
+	[menuItem release];
 }
 
 /* Create a window menu */
 static void setupWindowMenu(void)
 {
-    NSMenu      *windowMenu;
-    NSMenuItem  *windowMenuItem;
-    NSMenuItem  *menuItem;
-
-    windowMenu = [[NSMenu alloc] initWithTitle:@"Window"];
-    
-    /* "Minimize" item */
-    menuItem = [[NSMenuItem alloc] initWithTitle:@"Minimize" action:@selector(performMiniaturize:) keyEquivalent:@"m"];
-    [windowMenu addItem:menuItem];
-    [menuItem release];
-    
-    /* Put menu into the menubar */
-    windowMenuItem = [[NSMenuItem alloc] initWithTitle:@"Window" action:nil keyEquivalent:@""];
-    [windowMenuItem setSubmenu:windowMenu];
-    [[NSApp mainMenu] addItem:windowMenuItem];
-    
-    /* Tell the application object that this is now the window menu */
-    [NSApp setWindowsMenu:windowMenu];
-
-    /* Finally give up our references to the objects */
-    [windowMenu release];
-    [windowMenuItem release];
+	NSMenu		*windowMenu;
+	NSMenuItem	*windowMenuItem;
+	NSMenuItem	*menuItem;
+
+	windowMenu = [[NSMenu alloc] initWithTitle:@"Window"];
+
+	/* "Minimize" item */
+	menuItem = [[NSMenuItem alloc] initWithTitle:@"Minimize" action:@selector(performMiniaturize:) keyEquivalent:@"m"];
+	[windowMenu addItem:menuItem];
+	[menuItem release];
+
+	/* Put menu into the menubar */
+	windowMenuItem = [[NSMenuItem alloc] initWithTitle:@"Window" action:nil keyEquivalent:@""];
+	[windowMenuItem setSubmenu:windowMenu];
+	[[NSApp mainMenu] addItem:windowMenuItem];
+
+	/* Tell the application object that this is now the window menu */
+	[NSApp setWindowsMenu:windowMenu];
+
+	/* Finally give up our references to the objects */
+	[windowMenu release];
+	[windowMenuItem release];
 }
 
 /* Replacement for NSApplicationMain */
 static void CustomApplicationMain (int argc, char **argv)
 {
-    NSAutoreleasePool	*pool = [[NSAutoreleasePool alloc] init];
-    SDLMain				*sdlMain;
+	NSAutoreleasePool	*pool = [[NSAutoreleasePool alloc] init];
+	SDLMain				*sdlMain;
+
+	/* Ensure the application object is initialised */
+	[SDLApplication sharedApplication];
 
-    /* Ensure the application object is initialised */
-    [SDLApplication 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))
-                    [SDLApplication sharedApplication];
-    }
+	{
+		CPSProcessSerNum PSN;
+		/* Tell the dock about us */
+		if (!CPSGetCurrentProcess(&PSN))
+			if (!CPSEnableForegroundOperation(&PSN,0x03,0x3C,0x2C,0x1103))
+				if (!CPSSetFrontProcess(&PSN))
+					[SDLApplication sharedApplication];
+	}
 #endif /* SDL_USE_CPS */
 
-    /* Set up the menubar */
-    [NSApp setMainMenu:[[NSMenu alloc] init]];
-    setApplicationMenu();
-    setupWindowMenu();
-
-    /* Create SDLMain and make it the app delegate */
-    sdlMain = [[SDLMain alloc] init];
-    [NSApp setDelegate:sdlMain];
-    
-    /* Start the main event loop */
-    [NSApp run];
-    
-    [sdlMain release];
-    [pool release];
+	/* Set up the menubar */
+	[NSApp setMainMenu:[[NSMenu alloc] init]];
+	setApplicationMenu();
+	setupWindowMenu();
+
+	/* Create SDLMain and make it the app delegate */
+	sdlMain = [[SDLMain alloc] init];
+	[NSApp setDelegate:sdlMain];
+
+	/* Start the main event loop */
+	[NSApp run];
+
+	[sdlMain release];
+	[pool release];
 }
 
 #endif
@@ -227,14 +227,14 @@ static void CustomApplicationMain (int argc, char **argv)
 
 /*
  * 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.
+ * 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].
+ * 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.
  *
@@ -242,57 +242,57 @@ static void CustomApplicationMain (int argc, char **argv)
  */
 - (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;
+	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
 {
-    int status;
+	int status;
 
-    /* Set the working directory to the .app's parent directory */
-    [self setupWorkingDirectory:gFinderLaunch];
+	/* Set the working directory to the .app's parent directory */
+	[self setupWorkingDirectory:gFinderLaunch];
 
 #if SDL_USE_NIB_FILE
-    /* Set the main menu to contain the real app name instead of "SDL App" */
-    [self fixMenu:[NSApp mainMenu] withAppName:getApplicationName()];
+	/* 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);
+	/* Hand off to main application code */
+	gCalledAppMainline = TRUE;
+	status = SDL_main (gArgc, gArgv);
 
-    /* We're done, thank you for playing */
-    exit(status);
+	/* We're done, thank you for playing */
+	exit(status);
 }
 @end
 
@@ -301,65 +301,65 @@ static void CustomApplicationMain (int argc, char **argv)
 
 - (NSString *)stringByReplacingRange:(NSRange)aRange with:(NSString *)aString
 {
-    unsigned int bufferSize;
-    unsigned int selfLen = [self length];
-    unsigned int aStringLen = [aString length];
-    unichar *buffer;
-    NSRange localRange;
-    NSString *result;
-
-    bufferSize = selfLen + aStringLen - aRange.length;
-    buffer = NSAllocateMemoryPages(bufferSize*sizeof(unichar));
-    
-    /* Get first part into buffer */
-    localRange.location = 0;
-    localRange.length = aRange.location;
-    [self getCharacters:buffer range:localRange];
-    
-    /* Get middle part into buffer */
-    localRange.location = 0;
-    localRange.length = aStringLen;
-    [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) range:localRange];
-    
-    /* Build output string */
-    result = [NSString stringWithCharacters:buffer length:bufferSize];
-    
-    NSDeallocateMemoryPages(buffer, bufferSize);
-    
-    return result;
+	unsigned int bufferSize;
+	unsigned int selfLen = [self length];
+	unsigned int aStringLen = [aString length];
+	unichar *buffer;
+	NSRange localRange;
+	NSString *result;
+
+	bufferSize = selfLen + aStringLen - aRange.length;
+	buffer = NSAllocateMemoryPages(bufferSize*sizeof(unichar));
+
+	/* Get first part into buffer */
+	localRange.location = 0;
+	localRange.length = aRange.location;
+	[self getCharacters:buffer range:localRange];
+
+	/* Get middle part into buffer */
+	localRange.location = 0;
+	localRange.length = aStringLen;
+	[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) range:localRange];
+
+	/* Build output string */
+	result = [NSString stringWithCharacters:buffer length:bufferSize];
+
+	NSDeallocateMemoryPages(buffer, bufferSize);
+
+	return result;
 }
 
 @end
 
 #ifdef main
-#  undef main
+#undef main
 #endif
 
 
 /* Main entry point to executable - should *not* be SDL_main! */
 int main (int argc, char **argv)
 {
-    /* Copy the arguments into a global variable */
-    /* This is passed if we are launched by double-clicking */
-    if ( argc >= 2 && strncmp (argv[1], "-psn", 4) == 0 ) {
-        gArgv = (char **) SDL_malloc(sizeof (char *) * 2);
-        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;
-    }
+	/* Copy the arguments into a global variable */
+	/* This is passed if we are launched by double-clicking */
+	if ( argc >= 2 && strncmp (argv[1], "-psn", 4) == 0 ) {
+		gArgv = (char **) SDL_malloc(sizeof (char *) * 2);
+		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;
+	}
 
 #if SDL_USE_NIB_FILE
 	[SDLApplication poseAsClass:[NSApplication class]];
@@ -368,6 +368,6 @@ int main (int argc, char **argv)
 	CustomApplicationMain (argc, argv);
 #endif
 
-    return 0;
+	return 0;
 }
 
diff --git a/src/osxlaunch/server.m b/src/osxlaunch/server.m
index 6c22efc5..5ae32c6f 100644
--- a/src/osxlaunch/server.m
+++ b/src/osxlaunch/server.m
@@ -13,9 +13,9 @@
 {
 	NSPipe *pipe;
 	task = t;
-    pipe = [NSPipe pipe];
-    [task setStandardOutput: pipe];
-    file = [pipe fileHandleForReading];
+	pipe = [NSPipe pipe];
+	[task setStandardOutput: pipe];
+	file = [pipe fileHandleForReading];
 
 	[[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(outputNotification:) name: NSFileHandleReadCompletionNotification object: file];
 
@@ -30,8 +30,8 @@
 
 	[[self textStorage] appendAttributedString: attrstr];
 	int length = [[self textStorage] length];
-    NSRange range = NSMakeRange(length, 0);
-    [self scrollRangeToVisible: range];
+	NSRange range = NSMakeRange(length, 0);
+	[self scrollRangeToVisible: range];
 
 	[attrstr release];
 	[string release];
@@ -41,18 +41,18 @@
 -(void)windowWillClose:(NSNotification *)notification
 {
 	[task terminate];
-    [NSApp terminate:self];
+	[NSApp terminate:self];
 }
 @end
 
 void runServer()
 {
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-    NSApp = [NSApplication sharedApplication];
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+	NSApp = [NSApplication sharedApplication];
 	NSBundle* mainBundle = [NSBundle mainBundle];
 	NSTask *task;
-    task = [[NSTask alloc] init];
-	[task setCurrentDirectoryPath: [mainBundle resourcePath]]; 
+	task = [[NSTask alloc] init];
+	[task setCurrentDirectoryPath: [mainBundle resourcePath]];
 
 	// get a server config
 	NSOpenPanel* openDlg = [NSOpenPanel openPanel];
@@ -77,8 +77,8 @@ void runServer()
 
 	window = [[NSWindow alloc]
 		initWithContentRect: graphicsRect
-		styleMask: NSTitledWindowMask 
-		| NSClosableWindowMask 
+		styleMask: NSTitledWindowMask
+		| NSClosableWindowMask
 		| NSMiniaturizableWindowMask
 		backing: NSBackingStoreBuffered
 		defer: NO];
@@ -100,8 +100,8 @@ void runServer()
 	[NSApp run];
 	[task terminate];
 
-    [NSApp release];
-    [pool release];
+	[NSApp release];
+	[pool release];
 }
 
 int main (int argc, char **argv)