Added Max's patches for building MacOS X apps on command line

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40169

Makefile.am

@@ -61,7 +61,7 @@ exports:
 PBProjects.tar.gz:
 	rm -f `find . -name .DS_Store`
 	if [ -d PBProjects ]; then \
-	    tar zcvf $@ PBProjects src/main/macosx/SDLMain.nib; \
+	    tar zcvf $@ PBProjects; \
 	fi
 
 # Rule to force automake to rebuild the library

configure.in

@@ -2191,6 +2191,7 @@ docs/man3/Makefile
 include/Makefile
 src/Makefile
 src/main/Makefile
+src/main/macosx/Makefile
 src/audio/Makefile
 src/audio/alsa/Makefile
 src/audio/arts/Makefile

sdl-config.in

@@ -56,6 +56,12 @@ while test $# -gt 0; do
 @ENABLE_STATIC_TRUE@      libdirs="-L@libdir@ @SDL_RLD_FLAGS@"
 @ENABLE_STATIC_TRUE@      echo $libdirs @SDL_LIBS@ @SYSTEM_LIBS@
 @ENABLE_STATIC_TRUE@      ;;
+@TARGET_MACOSX_TRUE@    --nib)
+@TARGET_MACOSX_TRUE@      echo @datadir@/sdl/SDLMain.nib
+@TARGET_MACOSX_TRUE@      ;;
+@TARGET_MACOSX_TRUE@    --plist)
+@TARGET_MACOSX_TRUE@      echo @datadir@/sdl/Info.plist
+@TARGET_MACOSX_TRUE@      ;;
     *)
       echo "${usage}" 1>&2
       exit 1

sdl.m4

@@ -58,6 +58,17 @@ dnl Now check if the installed SDL is sufficiently new. (Also sanity
 dnl checks the results of sdl-config to some extent
 dnl
       rm -f conf.sdltest
+      case "$target" in
+          *-*-darwin*)
+            cp -r `$SDL_CONFIG --nib` .
+            dnl create an Info.plist file, unless one exists
+            if test -f Info.plist ; then
+             :
+            else
+             cp `$SDL_CONFIG --plist` .
+            fi
+              ;;
+      esac
       AC_TRY_RUN([
 #include <stdio.h>
 #include <stdlib.h>
@@ -169,5 +180,11 @@ int main(int argc, char *argv[])
   fi
   AC_SUBST(SDL_CFLAGS)
   AC_SUBST(SDL_LIBS)
+      case "$target" in
+          *-*-darwin*)
+              SDL_APPLE_CREATOR="????"
+              AC_SUBST(SDL_APPLE_CREATOR)
+              ;;
+      esac
   rm -f conf.sdltest
 ])

src/main/Makefile.am

@@ -4,6 +4,8 @@
 # This is necessary because some platforms have special program
 # entry points, which require special application initialization.
 
+SUBDIRS = macosx
+
 ARCH_SUBDIRS = $(srcdir)/beos $(srcdir)/linux \
                $(srcdir)/macos $(srcdir)/macosx $(srcdir)/win32
 

src/main/macosx/Info.plist

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
+<plist version="0.9">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>dummy</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>dummy</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>NSMainNibFile</key>
+	<string>SDLMain.nib</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+</dict>
+</plist>

src/main/macosx/Makefile.am

@@ -0,0 +1,17 @@
+# On OS X, install the SDLMain.nib.
+# We use an ugly hack to force the creation of the
+# destination dir, maybe somebody with more automake
+# experience knows how to do this properly?
+
+if TARGET_MACOSX
+masternibdatadir = $(datadir)/sdl/SDLMain.nib
+masternibdata_DATA =		\
+	SDLMain.nib
+
+nibdatadir = $(datadir)/sdl
+nibdata_DATA =			\
+	SDLMain.nib/classes.nib	\
+	SDLMain.nib/info.nib	\
+	SDLMain.nib/objects.nib	\
+	Info.plist
+endif

src/main/macosx/SDLMain.h

@@ -10,5 +10,6 @@
 {
 }
 - (IBAction)quit:(id)sender;
+- (IBAction)makeFullscreen:(id)sender;
 - (void)applicationDidFinishLaunching:(NSNotification *)aNotification;
 @end

src/main/macosx/SDLMain.m

@@ -12,6 +12,7 @@
 static int    gArgc;
 static char  **gArgv;
 static NSString *gAppName = 0;
+static BOOL   gFinderLaunch;
 
 @interface NSString (ReplaceSubString)
 - (NSString *)stringByReplacingRange:(NSRange)aRange with:(NSString *)aString;
