Changeset 97Tweet

Timestamp:

Mar 9, 2008, 7:22:52 PM (14 years ago)

Author:

Sam Hocevar

Message:

• Updated the Mac OS X port, thanks to Julian Mayer.

Location:

abuse/trunk

Files:

• osx/Info.plist (added)
• osx/SDLMain.h (added)
• osx/SDLMain.m (modified) (5 diffs)
• osx/SDLMain.nib (deleted)
• osx/abuse.icns (added)
• osx/abuse.xcodeproj (added)
• osx/abuse.xcodeproj/project.pbxproj (added)
• osx/abuse_sdl.pbproj (deleted)
• osx/build (deleted)
• osx/config.h (added)
• src/imlib/specs.cpp (modified) (1 diff)
• src/imlib/system.h (modified) (2 diffs)
• src/imlib/xwdread.cpp (modified) (2 diffs)
• src/net/tcpip.hpp (modified) (1 diff)
• src/sdlport/setup.cpp (modified) (5 diffs)

abuse/trunk/osx/SDLMain.m

@@ -7 +7 @@
 
 #import "SDL.h"
-#import <Cocoa/Cocoa.h>
-
-@interface SDLMain : NSObject
-@end
-
+#import "SDLMain.h"
 #import <sys/param.h> /* for MAXPATHLEN */
 #import <unistd.h>
 
 /* Use this flag to determine whether we use SDLMain.nib or not */
-#define         SDL_USE_NIB_FILE        1
+#define         SDL_USE_NIB_FILE        0
 
 
@@ -27 +23 @@
 @interface NSString (ReplaceSubString)
 - (NSString *)stringByReplacingRange:(NSRange)aRange with:(NSString *)aString;
+@end
+#else
+/* An internal Apple class used to setup Apple menus */
+@interface NSAppleMenuController:NSObject {}
+- (void)controlMenu:(NSMenu *)aMenu;
 @end
 #endif
@@ -47 +48 @@
 /* The main class of the application, the application's delegate */
 @implementation SDLMain
-- (void)quit:(id)sender
-{
-    /* Post a SDL_QUIT event */
-    SDL_Event event;
-    event.type = SDL_QUIT;
-    SDL_PushEvent(&event);
-}
+
 /* Set the working directory to the .app's parent directory */
 - (void) setupWorkingDirectory:(BOOL)shouldChdir
@@ -101 +96 @@
     }
     [ aMenu sizeToFit ];
+}
+
+#else
+
+void setupAppleMenu(void)
+{
+    /* warning: this code is very odd */
+    NSAppleMenuController *appleMenuController;
+    NSMenu *appleMenu;
+    NSMenuItem *appleMenuItem;
+
+    appleMenuController = [[NSAppleMenuController alloc] init];
+    appleMenu = [[NSMenu alloc] initWithTitle:@""];
+    appleMenuItem = [[NSMenuItem alloc] initWithTitle:@"" action:nil keyEquivalent:@""];
+    
+    [appleMenuItem setSubmenu:appleMenu];
+
+    /* yes, we do need to add it and then remove it --
+       if you don't add it, it doesn't get displayed
+       if you don't remove it, you have an extra, titleless item in the menubar
+       when you remove it, it appears to stick around
+       very, very odd */
+    [[NSApp mainMenu] addItem:appleMenuItem];
+    [appleMenuController controlMenu:appleMenu];
+    [[NSApp mainMenu] removeItem:appleMenuItem];
+    [appleMenu release];
+    [appleMenuItem release];
+}
+
+/* Create a window menu */
+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];
+}
+
+/* Replacement for NSApplicationMain */
+void CustomApplicationMain (argc, argv)
+{
+    NSAutoreleasePool   *pool = [[NSAutoreleasePool alloc] init];
+    SDLMain                             *sdlMain;
+
+    /* Ensure the application object is initialised */
+    [SDLApplication sharedApplication];
+    
+    /* Set up the menubar */
+    [NSApp setMainMenu:[[NSMenu alloc] init]];
+    setupAppleMenu();
+    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];
 }
 
@@ -197 +272 @@
     [SDLApplication poseAsClass:[NSApplication class]];
     NSApplicationMain (argc, argv);
+#else
+    CustomApplicationMain (argc, argv);
 #endif
     return 0;

abuse/trunk/src/imlib/specs.cpp

@@ -932 +932 @@
 void write_uint8(FILE *fp, uint8_t x) { fputc((unsigned char)x,fp); }
 
-uint32_t read_other_int32(FILE *fp)
+uint32_t read_other_uint32(FILE *fp)
 {
   uint32_t x;

abuse/trunk/src/imlib/system.h

@@ -11 +11 @@
 #define __SYS__
 
-
-#ifdef WORDS_BIGENDIAN
-  #define BIG_ENDIANS
-#else
-  #define LITTLE_ENDIANS
-#endif
-
+#include <SDL.h>
 
 #include <unistd.h>
@@ -27 +21 @@
    ((( ((uint32_t)(x)) )&0x0000ff00)<<8)|(( ((uint32_t)(x)) )<<24))
 
