diff --git a/docs.html b/docs.html
index 924bc6751..13d20b899 100644
--- a/docs.html
+++ b/docs.html
@@ -4,9 +4,13 @@
![[separator]](docs/images/rainbow.gif)
-This source is in development. It may contain API changes, and may not be
-fully tested on all supported platforms. The current stable release may
-be found at the main SDL page.
+This source is stable, and is fully tested on all supported platforms.
+Please send bug reports or questions to the SDL mailing list:
+http://www.libsdl.org/mailing-list.php
+The latest stable release may be found on the
+ SDL website.
+
@@ -16,16 +20,62 @@ be found at the main SDL page.
Major changes since SDL 1.0.0:
- - 1.2.5: Added initial support for Dreamcast (thanks HERO!)
-
- 1.2.5: Updated Borland projects for Kylix 3 (thanks Dominique)
-
- 1.2.5: Added project files for embedded Visual C++ 4.0
-
- 1.2.5: Added SDL_BUTTON_WHEELUP (4) and SDL_BUTTON_WHEELDOWN (5)
-
- 1.2.5: Added SDL_GL_STEREO for stereoscopic OpenGL contexts
-
- 1.2.5: Fixed VidMode error when running on XFree86 3.3
-
- 1.2.5: Added initial support for PicoGUI (thanks Micah!)
-
- 1.2.5: Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
-
- 1.2.5: Fixed setting OpenGL mode multiple times on Windows
-
- 1.2.5: Added support for Qtopia on embedded systems (thanks David!)
+
- 1.2.5: Added an environment variable SDL_HAS3BUTTONMOUSE for Quartz
+
- 1.2.5: Added initial support for Dreamcast (thanks HERO!)
+
- 1.2.5: Implemented resizing Cocoa windows (thanks Darrell!)
+
- 1.2.5: Updated Quartz video code for MacOS X 10.2 (thanks Darrell!)
+
- 1.2.5: Added an environment variable SDL_VIDEO_WINDOW_POS for X11
+
- 1.2.5: Fixed mouse focus problems caused by X11 'unclutter' hack
+
- 1.2.5: Applied John's fix for left-handed mice under Windows.
+
- 1.2.5: Gamepads and other HID devices should work under MacOS X
+
- 1.2.5: Fixed missing cursor after shadow buffer flip (thanks Jan!)
+
- 1.2.5: Updated MacOS projects with "enums as int" build option
+
- 1.2.5: Added -benchmark flag to testvidinfo for testing video speed
+
- 1.2.5: Added accelerated YUV code to DirectFB driver (thanks Denis!)
+
- 1.2.5: Command line apps on MacOS X go to forground (thanks Max!)
+
- 1.2.5: Fixed aRts runtime sound daemon detection
+
- 1.2.5: Improved the Nano-X video support (thanks Greg!)
+
- 1.2.5: Updated Borland projects for Kylix 3 (thanks Dominique)
+
- 1.2.5: Added compile-time checking for the size of enums
+
- 1.2.5: Fixed offset bug in hardware accelerated fills and blits
+
- 1.2.5: Fixed serious bugs in BSD HID joystick code (thanks Krister!)
+
- 1.2.5: Added project files for embedded Visual C++ 4.0
+
- 1.2.5: Added SDL_BUTTON_WHEELUP (4) and SDL_BUTTON_WHEELDOWN (5)
+
- 1.2.5: Added SDL_GL_STEREO for stereoscopic OpenGL contexts
+
- 1.2.5: Added the environment variable SDL_VIDEO_X11_WMCLASS
+
- 1.2.5: Fullscreen windows are always topmost in Windows
+
- 1.2.5: Fixed mouse grab going fullscreen to windowed in Windows
+
- 1.2.5: Fixed VidMode error when running on XFree86 3.3
+
- 1.2.5: Fixed Quartz mouse motion and window centering bugs
+
- 1.2.5: Updated configure.in for automake 1.6.2
+
- 1.2.5: Fixed building Windows DLL with latest native Cygwin tools
+
- 1.2.5: Added a way to get the Windows OpenGL context in SDL_syswm.h
+
- 1.2.5: Removed DDFLIP_WAIT flag from DirectX flip for performance
+
- 1.2.5: Zeroed SDL_Surface::unused1 so glSDL will work on stock SDL
+
- 1.2.5: Only modifier key state is noted when X11 window opens
+
- 1.2.5: Added initial support for PicoGUI (thanks Micah!)
+
- 1.2.5: Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
+
- 1.2.5: Added pthread detection for HP-UX 11.X
+
- 1.2.5: SDL_Init(SDL_INIT_JOYSTICK) on MacOS X works with no joystick
+
- 1.2.5: Fixed DirectX software surface memory leak
+
- 1.2.5: Fixed video initialization crash on Windows CE
+
- 1.2.5: Updated the QNX audio code for QNX 6.2 (thanks Travis!)
+
- 1.2.5: Fixed building with pthread and pth support on UNIX
+
- 1.2.5: Added detection of several joysticks to Linux code
+
- 1.2.5: Fixed thread detection and joystick code for NetBSD
+
- 1.2.5: Added support for audio in the Atari port (thanks Patrice!)
+
- 1.2.5: Added check for ENOMEDIUM to the Linux CDROM code
+
- 1.2.5: Added YUV hardware acceleration on MacOS X (thanks Darrell!)
+
- 1.2.5: Fixed building shared libraries on MacOS X (thanks Max!)
+
- 1.2.5: Use secondary audio buffers in DirectSound by default
+
- 1.2.5: Fixed window tab on Windows taskbar after application quit
+
- 1.2.5: Fixed setting OpenGL mode multiple times on Windows
+
- 1.2.5: Added Zaurus PDA (Qtopia) support by David Hedbor
+
- 1.2.5: Removed README.OpenBSD - SDL works out of the box on OpenBSD
+
- 1.2.5: Fixed crash in QZ_SetCaption() (thanks Darrell)
+
- 1.2.5: Updated ALSA audio support for ALSA 0.9
+
- 1.2.5: Don't build RPM archives with ALSA library dependencies
+
- 1.2.5: SDL_PollEvent()/SDL_WaitEvent() return values now match docs
- 1.2.4: Added initial support for Atari (thanks Patrice!)
- 1.2.4: Added support for building SDL for EPOC/SymbianOS 6.0
- 1.2.4: SDL now compiles and works cleanly on stock BSDI
diff --git a/src/video/quartz/SDL_QuartzEvents.m b/src/video/quartz/SDL_QuartzEvents.m
index 560209dcb..b34882ddd 100644
--- a/src/video/quartz/SDL_QuartzEvents.m
+++ b/src/video/quartz/SDL_QuartzEvents.m
@@ -19,6 +19,7 @@
Sam Lantinga
slouken@libsdl.org
*/
+#include // For getenv()
#include "SDL_QuartzKeys.h"
static void QZ_InitOSKeymap (_THIS) {
@@ -364,16 +365,20 @@ static void QZ_PumpEvents (_THIS)
switch (type) {
case NSLeftMouseDown:
- if ( NSCommandKeyMask & current_mods ) {
- last_virtual_button = 3;
- DO_MOUSE_DOWN (3, 0);
- }
- else if ( NSAlternateKeyMask & current_mods ) {
- last_virtual_button = 2;
- DO_MOUSE_DOWN (2, 0);
- }
- else {
+ if ( getenv("SDL_HAS3BUTTONMOUSE") ) {
DO_MOUSE_DOWN (1, 1);
+ } else {
+ if ( NSCommandKeyMask & current_mods ) {
+ last_virtual_button = 3;
+ DO_MOUSE_DOWN (3, 0);
+ }
+ else if ( NSAlternateKeyMask & current_mods ) {
+ last_virtual_button = 2;
+ DO_MOUSE_DOWN (2, 0);
+ }
+ else {
+ DO_MOUSE_DOWN (1, 1);
+ }
}
break;
case NSOtherMouseDown: DO_MOUSE_DOWN (2, 0); break;