@@ -29,15 +30,21 @@ static NSString *gAppName = 0;
     SDL_PushEvent(&event);
 }
 
+/* Invoked from the Make Full-Screen menu item */
+- (void) makeFullscreen:(id)sender
+{
+    /* TODO */
+}
+
 /* Set the working directory to the .app's parent directory */
-- (void) setupWorkingDirectory
+- (void) setupWorkingDirectory:(BOOL)shouldChdir
 {
     char parentdir[MAXPATHLEN];
     char *c;
     
     strncpy ( parentdir, gArgv[0], sizeof(parentdir) );
     c = (char*) parentdir;
-    
+
     while (*c != '\0')     /* go to end */
         c++;
     
@@ -45,11 +52,13 @@ static NSString *gAppName = 0;
         c--;
     
     *c++ = '\0';             /* cut off last part (binary name) */
-    
+  
-    assert ( chdir (parentdir) == 0 );   /* chdir to the binary app's parent */
+    if (shouldChdir)
-    assert ( chdir ("../../../") == 0 ); /* chdir to the .app's parent */
+    {
-    
+      assert ( chdir (parentdir) == 0 );   /* chdir to the binary app's parent */
-    gAppName = [ NSString stringWithCString: c ];
+      assert ( chdir ("../../../") == 0 ); /* chdir to the .app's parent */
+    }
+    /* gAppName = [ NSString stringWithCString: c ]; */
 }
 
 /* Fix menu to contain the real app name instead of "SDL App" */
@@ -81,9 +90,10 @@ static NSString *gAppName = 0;
     int status;
 
     /* Set the working directory to the .app's parent directory */
-    [ self setupWorkingDirectory ];
+    [ self setupWorkingDirectory: gFinderLaunch ];
 
     /* Set the main menu to contain the real app name instead of "SDL App" */
+    gAppName = [ [ NSBundle mainBundle ] bundleIdentifier ];
     [ self fixMenu: [ NSApp mainMenu ] ];
 
     /* Hand off to main application code */
