Mercurial > sdl-ios-xcode
view src/video/ps2gs/SDL_gsvideo.h @ 1211:304d8dd6a989
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
| author | Ryan C. Gordon <icculus@icculus.org> |
|---|---|
| date | Sun, 01 Jan 2006 23:45:52 +0000 |
| parents | e8157fcb3114 |
| children | c9b51268668f |
line wrap: on
line source
/* SDL - Simple DirectMedia Layer Copyright (C) 1997, 1998, 1999, 2000 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Sam Lantinga slouken@libsdl.org */ #ifdef SAVE_RCSID static char rcsid = "@(#) $Id$"; #endif #ifndef _SDL_gsvideo_h #define _SDL_gsvideo_h #include <sys/types.h> #include <termios.h> #include <linux/ps2/dev.h> #include <linux/ps2/gs.h> #include "SDL_mouse.h" #include "SDL_mutex.h" #include "SDL_sysvideo.h" /* Hidden "this" pointer for the video functions */ #define _THIS SDL_VideoDevice *this /* Private display data */ struct SDL_PrivateVideoData { /* Gotta love that simple PS2 graphics interface. :) */ int console_fd; int memory_fd; struct ps2_screeninfo saved_vinfo; /* Ye olde linux keyboard code */ int current_vt; int saved_vt; int keyboard_fd; int saved_kbd_mode; struct termios saved_kbd_termios; /* Ye olde linux mouse code */ int mouse_fd; int cursor_drawn; /* The memory mapped DMA area and associated variables */ caddr_t mapped_mem; int pixels_len; int mapped_len; struct ps2_image screen_image; int screen_image_size; unsigned long long *head_tags_mem; unsigned long long *image_tags_mem; unsigned long long *tex_tags_mem; unsigned long long *scale_tags_mem; int dma_pending; }; /* Old variable names */ #define console_fd (this->hidden->console_fd) #define memory_fd (this->hidden->memory_fd) #define saved_vinfo (this->hidden->saved_vinfo) #define current_vt (this->hidden->current_vt) #define saved_vt (this->hidden->saved_vt) #define keyboard_fd (this->hidden->keyboard_fd) #define saved_kbd_mode (this->hidden->saved_kbd_mode) #define saved_kbd_termios (this->hidden->saved_kbd_termios) #define mouse_fd (this->hidden->mouse_fd) #define cursor_drawn (this->hidden->cursor_drawn) #define mapped_mem (this->hidden->mapped_mem) #define pixels_len (this->hidden->pixels_len) #define mapped_len (this->hidden->mapped_len) #define screen_image (this->hidden->screen_image) #define screen_image_size (this->hidden->screen_image_size) #define head_tags_mem (this->hidden->head_tags_mem) #define image_tags_mem (this->hidden->image_tags_mem) #define tex_tags_mem (this->hidden->tex_tags_mem) #define scale_tags_mem (this->hidden->scale_tags_mem) #define dma_pending (this->hidden->dma_pending) /* Shared between the mouse and video code for screen update scaling */ extern int scaleimage_nonblock(int fd, unsigned long long *tm, unsigned long long *sm); #endif /* _SDL_gsvideo_h */