-#if defined BIG_ENDIANS
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN 
 #define LONG int32_t
 #define uint16_to_intel(x) uint16_swap(x)

abuse/trunk/src/imlib/xwdread.cpp

@@ -21 +21 @@
 #include "video.hpp"
 #include "dos.h"
+#ifndef __APPLE__
 #include "main.hpp"
+#endif
 #include "macs.hpp"
 #include "image24.hpp"
@@ -296 +298 @@
   int i,j;
   uint8_t *sl;
-#if BYTE_ORDER!=BIG_ENDIAN
-  printf("little guys\n");
-#endif
+
   printf("getting image, bits_per_item = %d %d %d\n",bits_per_item,bits_used,bit_order==MSBFirst);
   for (i=0; i<im->height(); i++)

abuse/trunk/src/net/tcpip.hpp

@@ -9 +9 @@
 #include <sys/types.h>
 #include "isllist.hpp"
-
-#ifdef __APPLE__
-typedef int socklen_t;
-#endif
 
 #if (defined(__APPLE__) && !defined(__MACH__))

abuse/trunk/src/sdlport/setup.cpp

@@ -27 +27 @@
 #ifdef HAVE_OPENGL
 #ifdef __APPLE__
+#include <Carbon/Carbon.h>
 #include <OpenGL/gl.h>
 #include <OpenGL/glu.h>
@@ -90 +91 @@
     {
         fputs( "; Abuse-SDL Configuration file\n\n", fd );
+        fputs( "; Startup fullscreen\nfullscreen=0\n\n", fd );
+                #ifdef __APPLE__
+        fputs( "; Use DoubleBuffering\ndoublebuf=1\n\n", fd );
+        fputs( "; Use OpenGL\ngl=1\n\n", fd );
+        #else
+                fputs( "; Use DoubleBuffering\ndoublebuf=0\n\n", fd );
+        fputs( "; Use OpenGL\ngl=0\n\n", fd );
         fputs( "; Location of the datafiles\ndatadir=/var/games/abuse\n\n", fd );
-        fputs( "; Startup fullscreen\nfullscreen=0\n\n", fd );
-        fputs( "; Use DoubleBuffering\ndoublebuf=0\n\n", fd );
-        fputs( "; Use mono audio only\nmono=0\n\n", fd );
+                #endif
+                fputs( "; Use mono audio only\nmono=0\n\n", fd );
         fputs( "; Grab the mouse to the window\ngrabmouse=0\n\n", fd );
         fputs( "; Set the scale factor\nscale=2\n\n", fd );
-        fputs( "; Use OpenGL\ngl=0\n\n", fd );
-        fputs( "; Use anti-aliasing (with gl=1 only)\nantialias=1\n\n", fd );
+                fputs( "; Use anti-aliasing (with gl=1 only)\nantialias=1\n\n", fd );
 //        fputs( "; Set the width of the window\nx=320\n\n", fd );
 //        fputs( "; Set the height of the window\ny=200\n\n", fd );
@@ -339 +345 @@
     // Initialise default settings
     flags.fullscreen        = 0;            // Start in a window
-    flags.doublebuf            = 0;            // No double buffering
     flags.mono                = 0;            // Enable stereo sound
     flags.nosound            = 0;            // Enable sound
@@ -346 +351 @@
     flags.xres = xres        = 320;            // Default window width
     flags.yres = yres        = 200;            // Default window height
+#ifdef __APPLE__        
+    flags.gl                = 1;            // Use opengl
+    flags.doublebuf            = 1;            // Do double buffering
+#else
     flags.gl                = 0;            // Don't use opengl
+    flags.doublebuf            = 0;            // No double buffering
+        #endif
 #ifdef HAVE_OPENGL
     flags.antialias            = GL_NEAREST;    // Don't anti-alias
@@ -403 +414 @@
     // Set the datadir to a default value
     // (The current directory)
+        #ifdef __APPLE__
+        UInt8 buffer[255];
+    CFURLRef bundleurl = CFBundleCopyBundleURL(CFBundleGetMainBundle());
+        CFURLRef url = CFURLCreateCopyAppendingPathComponent(kCFAllocatorDefault, bundleurl, CFSTR("Contents/Resources/data"), true);
+        
+        if (!CFURLGetFileSystemRepresentation(url, true, buffer, 255))
+        {
+                exit(1);
+        }
+        else
+                set_filename_prefix( (const char*)buffer );
+        #else
     set_filename_prefix( EXPDATADIR );
-
+        #endif
+        
     // Load the users configuration
     readRCFile();