@@ -148,8 +158,10 @@ int main (int argc, char **argv) {
     /* This is passed if we are launched by double-clicking */
     if ( argc >= 2 && strncmp (argv[1], "-psn", 4) == 0 ) {
         gArgc = 1;
+	gFinderLaunch = YES;
     } else {
         gArgc = argc;
+	gFinderLaunch = NO;
     }
     gArgv = (char**) malloc (sizeof(*gArgv) * (gArgc+1));
     assert (gArgv != NULL);

src/main/macosx/SDLMain.nib/classes.nib

@@ -0,0 +1,12 @@
+{
+    IBClasses = (
+        {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
+        {
+            ACTIONS = {makeFullscreen = id; quit = id; }; 
+            CLASS = SDLMain; 
+            LANGUAGE = ObjC; 
+            SUPERCLASS = NSObject; 
+        }
+    ); 
+    IBVersion = 1; 
+}

src/main/macosx/SDLMain.nib/info.nib

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
+<plist version="0.9">
+<dict>
+	<key>IBDocumentLocation</key>
+	<string>49 97 356 240 0 0 987 746 </string>
+	<key>IBMainMenuLocation</key>
+	<string>20 515 195 44 0 46 800 532 </string>
+	<key>IBUserGuides</key>
+	<dict/>
+</dict>
+</plist>

src/video/maccommon/SDL_macevents.c

@@ -72,7 +72,7 @@ static int Mac_HandleActivate(int activate)
 		SDL_SetCursor(NULL);
 
 		/* put our mask back case it changed during context switch */
-		SetEventMask(everyEvent - autoKeyMask);
+		SetEventMask(everyEvent & ~autoKeyMask);
 	} else {
 #if TARGET_API_MAC_CARBON
 		{ Cursor cursor;
@@ -617,7 +617,7 @@ void Mac_InitEvents(_THIS)
 	FlushEvents(everyEvent, 0);
 	
 	/* Allow every event but keyrepeat */
-	SetEventMask(everyEvent - autoKeyMask);
+	SetEventMask(everyEvent & ~autoKeyMask);
 }
 
 void Mac_QuitEvents(_THIS)

src/video/maccommon/SDL_macmouse.c

@@ -67,18 +67,22 @@ WMcursor *Mac_CreateWMCursor(_THIS,
 		return(NULL);
 	}
 	memset(cursor, 0, sizeof(*cursor));
-		
+    
-	bytes = (w/8);
+    if (w > 16)
-	if ( bytes > 2 ) {
+        w = 16;
-		bytes = 2;
+    
-	}
+    if (h > 16)
-	for ( row=0; row<h && (row < 16); ++row ) {
+        h = 16;
+    
+	bytes = (w+7)/8;
+
+	for ( row=0; row<h; ++row ) {
 		memcpy(&cursor->curs.data[row], data, bytes);
-		data += w/8;
+		data += bytes;
 	}
-	for ( row=0; row<h && (row < 16); ++row ) {
+	for ( row=0; row<h; ++row ) {
 		memcpy(&cursor->curs.mask[row], mask, bytes);
-		mask += w/8;
+		mask += bytes;
 	}
 	cursor->curs.hotSpot.h = hot_x;
 	cursor->curs.hotSpot.v = hot_y;

src/video/quartz/Makefile.am

@@ -11,7 +11,7 @@ QUARTZ_SRCS = 			\
 	SDL_QuartzVideo.m
 
 # These files are included by SDL_QuartzVideo.m (is that right??)
-EXTRA_DIST = 			\
+noinst_HEADERS =		\
 	SDL_QuartzEvents.m	\
 	SDL_QuartzWM.m		\
 	SDL_QuartzWindow.m

src/video/quartz/SDL_QuartzEvents.m

@@ -206,6 +206,12 @@ static void QZ_DoActivate (_THIS)
         QZ_WarpWMCursor (this, SDL_VideoSurface->w / 2, SDL_VideoSurface->h / 2);
         CGAssociateMouseAndMouseCursorPosition (0);
     }
+
+    /* Hide the mouse cursor if inside the app window */
+    // FIXME
+    if (!QZ_cursor_visible) {
+            HideCursor ();
+    }
     
     SDL_PrivateAppActive (1, SDL_APPINPUTFOCUS);
 }
@@ -218,6 +224,12 @@ static void QZ_DoDeactivate (_THIS) {
     if (currentGrabMode == SDL_GRAB_ON) {
         CGAssociateMouseAndMouseCursorPosition (1);
     }
+
+    /* Show the mouse cursor */
+    // FIXME
+    if (!QZ_cursor_visible) {
+            ShowCursor ();
+    }
     
     SDL_PrivateAppActive (0, SDL_APPINPUTFOCUS);
 }
@@ -309,6 +321,8 @@ static void QZ_PumpEvents (_THIS)
             case NSRightMouseDragged:
             case 27:
             case NSMouseMoved:
+                if ( (SDL_VideoSurface->flags & SDL_FULLSCREEN)
+                	|| NSPointInRect([event locationInWindow], winRect) )
                 {
                    static int moves = 0;
                    NSPoint p;

src/video/quartz/SDL_QuartzWM.m

@@ -35,46 +35,52 @@ static WMcursor*    QZ_CreateWMCursor   (_THIS, Uint8 *data, Uint8 *mask,
                                           int w, int h, int hot_x, int hot_y) { 
 	WMcursor *cursor;
 	int row, bytes;
+		
+	/* Allocate the cursor memory */
 	cursor = (WMcursor *)malloc(sizeof(WMcursor));
 	if ( cursor == NULL ) {
 		SDL_OutOfMemory();
 		return(NULL);
 	}
 	memset(cursor, 0, sizeof(*cursor));
-		
+    
-	bytes = (w/8);
+    if (w > 16)
-	if ( bytes > 2 ) {
+        w = 16;
-		bytes = 2;
+    
-	}
+    if (h > 16)
-	for ( row=0; row<h && (row < 16); ++row ) {
+        h = 16;
+    
+	bytes = (w+7)/8;
+
+	for ( row=0; row<h; ++row ) {
 		memcpy(&cursor->curs.data[row], data, bytes);
-		data += w/8;
+		data += bytes;
 	}
-	for ( row=0; row<h && (row < 16); ++row ) {
+	for ( row=0; row<h; ++row ) {
 		memcpy(&cursor->curs.mask[row], mask, bytes);
-		mask += w/8;
+		mask += bytes;
 	}
 	cursor->curs.hotSpot.h = hot_x;
 	cursor->curs.hotSpot.v = hot_y;
 	
-        return(cursor);
+    return(cursor);
 }
 
+static int QZ_cursor_visible = 1;
+    
 static int QZ_ShowWMCursor (_THIS, WMcursor *cursor) { 
 
-    static int visible = 1;
-    
     if ( cursor == NULL) {
-        if ( visible ) {
+        if ( QZ_cursor_visible ) {
             HideCursor ();
-            visible = 0;
+            QZ_cursor_visible = 0;
         }
     }
     else {
         SetCursor(&cursor->curs);
-        if ( ! visible ) {
+        if ( ! QZ_cursor_visible ) {
             ShowCursor ();
-            visible = 1;
+            QZ_cursor_visible = 1;
         }
     }