Fixes bug #195:
authorSam Lantinga <slouken@libsdl.org>
Thu, 13 Apr 2006 13:08:26 +0000
changeset 1621f12379c41042
parent 1620 2fe5319df0e1
child 1622 5bbfc3e20e10
Fixes bug #195:
The proper name of Apple's operating system is "Mac OS X" not "MacOS X", as can
bee seen in many places, for example http://www.apple.com/macosx/). This
contrasts the naming of the old operating system, which was called "MacOS" and
today is often refered to as "MacOS Classic".

The attached patches fixes the misuse of the name "MacOS X" in both the SDL12
and sdlweb CVS modules.
BUGS
CREDITS
README
README.MacOSX
TODO
configure.in
docs/html/guidevideoopengl.html
docs/html/sdlenvvars.html
docs/html/thread.html
include/begin_code.h
src/audio/macrom/SDL_romaudio.c
src/joystick/darwin/SDL_sysjoystick.c
src/timer/macos/FastTimes.c
src/video/maccommon/SDL_macevents.c
src/video/maccommon/SDL_mackeys.h
src/video/macrom/SDL_romvideo.c
src/video/quartz/SDL_QuartzKeys.h
test/testplatform.c
     1.1 --- a/BUGS	Wed Apr 12 14:38:47 2006 +0000
     1.2 +++ b/BUGS	Thu Apr 13 13:08:26 2006 +0000
     1.3 @@ -68,7 +68,7 @@
     1.4  
     1.5  	Not all of the keys are properly recognized on the keyboard.
     1.6  
     1.7 -MacOS X:
     1.8 +Mac OS X:
     1.9  	Depth switching for windowed mode isn't implemented yet.
    1.10  	
    1.11  	Palette handling isn't implemented in windowed mode yet.
    1.12 @@ -87,7 +87,7 @@
    1.13  	cursor in the center of the window/screen.  Also, mouse moved events
    1.14  	are not generated, and the keyboard cannot be grabbed.
    1.15  
    1.16 -	MacOS X seems to have a broken pthread_cancel() implementation.
    1.17 +	Mac OS X seems to have a broken pthread_cancel() implementation.
    1.18  	Actually, it just only has one cancellation point defined.
    1.19  	http://lists.apple.com/archives/darwin-development/2004/Jun/24/killingapthread.001.txt
    1.20  
     2.1 --- a/CREDITS	Wed Apr 12 14:38:47 2006 +0000
     2.2 +++ b/CREDITS	Thu Apr 13 13:08:26 2006 +0000
     2.3 @@ -26,9 +26,9 @@
     2.4  
     2.5  * Max Watson, Matt Slot, and Kyle for help with the MacOS Classic port
     2.6  
     2.7 -* Stan Shebs, for the initial MacOS X port
     2.8 +* Stan Shebs, for the initial Mac OS X port
     2.9  
    2.10 -* Eric Wing, Max Horn, and Darrell Walisser for unflagging work on the MacOS X port
    2.11 +* Eric Wing, Max Horn, and Darrell Walisser for unflagging work on the Mac OS X port
    2.12  
    2.13  * Patrick Trainor, Jim Boucher, and Mike Gorchak for the QNX Neutrino port
    2.14  
     3.1 --- a/README	Wed Apr 12 14:38:47 2006 +0000
     3.2 +++ b/README	Thu Apr 13 13:08:26 2006 +0000
     3.3 @@ -16,7 +16,7 @@
     3.4  several other languages, including Ada, C#, Eiffel, Java, Lua, ML,
     3.5  Objective C, Pascal, Perl, PHP, Pike, Python, and Ruby.
     3.6  
     3.7 -The current version supports Linux, Windows, BeOS, MacOS, MacOS X,
     3.8 +The current version supports Linux, Windows, BeOS, MacOS, Mac OS X,
     3.9  FreeBSD, OpenBSD, BSD/OS, Solaris, IRIX, and QNX.  The code contains
    3.10  support for Windows CE, AmigaOS, Dreamcast, Atari, NetBSD, AIX, OSF/Tru64,
    3.11  RISC OS, SymbianOS, and OS/2, but these are not officially supported.
     4.1 --- a/README.MacOSX	Wed Apr 12 14:38:47 2006 +0000
     4.2 +++ b/README.MacOSX	Thu Apr 13 13:08:26 2006 +0000
     4.3 @@ -26,7 +26,7 @@
     4.4  ==============================================================================
     4.5  
     4.6  An existing autoconf/automake build system for your SDL app has good chances
     4.7 -to work almost unchanged on OS X. However, to produce a "real" MacOS X binary
     4.8 +to work almost unchanged on OS X. However, to produce a "real" Mac OS X binary
     4.9  that you can distribute to users, you need to put the generated binary into a
    4.10  so called "bundle", which basically is a fancy folder with a name like
    4.11  "MyCoolGame.app".
     5.1 --- a/TODO	Wed Apr 12 14:38:47 2006 +0000
     5.2 +++ b/TODO	Thu Apr 13 13:08:26 2006 +0000
     5.3 @@ -5,7 +5,7 @@
     5.4   * Add mousewheel events (new unified event architecture?)
     5.5   * DirectInput joystick support needs to be implemented
     5.6   * Be able to enumerate and select available audio and video drivers
     5.7 - * Fullscreen video mode support for MacOS X
     5.8 + * Fullscreen video mode support for Mac OS X
     5.9   * Explicit vertical retrace wait (maybe separate from SDL_Flip?)
    5.10   * Shaped windows, windows without borders
    5.11   * Multiple windows, multiple display support
     6.1 --- a/configure.in	Wed Apr 12 14:38:47 2006 +0000
     6.2 +++ b/configure.in	Thu Apr 13 13:08:26 2006 +0000
     6.3 @@ -2363,7 +2363,7 @@
     6.4              SOURCES="$SOURCES $srcdir/src/loadso/macosx/*.c"
     6.5              have_loadso=yes
     6.6          fi
     6.7 -        # The MacOS X platform requires special setup.
     6.8 +        # The Mac OS X platform requires special setup.
     6.9          SDLMAIN_SOURCES="$srcdir/src/main/macosx/*.m"
    6.10          EXTRA_CFLAGS="$EXTRA_CFLAGS -fpascal-strings"
    6.11          SDL_LIBS="-lSDLmain $SDL_LIBS"
     7.1 --- a/docs/html/guidevideoopengl.html	Wed Apr 12 14:38:47 2006 +0000
     7.2 +++ b/docs/html/guidevideoopengl.html	Thu Apr 13 13:08:26 2006 +0000
     7.3 @@ -77,7 +77,7 @@
     7.4  ></A
     7.5  >Using OpenGL With SDL</H1
     7.6  ><P
     7.7 ->SDL has the ability to create and use OpenGL contexts on several platforms(Linux/X11, Win32, BeOS, MacOS Classic/Toolbox, MacOS X, FreeBSD/X11 and Solaris/X11). This allows you to use SDL's audio, event handling, threads and times in your OpenGL applications (a function often performed by GLUT).</P
     7.8 +>SDL has the ability to create and use OpenGL contexts on several platforms(Linux/X11, Win32, BeOS, MacOS Classic/Toolbox, Mac OS X, FreeBSD/X11 and Solaris/X11). This allows you to use SDL's audio, event handling, threads and times in your OpenGL applications (a function often performed by GLUT).</P
     7.9  ><DIV
    7.10  CLASS="SECT2"
    7.11  ><H2
     8.1 --- a/docs/html/sdlenvvars.html	Wed Apr 12 14:38:47 2006 +0000
     8.2 +++ b/docs/html/sdlenvvars.html	Thu Apr 13 13:08:26 2006 +0000
     8.3 @@ -397,7 +397,7 @@
     8.4  ALIGN="LEFT"
     8.5  VALIGN="TOP"
     8.6  ><P
     8.7 ->(MacOS X)</P
     8.8 +>(Mac OS X)</P
     8.9  ></TD
    8.10  ></TR
    8.11  ><TR
     9.1 --- a/docs/html/thread.html	Wed Apr 12 14:38:47 2006 +0000
     9.2 +++ b/docs/html/thread.html	Thu Apr 13 13:08:26 2006 +0000
     9.3 @@ -242,7 +242,7 @@
     9.4  ><P
     9.5  ><B
     9.6  >Note: </B
     9.7 ->SDL's threading is not implemented on MacOS, due to that lack of preemptive thread support (MacOS X dos nt suffer from this problem)</P
     9.8 +>SDL's threading is not implemented on MacOS, due to that lack of preemptive thread support (Mac OS X dos nt suffer from this problem)</P
     9.9  ></BLOCKQUOTE
    9.10  ></DIV
    9.11  ></DIV
    10.1 --- a/include/begin_code.h	Wed Apr 12 14:38:47 2006 +0000
    10.2 +++ b/include/begin_code.h	Thu Apr 13 13:08:26 2006 +0000
    10.3 @@ -147,4 +147,4 @@
    10.4  #define NULL ((void *)0)
    10.5  #endif
    10.6  #endif /* NULL */
    10.7 -#endif /* ! MacOS X - breaks precompiled headers */
    10.8 +#endif /* ! Mac OS X - breaks precompiled headers */
    11.1 --- a/src/audio/macrom/SDL_romaudio.c	Wed Apr 12 14:38:47 2006 +0000
    11.2 +++ b/src/audio/macrom/SDL_romaudio.c	Thu Apr 13 13:08:26 2006 +0000
    11.3 @@ -93,7 +93,7 @@
    11.4      this->UnlockAudio = Mac_UnlockAudio;
    11.5      this->free        = Audio_DeleteDevice;
    11.6  
    11.7 -#ifdef __MACOSX__	/* MacOS X uses threaded audio, so normal thread code is okay */
    11.8 +#ifdef __MACOSX__	/* Mac OS X uses threaded audio, so normal thread code is okay */
    11.9      this->LockAudio   = NULL;
   11.10      this->UnlockAudio = NULL;
   11.11  #endif
   11.12 @@ -106,7 +106,7 @@
   11.13  };
   11.14  
   11.15  #if defined(TARGET_API_MAC_CARBON) || defined(USE_RYANS_SOUNDCODE)
   11.16 -/* This works correctly on MacOS X */
   11.17 +/* This works correctly on Mac OS X */
   11.18  
   11.19  #pragma options align=power
   11.20  
    12.1 --- a/src/joystick/darwin/SDL_sysjoystick.c	Wed Apr 12 14:38:47 2006 +0000
    12.2 +++ b/src/joystick/darwin/SDL_sysjoystick.c	Thu Apr 13 13:08:26 2006 +0000
    12.3 @@ -21,7 +21,7 @@
    12.4  */
    12.5  #include "SDL_config.h"
    12.6  
    12.7 -/* SDL joystick driver for Darwin / MacOS X, based on the IOKit HID API */
    12.8 +/* SDL joystick driver for Darwin / Mac OS X, based on the IOKit HID API */
    12.9  /* Written 2001 by Max Horn */
   12.10  
   12.11  #include <unistd.h>
   12.12 @@ -34,7 +34,7 @@
   12.13  #ifdef MACOS_10_0_4
   12.14  #include <IOKit/hidsystem/IOHIDUsageTables.h>
   12.15  #else
   12.16 -/* The header was moved here in MacOS X 10.1 */
   12.17 +/* The header was moved here in Mac OS X 10.1 */
   12.18  #include <Kernel/IOKit/hidsystem/IOHIDUsageTables.h>
   12.19  #endif
   12.20  #include <IOKit/hid/IOHIDLib.h>
    13.1 --- a/src/timer/macos/FastTimes.c	Wed Apr 12 14:38:47 2006 +0000
    13.2 +++ b/src/timer/macos/FastTimes.c	Thu Apr 13 13:08:26 2006 +0000
    13.3 @@ -66,7 +66,7 @@
    13.4  #define WideTo64bit(w)	(*(UInt64 *) &(w))
    13.5  
    13.6  /* LMGetTicks() is not in Carbon and TickCount() has a fair bit of overhead,
    13.7 -   so for speed we always read lowmem directly. This is a MacOS X no-no, but 
    13.8 +   so for speed we always read lowmem directly. This is a Mac OS X no-no, but 
    13.9     it always work on those systems that don't have a native Time Manager (ie,
   13.10     anything before MacOS 9) -- regardless whether we are in Carbon or not! */
   13.11  #define MyLMGetTicks()	(*(volatile UInt32 *) 0x16A)
    14.1 --- a/src/video/maccommon/SDL_macevents.c	Wed Apr 12 14:38:47 2006 +0000
    14.2 +++ b/src/video/maccommon/SDL_macevents.c	Thu Apr 13 13:08:26 2006 +0000
    14.3 @@ -210,7 +210,7 @@
    14.4  		}
    14.5  
    14.6  		/* Check for normal event keys, but we have to scan the
    14.7 -		   actual keyboard state because on MacOS X a keydown event
    14.8 +		   actual keyboard state because on Mac OS X a keydown event
    14.9  		   is immediately followed by a keyup event.
   14.10  		*/
   14.11  		GetKeys(keys);
   14.12 @@ -573,7 +573,7 @@
   14.13  	MAC_keymap[MK_KP_PERIOD] = SDLK_KP_PERIOD;
   14.14  
   14.15  #if defined(__APPLE__) && defined(__MACH__)
   14.16 -	/* Wierd, these keys are on my iBook under MacOS X
   14.17 +	/* Wierd, these keys are on my iBook under Mac OS X
   14.18  	   Note that the left arrow keysym is the same as left ctrl!?
   14.19  	 */
   14.20  	MAC_keymap[MK_IBOOK_ENTER] = SDLK_KP_ENTER;
   14.21 @@ -581,7 +581,7 @@
   14.22  	MAC_keymap[MK_IBOOK_DOWN] = SDLK_DOWN;
   14.23  	MAC_keymap[MK_IBOOK_UP] = SDLK_UP;
   14.24  	MAC_keymap[MK_IBOOK_LEFT] = SDLK_LEFT;
   14.25 -#endif /* MacOS X */
   14.26 +#endif /* Mac OS X */
   14.27  
   14.28  	/* Up there we setup a static scancode->keysym map. However, it will not
   14.29  	 * work very well on international keyboard. Hence we now query MacOS
    15.1 --- a/src/video/maccommon/SDL_mackeys.h	Wed Apr 12 14:38:47 2006 +0000
    15.2 +++ b/src/video/maccommon/SDL_mackeys.h	Thu Apr 13 13:08:26 2006 +0000
    15.3 @@ -132,7 +132,7 @@
    15.4  #define MK_KP0			0x52
    15.5  #define MK_KP_PERIOD		0x41
    15.6  
    15.7 -/* Wierd, these keys are on my iBook under MacOS X */
    15.8 +/* Wierd, these keys are on my iBook under Mac OS X */
    15.9  #define MK_IBOOK_ENTER		0x34
   15.10  #define MK_IBOOK_LEFT		0x3B
   15.11  #define MK_IBOOK_RIGHT		0x3C
    16.1 --- a/src/video/macrom/SDL_romvideo.c	Wed Apr 12 14:38:47 2006 +0000
    16.2 +++ b/src/video/macrom/SDL_romvideo.c	Thu Apr 13 13:08:26 2006 +0000
    16.3 @@ -29,7 +29,7 @@
    16.4  #elif TARGET_API_MAC_CARBON && (UNIVERSAL_INTERFACES_VERSION > 0x0335)
    16.5  #include <Carbon.h>
    16.6  /* The fullscreen code requires the QuickTime framework, and the window
    16.7 -   is still at the back on MacOS X, which is where this code is needed.
    16.8 +   is still at the back on Mac OS X, which is where this code is needed.
    16.9   */
   16.10  #if USE_QUICKTIME
   16.11  #include <Movies.h>
    17.1 --- a/src/video/quartz/SDL_QuartzKeys.h	Wed Apr 12 14:38:47 2006 +0000
    17.2 +++ b/src/video/quartz/SDL_QuartzKeys.h	Thu Apr 13 13:08:26 2006 +0000
    17.3 @@ -133,7 +133,7 @@
    17.4  #define QZ_KP0			0x52
    17.5  #define QZ_KP_PERIOD	0x41
    17.6  
    17.7 -/* Wierd, these keys are on my iBook under MacOS X */
    17.8 +/* Wierd, these keys are on my iBook under Mac OS X */
    17.9  #define QZ_IBOOK_ENTER		0x34
   17.10  #define QZ_IBOOK_LEFT		0x3B
   17.11  #define QZ_IBOOK_RIGHT		0x3C
    18.1 --- a/test/testplatform.c	Wed Apr 12 14:38:47 2006 +0000
    18.2 +++ b/test/testplatform.c	Thu Apr 13 13:08:26 2006 +0000
    18.3 @@ -175,7 +175,7 @@
    18.4  #elif __MACOS__
    18.5  			"MacOS Classic"
    18.6  #elif __MACOSX__
    18.7 -			"MacOS X"
    18.8 +			"Mac OS X"
    18.9  #elif __NETBSD__
   18.10  			"NetBSD"
   18.11  #elif __OPENBSD__