Skip to content
Permalink
Browse files

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.
  • Loading branch information
slouken committed Apr 13, 2006
1 parent 6f2afc3 commit d84771198222034c31bcf6f030b8be94ef2af457
4 BUGS
@@ -68,7 +68,7 @@ MacOS:

Not all of the keys are properly recognized on the keyboard.

MacOS X:
Mac OS X:
Depth switching for windowed mode isn't implemented yet.

Palette handling isn't implemented in windowed mode yet.
@@ -87,7 +87,7 @@ MacOS X:
cursor in the center of the window/screen. Also, mouse moved events
are not generated, and the keyboard cannot be grabbed.

MacOS X seems to have a broken pthread_cancel() implementation.
Mac OS X seems to have a broken pthread_cancel() implementation.
Actually, it just only has one cancellation point defined.
http://lists.apple.com/archives/darwin-development/2004/Jun/24/killingapthread.001.txt

@@ -26,9 +26,9 @@ Thanks to everyone who made this possible, including:

* Max Watson, Matt Slot, and Kyle for help with the MacOS Classic port

* Stan Shebs, for the initial MacOS X port
* Stan Shebs, for the initial Mac OS X port

* Eric Wing, Max Horn, and Darrell Walisser for unflagging work on the MacOS X port
* Eric Wing, Max Horn, and Darrell Walisser for unflagging work on the Mac OS X port

* Patrick Trainor, Jim Boucher, and Mike Gorchak for the QNX Neutrino port

2 README
@@ -16,7 +16,7 @@ SDL is written in C, but works with C++ natively, and has bindings to
several other languages, including Ada, C#, Eiffel, Java, Lua, ML,
Objective C, Pascal, Perl, PHP, Pike, Python, and Ruby.

The current version supports Linux, Windows, BeOS, MacOS, MacOS X,
The current version supports Linux, Windows, BeOS, MacOS, Mac OS X,
FreeBSD, OpenBSD, BSD/OS, Solaris, IRIX, and QNX. The code contains
support for Windows CE, AmigaOS, Dreamcast, Atari, NetBSD, AIX, OSF/Tru64,
RISC OS, SymbianOS, and OS/2, but these are not officially supported.
@@ -26,7 +26,7 @@ Using the Simple DirectMedia Layer with a traditional Makefile
==============================================================================

An existing autoconf/automake build system for your SDL app has good chances
to work almost unchanged on OS X. However, to produce a "real" MacOS X binary
to work almost unchanged on OS X. However, to produce a "real" Mac OS X binary
that you can distribute to users, you need to put the generated binary into a
so called "bundle", which basically is a fancy folder with a name like
"MyCoolGame.app".
2 TODO
@@ -5,7 +5,7 @@ http://bugzilla.libsdl.org/
* Add mousewheel events (new unified event architecture?)
* DirectInput joystick support needs to be implemented
* Be able to enumerate and select available audio and video drivers
* Fullscreen video mode support for MacOS X
* Fullscreen video mode support for Mac OS X
* Explicit vertical retrace wait (maybe separate from SDL_Flip?)
* Shaped windows, windows without borders
* Multiple windows, multiple display support
@@ -2363,7 +2363,7 @@ case "$host" in
SOURCES="$SOURCES $srcdir/src/loadso/macosx/*.c"
have_loadso=yes
fi
# The MacOS X platform requires special setup.
# The Mac OS X platform requires special setup.
SDLMAIN_SOURCES="$srcdir/src/main/macosx/*.m"
EXTRA_CFLAGS="$EXTRA_CFLAGS -fpascal-strings"
SDL_LIBS="-lSDLmain $SDL_LIBS"
@@ -77,7 +77,7 @@
></A
>Using OpenGL With SDL</H1
><P
>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
>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
><DIV
CLASS="SECT2"
><H2
@@ -397,7 +397,7 @@
ALIGN="LEFT"
VALIGN="TOP"
><P
>(MacOS X)</P
>(Mac OS X)</P
></TD
></TR
><TR
@@ -242,7 +242,7 @@
><P
><B
>Note: </B
>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
>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
></BLOCKQUOTE
></DIV
></DIV
@@ -147,4 +147,4 @@
#define NULL ((void *)0)
#endif
#endif /* NULL */
#endif /* ! MacOS X - breaks precompiled headers */
#endif /* ! Mac OS X - breaks precompiled headers */
@@ -93,7 +93,7 @@ static SDL_AudioDevice *Audio_CreateDevice(int devindex)
this->UnlockAudio = Mac_UnlockAudio;
this->free = Audio_DeleteDevice;

