To: sdl@libsdl.org
authorRyan C. Gordon <icculus@icculus.org>
Sun, 01 Jan 2006 23:45:52 +0000
changeset 1211304d8dd6a989
parent 1210 8609567ea02f
child 1212 7663bb0f52c7
To: sdl@libsdl.org
From: Christian Walther <cwalther@gmx.ch>
Date: Wed, 28 Dec 2005 12:13:20 +0100
Subject: [SDL] Fix for opening documents on Mac OS X < 10.4

The current code in SDLMain.m that transforms documents opened from the
Finder into command-line arguments (introduced in revision 1.14,
2005-08-11) uses the methods -[NSString lengthOfBytesUsingEncoding:] and
-[NSString getCString:maxLength:encoding:], which are only available in
Mac OS X 10.4.

Compiling this code on 10.3 produces warnings, and running it (i.e.
starting an SDL application by opening a document) leads to weird
behavior which I didn't investigate in detail ("*** -[NSCFString
lengthOfBytesUsingEncoding:]: selector not recognized" is printed to the
console log, and the SDL window never opens).

The attached patch removes the offending calls and uses -[NSString
UTF8String] instead, which is available everywhere. Tested on 10.3.9,
and I see no reason why it shouldn't also work on 10.2 and 10.4.

Two further comments:

* The comment above the -[SDLMain application: openFile:] implementation
says "You need to have a CFBundleDocumentsType section in your
Info.plist to get this message, apparently." This is not the case in my
experience - it worked just fine with a hand-built bare-bones
application consisting only of Test.app/Contents/MacOS/test, without any
Info.plist (although you have to press the option and command keys for
such an application to accept a dragged file).

* I took the liberty of cleaning up another area of SDLMain.m: I changed
"CustomApplicationMain (argc, argv)" to "CustomApplicationMain (int
argc, char **argv)". This avoids the "type of `argv' defaults to `int'"
warnings, and I'm not sure if leaving out the types could cause problems
on platforms where an int and a char** aren't of the same size.

-Christian
src/main/macosx/SDLMain.m
     1.1 --- a/src/main/macosx/SDLMain.m	Sun Jan 01 23:34:06 2006 +0000
     1.2 +++ b/src/main/macosx/SDLMain.m	Sun Jan 01 23:45:52 2006 +0000
     1.3 @@ -190,7 +190,7 @@
     1.4  }
     1.5  
     1.6  /* Replacement for NSApplicationMain */
     1.7 -static void CustomApplicationMain (argc, argv)
     1.8 +static void CustomApplicationMain (int argc, char **argv)
     1.9  {
    1.10      NSAutoreleasePool	*pool = [[NSAutoreleasePool alloc] init];
    1.11      SDLMain				*sdlMain;
    1.12 @@ -251,8 +251,8 @@
    1.13      if (gCalledAppMainline)  /* app has started, ignore this document. */
    1.14          return FALSE;
    1.15  
    1.16 -    unsigned buflen = [filename lengthOfBytesUsingEncoding:NSUTF8StringEncoding] + 1;
    1.17 -    char *arg = (char *) malloc(buflen);
    1.18 +    const char *temparg = [filename UTF8String];
    1.19 +    char *arg = (char *) malloc(strlen(temparg) + 1);
    1.20      if (arg == NULL)
    1.21          return FALSE;
    1.22  
    1.23 @@ -264,15 +264,10 @@
    1.24      }
    1.25      gArgv = newargv;
    1.26  
    1.27 -    BOOL rc = [filename getCString:arg maxLength:buflen encoding:NSUTF8StringEncoding];
    1.28 -    if (!rc)
    1.29 -        free(arg);
    1.30 -    else
    1.31 -    {
    1.32 -        gArgv[gArgc++] = arg;
    1.33 -        gArgv[gArgc] = NULL;
    1.34 -    }
    1.35 -    return rc;
    1.36 +    strcpy(arg, temparg);
    1.37 +    gArgv[gArgc++] = arg;
    1.38 +    gArgv[gArgc] = NULL;
    1.39 +    return TRUE;
    1.40  }
    1.41  
    1.42