#ifdef __MACOSX__ /* MacOS X uses threaded audio, so normal thread code is okay */
#ifdef __MACOSX__ /* Mac OS X uses threaded audio, so normal thread code is okay */
this->LockAudio = NULL;
this->UnlockAudio = NULL;
#endif
@@ -106,7 +106,7 @@ AudioBootStrap SNDMGR_bootstrap = {
};

#if defined(TARGET_API_MAC_CARBON) || defined(USE_RYANS_SOUNDCODE)
/* This works correctly on MacOS X */
/* This works correctly on Mac OS X */

#pragma options align=power

@@ -21,7 +21,7 @@
*/
#include "SDL_config.h"

/* SDL joystick driver for Darwin / MacOS X, based on the IOKit HID API */
/* SDL joystick driver for Darwin / Mac OS X, based on the IOKit HID API */
/* Written 2001 by Max Horn */

#include <unistd.h>
@@ -34,7 +34,7 @@
#ifdef MACOS_10_0_4
#include <IOKit/hidsystem/IOHIDUsageTables.h>
#else
/* The header was moved here in MacOS X 10.1 */
/* The header was moved here in Mac OS X 10.1 */
#include <Kernel/IOKit/hidsystem/IOHIDUsageTables.h>
#endif
#include <IOKit/hid/IOHIDLib.h>
@@ -66,7 +66,7 @@
#define WideTo64bit(w) (*(UInt64 *) &(w))

/* LMGetTicks() is not in Carbon and TickCount() has a fair bit of overhead,
so for speed we always read lowmem directly. This is a MacOS X no-no, but
so for speed we always read lowmem directly. This is a Mac OS X no-no, but
it always work on those systems that don't have a native Time Manager (ie,
anything before MacOS 9) -- regardless whether we are in Carbon or not! */
#define MyLMGetTicks() (*(volatile UInt32 *) 0x16A)
@@ -210,7 +210,7 @@ static int Mac_HandleEvents(_THIS, int wait4it)
}

/* Check for normal event keys, but we have to scan the
actual keyboard state because on MacOS X a keydown event
actual keyboard state because on Mac OS X a keydown event
is immediately followed by a keyup event.
*/
GetKeys(keys);
@@ -573,15 +573,15 @@ void Mac_InitOSKeymap(_THIS)
MAC_keymap[MK_KP_PERIOD] = SDLK_KP_PERIOD;

#if defined(__APPLE__) && defined(__MACH__)
/* Wierd, these keys are on my iBook under MacOS X
/* Wierd, these keys are on my iBook under Mac OS X
Note that the left arrow keysym is the same as left ctrl!?
*/
MAC_keymap[MK_IBOOK_ENTER] = SDLK_KP_ENTER;
MAC_keymap[MK_IBOOK_RIGHT] = SDLK_RIGHT;
MAC_keymap[MK_IBOOK_DOWN] = SDLK_DOWN;
MAC_keymap[MK_IBOOK_UP] = SDLK_UP;
MAC_keymap[MK_IBOOK_LEFT] = SDLK_LEFT;
#endif /* MacOS X */
#endif /* Mac OS X */

/* Up there we setup a static scancode->keysym map. However, it will not
* work very well on international keyboard. Hence we now query MacOS
@@ -132,7 +132,7 @@
#define MK_KP0 0x52
#define MK_KP_PERIOD 0x41

/* Wierd, these keys are on my iBook under MacOS X */
/* Wierd, these keys are on my iBook under Mac OS X */
#define MK_IBOOK_ENTER 0x34
#define MK_IBOOK_LEFT 0x3B
#define MK_IBOOK_RIGHT 0x3C
@@ -29,7 +29,7 @@
#elif TARGET_API_MAC_CARBON && (UNIVERSAL_INTERFACES_VERSION > 0x0335)
#include <Carbon.h>
/* The fullscreen code requires the QuickTime framework, and the window
is still at the back on MacOS X, which is where this code is needed.
is still at the back on Mac OS X, which is where this code is needed.
*/
#if USE_QUICKTIME
#include <Movies.h>
@@ -133,7 +133,7 @@
#define QZ_KP0 0x52
#define QZ_KP_PERIOD 0x41

/* Wierd, these keys are on my iBook under MacOS X */
/* Wierd, these keys are on my iBook under Mac OS X */
#define QZ_IBOOK_ENTER 0x34
#define QZ_IBOOK_LEFT 0x3B
#define QZ_IBOOK_RIGHT 0x3C
@@ -175,7 +175,7 @@ int main(int argc, char *argv[])
#elif __MACOS__
"MacOS Classic"
#elif __MACOSX__
"MacOS X"
"Mac OS X"
#elif __NETBSD__
"NetBSD"
#elif __OPENBSD__

0 comments on commit d847711

Please sign in to comment.