The Mac OS X Cocoa video driver is under construction...

Note that SDLmain is no longer necessary on Mac OS X. :)

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401976

configure.in

@@ -1046,36 +1046,11 @@ CheckBWINDOW()
     fi
 }
 
-dnl Set up the Carbon/QuickDraw video driver for Mac OS X (but not Darwin)
-CheckCARBON()
-{
-    AC_ARG_ENABLE(video-carbon,
-AC_HELP_STRING([--enable-video-carbon], [use Carbon/QuickDraw video driver [[default=no]]]),
-                  , enable_video_carbon=no)
-    if test x$enable_video = xyes -a x$enable_video_carbon = xyes; then
-        AC_MSG_CHECKING(for Carbon framework)
-        have_carbon=no
-        AC_TRY_COMPILE([
-          #include <Carbon/Carbon.h>
-        ],[
-        ],[
-        have_carbon=yes
-        ])
-        AC_MSG_RESULT($have_carbon)
-        if test x$have_carbon = xyes; then
-            AC_DEFINE(SDL_VIDEO_DRIVER_TOOLBOX)
-            SOURCES="$SOURCES $srcdir/src/video/maccommon/*.c"
-            SOURCES="$SOURCES $srcdir/src/video/macrom/*.c"
-            have_video=yes
-        fi
-    fi
-}
-
-dnl Set up the Cocoa/Quartz video driver for Mac OS X (but not Darwin)
+dnl Set up the Cocoa video driver for Mac OS X (but not Darwin)
 CheckCOCOA()
 {
     AC_ARG_ENABLE(video-cocoa,
-AC_HELP_STRING([--enable-video-cocoa], [use Cocoa/Quartz video driver [[default=yes]]]),
+AC_HELP_STRING([--enable-video-cocoa], [use Cocoa video driver [[default=yes]]]),
                   , enable_video_cocoa=yes)
     if test x$enable_video = xyes -a x$enable_video_cocoa = xyes; then
         save_CFLAGS="$CFLAGS"
@@ -1092,8 +1067,8 @@ AC_HELP_STRING([--enable-video-cocoa], [use Cocoa/Quartz video driver [[default=
         AC_MSG_RESULT($have_cocoa)
         CFLAGS="$save_CFLAGS"
         if test x$have_cocoa = xyes; then
-            AC_DEFINE(SDL_VIDEO_DRIVER_QUARTZ)
-            SOURCES="$SOURCES $srcdir/src/video/quartz/*.m"
+            AC_DEFINE(SDL_VIDEO_DRIVER_COCOA)
+            SOURCES="$SOURCES $srcdir/src/video/cocoa/*.m"
             have_video=yes
         fi
     fi
@@ -1526,9 +1501,6 @@ CheckMacGL()
                 if test x$enable_video_cocoa = xyes; then
                     EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,OpenGL"
                 fi
-                if test x$enable_video_carbon = xyes; then
-                    EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,AGL"
-                fi
         esac
     fi
 }
@@ -2453,7 +2425,6 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau
         fi
 
         CheckCOCOA
-        CheckCARBON
         CheckX11
         CheckMacGL
         CheckOpenGLX11
@@ -2492,11 +2463,9 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau
             have_timers=yes
         fi
         # The Mac OS X platform requires special setup.
-        SDLMAIN_SOURCES="$srcdir/src/main/macosx/*.m"
         EXTRA_CFLAGS="$EXTRA_CFLAGS -fpascal-strings"
         EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,Cocoa"
         EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,Carbon"
-        SDL_LIBS="-lSDLmain $SDL_LIBS"
         # If either the audio or CD driver is used, add the AudioUnit framework
         if test x$enable_audio = xyes -o x$enable_cdrom = xyes; then
             EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,AudioToolbox -Wl,-framework,AudioUnit"
@@ -2623,7 +2592,6 @@ OBJECTS=`echo $OBJECTS | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'`
 OBJECTS=`echo $OBJECTS | sed 's,[[^ ]]*/\([[^ ]]*\)\.S,$(objects)/\1.lo,g'`
 
 SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES | sed 's,[[^ ]]*/\([[^ ]]*\)\.cc,$(objects)/\1.o,g'`
-SDLMAIN_OBJECTS=`echo $SDLMAIN_OBJECTS | sed 's,[[^ ]]*/\([[^ ]]*\)\.m,$(objects)/\1.o,g'`
 SDLMAIN_OBJECTS=`echo $SDLMAIN_OBJECTS | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.o,g'`
 
 # Set runtime shared library paths as needed
@@ -2642,12 +2610,8 @@ fi
 case "$ARCH" in
   macosx)
     SDL_LIBS="$SDL_LIBS -Wl,-framework,Cocoa"
-    # Is this still needed?
-    #if test x$enable_video = xyes -a x$enable_video_carbon = xyes; then
-    #  SDL_LIBS="$SDL_LIBS -Wl,-framework,Carbon"
-    #fi
     # Evil hack to allow static linking on Mac OS X
-    SDL_STATIC_LIBS="\${exec_prefix}/lib/libSDLmain.a \${exec_prefix}/lib/libSDL.a $EXTRA_LDFLAGS"
+    SDL_STATIC_LIBS="\${exec_prefix}/lib/libSDL.a $EXTRA_LDFLAGS"
     ;;
   *)
     SDL_STATIC_LIBS="$SDL_LIBS"

include/SDL_config.h.in

@@ -251,6 +251,7 @@
 /* Enable various video drivers */
 #undef SDL_VIDEO_DRIVER_AALIB
 #undef SDL_VIDEO_DRIVER_BWINDOW
+#undef SDL_VIDEO_DRIVER_COCOA
 #undef SDL_VIDEO_DRIVER_CYBERGRAPHICS
 #undef SDL_VIDEO_DRIVER_DC
 #undef SDL_VIDEO_DRIVER_DGA
@@ -270,7 +271,6 @@
 #undef SDL_VIDEO_DRIVER_PICOGUI
 #undef SDL_VIDEO_DRIVER_PS2GS
 #undef SDL_VIDEO_DRIVER_QTOPIA
-#undef SDL_VIDEO_DRIVER_QUARTZ
 #undef SDL_VIDEO_DRIVER_RISCOS
 #undef SDL_VIDEO_DRIVER_SVGALIB
 #undef SDL_VIDEO_DRIVER_TOOLBOX

include/SDL_config_macosx.h

@@ -113,12 +113,8 @@
 #define SDL_TIMER_UNIX	1
 
 /* Enable various video drivers */
+#define SDL_VIDEO_DRIVER_COCOA	1
 #define SDL_VIDEO_DRIVER_DUMMY	1
-#if TARGET_API_MAC_CARBON
-#define SDL_VIDEO_DRIVER_TOOLBOX	1
-#else
-#define SDL_VIDEO_DRIVER_QUARTZ	1
-#endif
 
 /* Enable OpenGL support */
 #define SDL_VIDEO_OPENGL	1

include/SDL_main.h

@@ -25,11 +25,11 @@
 
 #include "SDL_stdinc.h"
 
-/* Redefine main() on Win32 and MacOS so that it is called by winmain.c */
+/* Redefine main() on some platforms so that it is called by SDL */
 
 #if defined(__WIN32__) || \
     (defined(__MWERKS__) && !defined(__BEOS__)) || \
-    defined(__MACOS__) || defined(__MACOSX__) || \
+    defined(__MACOS__) || \
     defined(__SYMBIAN32__) || defined(QWS)
 
 #ifdef __cplusplus

src/main/macosx/Info.plist.in

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
-<plist version="0.9">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>@EXECUTABLE_NAME@</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>@PACKAGE@</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>@VERSION@</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>NSMainNibFile</key>
-	<string>SDLMain.nib</string>
-	<key>NSPrincipalClass</key>
-	<string>NSApplication</string>
-</dict>
-</plist>

src/main/macosx/SDLMain.h

-/*   SDLMain.m - main entry point for our Cocoa-ized SDL app
-       Initial Version: Darrell Walisser <dwaliss1@purdue.edu>
-       Non-NIB-Code & other changes: Max Horn <max@quendi.de>
-
-    Feel free to customize this file to suit your needs
-*/
-
-#import <Cocoa/Cocoa.h>
-
-@ interface SDLMain:NSObject @ end
-/* vi: set ts=4 sw=4 expandtab: */

src/main/macosx/SDLMain.nib/classes.nib

-{
-    IBClasses = (
-        {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
-        {
-            ACTIONS = {makeFullscreen = id; quit = id; }; 
-            CLASS = SDLMain; 
-            LANGUAGE = ObjC; 
-            SUPERCLASS = NSObject; 
-        }
-    ); 
-    IBVersion = 1; 
-}

src/main/macosx/SDLMain.nib/info.nib

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
-<plist version="0.9">
-<dict>
-	<key>IBDocumentLocation</key>
-	<string>49 97 356 240 0 0 987 746 </string>
-	<key>IBMainMenuLocation</key>
-	<string>20 515 195 44 0 46 800 532 </string>
-	<key>IBUserGuides</key>
-	<dict/>
-</dict>
-</plist>

src/main/macosx/info.nib

-// This is just a stub file to force automake to create the install directory

src/video/SDL_sysvideo.h

@@ -296,8 +296,8 @@ typedef struct VideoBootStrap
     SDL_VideoDevice *(*create) (int devindex);
 } VideoBootStrap;
 
-#if SDL_VIDEO_DRIVER_QUARTZ
-extern VideoBootStrap QZ_bootstrap;
+#if SDL_VIDEO_DRIVER_COCOA
+extern VideoBootStrap COCOA_bootstrap;
 #endif
 #if SDL_VIDEO_DRIVER_X11
 extern VideoBootStrap X11_bootstrap;

src/video/SDL_video.c

@@ -43,8 +43,8 @@
 
 /* Available video drivers */
 static VideoBootStrap *bootstrap[] = {
-#if SDL_VIDEO_DRIVER_QUARTZ
-    &QZ_bootstrap,
+#if SDL_VIDEO_DRIVER_COCOA
+    &COCOA_bootstrap,
 #endif
 #if SDL_VIDEO_DRIVER_X11
     &X11_bootstrap,

src/video/quartz/SDL_QuartzWindow.h → src/video/cocoa/SDL_cocoaevents.h

 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2003  Sam Lantinga
+    Copyright (C) 1997-2006 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
+    modify it under the terms of the GNU Lesser General Public
     License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
+    version 2.1 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.
+    Lesser 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
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
     Sam Lantinga
     slouken@libsdl.org
 */
 #include "SDL_config.h"
 
-/* Subclass of NSWindow to fix genie effect and support resize events  */
-@ interface SDL_QuartzWindow: NSWindow - (void) miniaturize:(id) sender;
--(void) display;
--(void) setFrame:(NSRect)
-     frameRect display:(BOOL) flag;
--(void) appDidHide:(NSNotification *) note;
--(void) appWillUnhide:(NSNotification *) note;
--(void) appDidUnhide:(NSNotification *) note;
--(id) initWithContentRect:(NSRect)
-     contentRect styleMask:(unsigned int)
-     styleMask backing:(NSBackingStoreType)
-     backingType defer:(BOOL) flag;
-@end
-/* Delegate for our NSWindow to send SDLQuit() on close */
-@ interface SDL_QuartzWindowDelegate: NSObject - (BOOL) windowShouldClose:(id)
-    sender;
-@end
+#ifndef _SDL_cocoaevents_h
+#define _SDL_cocoaevents_h
+
+extern void Cocoa_RegisterApp(void);
+extern void Cocoa_PumpEvents(_THIS);
+
+#endif /* _SDL_cocoaevents_h */
+
 /* vi: set ts=4 sw=4 expandtab: */

src/video/cocoa/SDL_cocoaevents.m

+/*
+    SDL - Simple DirectMedia Layer
+    Copyright (C) 1997-2006 Sam Lantinga
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+    Sam Lantinga
+    slouken@libsdl.org
+*/
+#include "SDL_config.h"
+
+#include "SDL_cocoavideo.h"
+
+/* setAppleMenu disappeared from the headers in 10.4 */
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
+@interface NSApplication(NSAppleMenu)
+- (void)setAppleMenu:(NSMenu *)menu;
+@end
+#endif
+
+@interface SDLApplication : NSApplication
+{
+}
+- (void)finishLaunching;
+@end
+
+@implementation SDLApplication
+
+- (void)finishLaunching
+{
+    [super finishLaunching];
+    _running = 1;
+}
+
+@end
+
+static NSString *
+GetApplicationName(void)
+{
+    NSDictionary *dict;
+    NSString *appName = 0;
+
+    /* Determine the application name */
+    dict = (NSDictionary *)CFBundleGetInfoDictionary(CFBundleGetMainBundle());
+    if (dict)
+        appName = [dict objectForKey: @"CFBundleName"];
+    
+    if (![appName length])
+        appName = [[NSProcessInfo processInfo] processName];
+
+    return appName;
+}
+
+static void
+CreateApplicationMenus(void)
+{
+    NSString *appName;
+    NSString *title;
+    NSMenu *appleMenu;
+    NSMenu *windowMenu;
+    NSMenuItem *menuItem;
+    
+    /* Create the main menu bar */
+    [NSApp setMainMenu:[[NSMenu alloc] init]];
+
+    /* Create the application menu */
+    appName = GetApplicationName();
+    appleMenu = [[NSMenu alloc] initWithTitle:@""];
+    
+    /* Add menu items */
+    title = [@"About " stringByAppendingString:appName];
+    [appleMenu addItemWithTitle:title action:@selector(orderFrontStandardAboutPanel:) keyEquivalent:@""];
+
+    [appleMenu addItem:[NSMenuItem separatorItem]];
+
+    title = [@"Hide " stringByAppendingString:appName];
+    [appleMenu addItemWithTitle:title action:@selector(hide:) keyEquivalent:@"h"];
+
+    menuItem = (NSMenuItem *)[appleMenu addItemWithTitle:@"Hide Others" action:@selector(hideOtherApplications:) keyEquivalent:@"h"];
+    [menuItem setKeyEquivalentModifierMask:(NSAlternateKeyMask|NSCommandKeyMask)];
+
+    [appleMenu addItemWithTitle:@"Show All" action:@selector(unhideAllApplications:) keyEquivalent:@""];
+
+    [appleMenu addItem:[NSMenuItem separatorItem]];
+
+    title = [@"Quit " stringByAppendingString:appName];
+    [appleMenu addItemWithTitle:title action:@selector(terminate:) keyEquivalent:@"q"];
+    
+    /* Put menu into the menubar */
+    menuItem = [[NSMenuItem alloc] initWithTitle:@"" action:nil keyEquivalent:@""];
+    [menuItem setSubmenu:appleMenu];
+    [[NSApp mainMenu] addItem:menuItem];
+    [menuItem release];
+
+    /* Tell the application object that this is now the application menu */
+    [NSApp setAppleMenu:appleMenu];
+    [appleMenu release];
+
+
+    /* Create the window menu */
+    windowMenu = [[NSMenu alloc] initWithTitle:@"Window"];
+    
+    /* "Minimize" item */
+    menuItem = [[NSMenuItem alloc] initWithTitle:@"Minimize" action:@selector(performMiniaturize:) keyEquivalent:@"m"];
+    [windowMenu addItem:menuItem];
+    [menuItem release];
+    
+    /* Put menu into the menubar */
+    menuItem = [[NSMenuItem alloc] initWithTitle:@"Window" action:nil keyEquivalent:@""];
+    [menuItem setSubmenu:windowMenu];
+    [[NSApp mainMenu] addItem:menuItem];
+    [menuItem release];
+    
+    /* Tell the application object that this is now the window menu */
+    [NSApp setWindowsMenu:windowMenu];
+    [windowMenu release];
+}
+
+void
+Cocoa_RegisterApp(void)
+{
+    ProcessSerialNumber psn;
+    NSAutoreleasePool *pool;
+
+    if (!GetCurrentProcess(&psn)) {
+        TransformProcessType(&psn, kProcessTransformToForegroundApplication);
+        SetFrontProcess(&psn);
+    }
+
+    pool = [[NSAutoreleasePool alloc] init];
+    if (NSApp == nil) {
+        [SDLApplication sharedApplication];
+
+        if ([NSApp mainMenu] == nil) {
+            CreateApplicationMenus();
+        }
+        [NSApp finishLaunching];
+    }
+    [pool release];
+}
+
+void
+Cocoa_PumpEvents(_THIS)
+{
+    NSAutoreleasePool *pool;
+
+    pool = [[NSAutoreleasePool alloc] init];
+    for ( ; [NSApp isRunning]; ) {
+        NSEvent *event = [NSApp nextEventMatchingMask:NSAnyEventMask untilDate:[NSDate distantPast] inMode:NSDefaultRunLoopMode dequeue:YES ];
+        if ( event == nil ) {
+            break;
+        }
+        [NSApp sendEvent:event];
+    }
+    [pool release];
+}
+
+/* vi: set ts=4 sw=4 expandtab: */

src/video/cocoa/SDL_cocoakeyboard.h

+/*
+    SDL - Simple DirectMedia Layer
+    Copyright (C) 1997-2006 Sam Lantinga
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+    Sam Lantinga
+    slouken@libsdl.org
+*/
+#include "SDL_config.h"
+
+#ifndef _SDL_cocoakeyboard_h
+#define _SDL_cocoakeyboard_h
+
+extern void Cocoa_InitKeyboard(_THIS);
+extern void Cocoa_QuitKeyboard(_THIS);
+
+#endif /* _SDL_cocoakeyboard_h */
+
+/* vi: set ts=4 sw=4 expandtab: */

src/video/cocoa/SDL_cocoakeyboard.m

+/*
+    SDL - Simple DirectMedia Layer
+    Copyright (C) 1997-2006 Sam Lantinga
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+    Sam Lantinga
+    slouken@libsdl.org
+*/
+#include "SDL_config.h"
+
+#include "SDL_cocoavideo.h"
+
+#include "../../events/SDL_keyboard_c.h"
+
+void
+Cocoa_InitKeyboard(_THIS)
+{
+    SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
+    SDL_Keyboard keyboard;
+
+    SDL_zero(keyboard);
+    data->keyboard = SDL_AddKeyboard(&keyboard, -1);
+}
+
+void
+Cocoa_QuitKeyboard(_THIS)
+{
+    SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
+
+    SDL_DelKeyboard(data->keyboard);
+}
+
+/* vi: set ts=4 sw=4 expandtab: */

src/video/cocoa/SDL_cocoamodes.h

+/*
+    SDL - Simple DirectMedia Layer
+    Copyright (C) 1997-2006 Sam Lantinga
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+    Sam Lantinga
+    slouken@libsdl.org
+*/
+#include "SDL_config.h"
+
+#ifndef _SDL_cocoamodes_h
+#define _SDL_cocoamodes_h
+
+extern void Cocoa_InitModes(_THIS);
+extern void Cocoa_GetDisplayModes(_THIS);
+extern int Cocoa_SetDisplayMode(_THIS, SDL_DisplayMode * mode);
+extern void Cocoa_QuitModes(_THIS);
+
+#endif /* _SDL_cocoamodes_h */
+
+/* vi: set ts=4 sw=4 expandtab: */

src/video/cocoa/SDL_cocoamodes.m

+/*
+    SDL - Simple DirectMedia Layer
+    Copyright (C) 1997-2006 Sam Lantinga
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+    Sam Lantinga
+    slouken@libsdl.org
+*/
+#include "SDL_config.h"
+
+#include "SDL_cocoavideo.h"
+
+
+void
+Cocoa_InitModes(_THIS)
+{
+    SDL_VideoDisplay display;
+    SDL_DisplayMode mode;
+
+    SDL_zero(display);
+    SDL_zero(mode);
+    display.desktop_mode = mode;
+    display.current_mode = mode;
+    SDL_AddVideoDisplay(&display);
+}
+
+void
+Cocoa_GetDisplayModes(_THIS)
+{
+}
+
+int
+Cocoa_SetDisplayMode(_THIS, SDL_DisplayMode * mode)
+{
+    return -1;
+}
+
+void
+Cocoa_QuitModes(_THIS)
+{
+}
+
+/* vi: set ts=4 sw=4 expandtab: */

src/video/cocoa/SDL_cocoamouse.h

+/*
+    SDL - Simple DirectMedia Layer
+    Copyright (C) 1997-2006 Sam Lantinga
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+    Sam Lantinga
+    slouken@libsdl.org
+*/
+#include "SDL_config.h"
+
+#ifndef _SDL_cocoamouse_h
+#define _SDL_cocoamouse_h
+
+extern void Cocoa_InitMouse(_THIS);
+extern void Cocoa_QuitMouse(_THIS);
+
+#endif /* _SDL_cocoamouse_h */
+
+/* vi: set ts=4 sw=4 expandtab: */

src/video/cocoa/SDL_cocoamouse.m

+/*
+    SDL - Simple DirectMedia Layer
+    Copyright (C) 1997-2006 Sam Lantinga
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+    Sam Lantinga
+    slouken@libsdl.org
+*/
+#include "SDL_config.h"
+
+#include "SDL_cocoavideo.h"
+
+#include "../../events/SDL_mouse_c.h"
+
+void
+Cocoa_InitMouse(_THIS)
+{
+    SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
+    SDL_Mouse mouse;
+
+    SDL_zero(mouse);
+    data->mouse = SDL_AddMouse(&mouse, -1);
+}
+
+void
+Cocoa_QuitMouse(_THIS)
+{
+    SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
+
+    SDL_DelMouse(data->mouse);
+}
+
+/* vi: set ts=4 sw=4 expandtab: */

src/video/cocoa/SDL_cocoavideo.h

+/*
+    SDL - Simple DirectMedia Layer
+    Copyright (C) 1997-2006 Sam Lantinga
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+    Sam Lantinga
+    slouken@libsdl.org
+*/
+#include "SDL_config.h"
+
+#ifndef _SDL_cocoavideo_h
+#define _SDL_cocoavideo_h
+
+#include <Cocoa/Cocoa.h>
+
+#include "../SDL_sysvideo.h"
+
+#include "SDL_cocoaevents.h"
+#include "SDL_cocoakeyboard.h"
+#include "SDL_cocoamodes.h"
+#include "SDL_cocoamouse.h"
+/*
+#include "SDL_cocoaopengl.h"
+#include "SDL_cocoawindow.h"
+*/
+
+/* Private display data */
+
+typedef struct SDL_VideoData
+{
+    int mouse;
+    int keyboard;
+} SDL_VideoData;
+
+#endif /* _SDL_cocoavideo_h */
+
+/* vi: set ts=4 sw=4 expandtab: */

src/video/cocoa/SDL_cocoavideo.m

+/*
+    SDL - Simple DirectMedia Layer
+    Copyright (C) 1997-2006 Sam Lantinga
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+    Sam Lantinga
+    slouken@libsdl.org
+*/
+#include "SDL_config.h"
+
+#include "SDL_cocoavideo.h"
+
+/* Initialization/Query functions */
+static int Cocoa_VideoInit(_THIS);
+static void Cocoa_VideoQuit(_THIS);
+
+/* Cocoa driver bootstrap functions */
+
+static int
+Cocoa_Available(void)
+{
+    return (1);
+}
+
+static void
+Cocoa_DeleteDevice(SDL_VideoDevice * device)
+{
+    SDL_VideoData *data = (SDL_VideoData *) device->driverdata;
+
+    SDL_free(device->driverdata);
+    SDL_free(device);
+}
+
+static SDL_VideoDevice *
+Cocoa_CreateDevice(int devindex)
+{
+    SDL_VideoDevice *device;
+    SDL_VideoData *data;
+
+    Cocoa_RegisterApp();
+
+    /* Initialize all variables that we clean on shutdown */
+    device = (SDL_VideoDevice *) SDL_calloc(1, sizeof(SDL_VideoDevice));
+    if (device) {
+        data = (struct SDL_VideoData *) SDL_calloc(1, sizeof(SDL_VideoData));
+    }
+    if (!device || !data) {
+        SDL_OutOfMemory();
+        if (device) {
+            SDL_free(device);
+        }
+        return NULL;
+    }
+    device->driverdata = data;
+
+    /* Set the function pointers */
+    device->VideoInit = Cocoa_VideoInit;
+    device->VideoQuit = Cocoa_VideoQuit;
+    device->GetDisplayModes = Cocoa_GetDisplayModes;
+    device->SetDisplayMode = Cocoa_SetDisplayMode;
+    device->PumpEvents = Cocoa_PumpEvents;
+
+    /*
+    device->CreateWindow = Cocoa_CreateWindow;
+    device->CreateWindowFrom = Cocoa_CreateWindowFrom;
+    device->SetWindowTitle = Cocoa_SetWindowTitle;
+    device->SetWindowPosition = Cocoa_SetWindowPosition;
+    device->SetWindowSize = Cocoa_SetWindowSize;
+    device->ShowWindow = Cocoa_ShowWindow;
+    device->HideWindow = Cocoa_HideWindow;
+    device->RaiseWindow = Cocoa_RaiseWindow;
+    device->MaximizeWindow = Cocoa_MaximizeWindow;
+    device->MinimizeWindow = Cocoa_MinimizeWindow;
+    device->RestoreWindow = Cocoa_RestoreWindow;
+    device->SetWindowGrab = Cocoa_SetWindowGrab;
+    device->DestroyWindow = Cocoa_DestroyWindow;
+    device->GetWindowWMInfo = Cocoa_GetWindowWMInfo;
+#ifdef SDL_VIDEO_OPENGL
+    device->GL_LoadLibrary = Cocoa_GL_LoadLibrary;
+    device->GL_GetProcAddress = Cocoa_GL_GetProcAddress;
+    device->GL_GetWindowAttribute = Cocoa_GL_GetWindowAttribute;
+    device->GL_CreateContext = Cocoa_GL_CreateContext;
+    device->GL_MakeCurrent = Cocoa_GL_MakeCurrent;
+    device->GL_SetSwapInterval = Cocoa_GL_SetSwapInterval;
+    device->GL_GetSwapInterval = Cocoa_GL_GetSwapInterval;
+    device->GL_SwapWindow = Cocoa_GL_SwapWindow;
+    device->GL_DeleteContext = Cocoa_GL_DeleteContext;
+#endif
+    */
+
+    device->free = Cocoa_DeleteDevice;
+
+    return device;
+}
+
+VideoBootStrap COCOA_bootstrap = {
+    "cocoa", "SDL Cocoa video driver",
+    Cocoa_Available, Cocoa_CreateDevice
+};
+
+
+int
+Cocoa_VideoInit(_THIS)
+{
+    Cocoa_InitModes(_this);
+    Cocoa_InitKeyboard(_this);
+    Cocoa_InitMouse(_this);
+    return 0;
+}
+
+void
+Cocoa_VideoQuit(_THIS)
+{
+    Cocoa_QuitModes(_this);
+    Cocoa_QuitKeyboard(_this);
+    Cocoa_QuitMouse(_this);
+}
+
+/* vim: set ts=4 sw=4 expandtab: */

src/video/quartz/CGS.h

-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2003  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
-*/
-#include "SDL_config.h"
-
-/* 
-    Obscuring code: maximum number of windows above ours (inclusive) 
-    
-    Note: this doesn't work too well in practice and should be
-    phased out when we add OpenGL 2D acceleration. It was never
-    enabled in the first place, so this shouldn't be a problem ;-)
-*/
-#define kMaxWindows 256
-
-/* Some of the Core Graphics Server API for obscuring code */
-#define kCGSWindowLevelTop          2147483632
-#define kCGSWindowLevelDockIconDrag 500
-#define kCGSWindowLevelDockMenu     101
-#define kCGSWindowLevelMenuIgnore    21
-#define kCGSWindowLevelMenu          20
-#define kCGSWindowLevelDockLabel     12
-#define kCGSWindowLevelDockIcon      11
-#define kCGSWindowLevelDock          10
-#define kCGSWindowLevelUtility        3
-#define kCGSWindowLevelNormal         0
-
-/* 
-    For completeness; We never use these window levels, they are always below us
-    #define kCGSWindowLevelMBarShadow -20
-    #define kCGSWindowLevelDesktopPicture -2147483647
-    #define kCGSWindowLevelDesktop        -2147483648
-*/
-
-typedef CGError CGSError;
-typedef long CGSWindowCount;
-typedef void *CGSConnectionID;
-typedef int CGSWindowID;
-typedef CGSWindowID *CGSWindowIDList;
-typedef CGWindowLevel CGSWindowLevel;
-typedef NSRect CGSRect;
-
-extern CGSConnectionID _CGSDefaultConnection();
-
-extern CGSError CGSGetOnScreenWindowList(CGSConnectionID cid,
-                                         CGSConnectionID owner,
-                                         CGSWindowCount listCapacity,
-                                         CGSWindowIDList list,
-                                         CGSWindowCount * listCount);
-
-extern CGSError CGSGetScreenRectForWindow(CGSConnectionID cid,
-                                          CGSWindowID wid, CGSRect * rect);
-
-extern CGWindowLevel CGSGetWindowLevel(CGSConnectionID cid,
-                                       CGSWindowID wid,
-                                       CGSWindowLevel * level);
-
-extern CGSError CGSDisplayHWFill(CGDirectDisplayID id, unsigned int x,
-                                 unsigned int y, unsigned int w,
-                                 unsigned int h, unsigned int color);
-
-extern CGSError CGSDisplayCanHWFill(CGDirectDisplayID id);
-
-extern CGSError CGSGetMouseEnabledFlags(CGSConnectionID cid, CGSWindowID wid,
-                                        int *flags);
-
-int CGSDisplayHWSync(CGDirectDisplayID id);
-/* vi: set ts=4 sw=4 expandtab: */

src/video/quartz/SDL_QuartzGL.m

-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2003  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
-*/
-#include "SDL_config.h"
-
-#include "SDL_QuartzVideo.h"
-
-/*
- * GL_ARB_Multisample is supposed to be available in 10.1, according to Apple:
- *
- *   http://developer.apple.com/opengl/extensions.html#GL_ARB_multisample
- *
- *  ...but it isn't in the system headers, according to Sam:
- *
- *   http://www.libsdl.org/pipermail/sdl/2003-December/058335.html
- *
- * These are normally enums and not #defines in the system headers.
- *
- *   --ryan.
- */
-#if (MAC_OS_X_VERSION_MAX_ALLOWED < 1020)
-#define NSOpenGLPFASampleBuffers ((NSOpenGLPixelFormatAttribute) 55)
-#define NSOpenGLPFASamples ((NSOpenGLPixelFormatAttribute) 56)
-#endif
-
-
-@ implementation NSOpenGLContext (CGLContextAccess)
-    - (CGLContextObj) cglContext;
-{
-    return _contextAuxiliary;
-}
-
-@end
-/* OpenGL helper functions (used internally) */
-    int
-QZ_SetupOpenGL (_THIS, int bpp, Uint32 flags)
-{
-
-    NSOpenGLPixelFormatAttribute attr[32];
-    NSOpenGLPixelFormat *fmt;
-    int i = 0;
-    int colorBits = bpp;
-
-    /* if a GL library hasn't been loaded at this point, load the default. */
-    if (!this->gl_config.driver_loaded) {
-        if (QZ_GL_LoadLibrary (this, NULL) == -1)
-            return 0;
-    }
-
-    if (flags & SDL_FULLSCREEN) {
-
-        attr[i++] = NSOpenGLPFAFullScreen;
-    }
-    /* In windowed mode, the OpenGL pixel depth must match device pixel depth */
-    else if (colorBits != device_bpp) {
-
-        colorBits = device_bpp;
-    }
-
-    attr[i++] = NSOpenGLPFAColorSize;
-    attr[i++] = colorBits;
-
-    attr[i++] = NSOpenGLPFADepthSize;
-    attr[i++] = this->gl_config.depth_size;
-
-    if (this->gl_config.double_buffer) {
-        attr[i++] = NSOpenGLPFADoubleBuffer;
-    }
-
-    if (this->gl_config.stereo) {
-        attr[i++] = NSOpenGLPFAStereo;
-    }
-
-    if (this->gl_config.stencil_size != 0) {
-        attr[i++] = NSOpenGLPFAStencilSize;
-        attr[i++] = this->gl_config.stencil_size;
-    }
-
-    if ((this->gl_config.accum_red_size +
-         this->gl_config.accum_green_size +
-         this->gl_config.accum_blue_size +
-         this->gl_config.accum_alpha_size) > 0) {
-        attr[i++] = NSOpenGLPFAAccumSize;
-        attr[i++] =
-            this->gl_config.accum_red_size +
-            this->gl_config.accum_green_size +
-            this->gl_config.accum_blue_size +
-            this->gl_config.accum_alpha_size;
-    }
-
-    if (this->gl_config.multisamplebuffers != 0) {
-        attr[i++] = NSOpenGLPFASampleBuffers;
-        attr[i++] = this->gl_config.multisamplebuffers;
-    }
-
-    if (this->gl_config.multisamplesamples != 0) {
-        attr[i++] = NSOpenGLPFASamples;
-        attr[i++] = this->gl_config.multisamplesamples;
-        attr[i++] = NSOpenGLPFANoRecovery;
-    }
-
-    if (this->gl_config.accelerated > 0) {
-        attr[i++] = NSOpenGLPFAAccelerated;
-    }
-
-    attr[i++] = NSOpenGLPFAScreenMask;
-    attr[i++] = CGDisplayIDToOpenGLDisplayMask (display_id);
-    attr[i] = 0;
-
-  fmt =[[NSOpenGLPixelFormat alloc] initWithAttributes:attr];
-    if (fmt == nil) {
-        SDL_SetError ("Failed creating OpenGL pixel format");
-        return 0;
-    }
-
-  gl_context =[[NSOpenGLContext alloc] initWithFormat: fmt shareContext:nil];
-
-    [fmt release];
-
-    if (gl_context == nil) {
-        SDL_SetError ("Failed creating OpenGL context");
-        return 0;
-    }
-
-    /* Synchronize QZ_GL_SwapBuffers() to vertical retrace.
-     * (Apple's documentation is not completely clear about what this setting
-     * exactly does, IMHO - for a detailed explanation see
-     * http://lists.apple.com/archives/mac-opengl/2006/Jan/msg00080.html )
-     */
-    if (this->gl_config.swap_control >= 0) {
-        long value;
-        value = this->gl_config.swap_control;
-      [gl_context setValues: &value forParameter:NSOpenGLCPSwapInterval];
-    }
-
-    /*
-     * Wisdom from Apple engineer in reference to UT2003's OpenGL performance:
-     *  "You are blowing a couple of the internal OpenGL function caches. This
-     *  appears to be happening in the VAO case.  You can tell OpenGL to up
-     *  the cache size by issuing the following calls right after you create
-     *  the OpenGL context.  The default cache size is 16."    --ryan.
-     */
-
-#ifndef GLI_ARRAY_FUNC_CACHE_MAX
-#define GLI_ARRAY_FUNC_CACHE_MAX 284
-#endif
-
-#ifndef GLI_SUBMIT_FUNC_CACHE_MAX
-#define GLI_SUBMIT_FUNC_CACHE_MAX 280
-#endif
-
-    {
-        long cache_max = 64;
-        CGLContextObj ctx =[gl_context cglContext];
-        CGLSetParameter (ctx, GLI_SUBMIT_FUNC_CACHE_MAX, &cache_max);
-        CGLSetParameter (ctx, GLI_ARRAY_FUNC_CACHE_MAX, &cache_max);
-    }
-
-    /* End Wisdom from Apple Engineer section. --ryan. */
-
-    return 1;
-}
-
-void
-QZ_TearDownOpenGL (_THIS)
-{
-
-    [NSOpenGLContext clearCurrentContext];
-    [gl_context clearDrawable];
-    [gl_context release];
-}
-
-
-/* SDL OpenGL functions */
-static const char *DEFAULT_OPENGL_LIB_NAME =
-    "/System/Library/Frameworks/OpenGL.framework/Libraries/libGL.dylib";
-
-int
-QZ_GL_LoadLibrary (_THIS, const char *location)
-{
-    if (gl_context != NULL) {
-        SDL_SetError ("OpenGL context already created");
-        return -1;
-    }
-
-    if (opengl_library != NULL)
-        SDL_UnloadObject (opengl_library);
-
-    if (location == NULL)
-        location = DEFAULT_OPENGL_LIB_NAME;
-
-    opengl_library = SDL_LoadObject (location);
-    if (opengl_library != NULL) {
-        this->gl_config.driver_loaded = 1;
-        return 0;
-    }
-
-    this->gl_config.driver_loaded = 0;
-    return -1;
-}
-
-void *
-QZ_GL_GetProcAddress (_THIS, const char *proc)
-{
-    return SDL_LoadFunction (opengl_library, proc);
-}
-
-int
-QZ_GL_GetAttribute (_THIS, SDL_GLattr attrib, int *value)
-{
-
-    GLenum attr = 0;
-
-    QZ_GL_MakeCurrent (this);
-
-    switch (attrib) {
-    case SDL_GL_RED_SIZE:
-        attr = GL_RED_BITS;
-        break;
-    case SDL_GL_BLUE_SIZE:
-        attr = GL_BLUE_BITS;
-        break;
-    case SDL_GL_GREEN_SIZE:
-        attr = GL_GREEN_BITS;
-        break;
-    case SDL_GL_ALPHA_SIZE:
-        attr = GL_ALPHA_BITS;
-        break;
-    case SDL_GL_DOUBLEBUFFER:
-        attr = GL_DOUBLEBUFFER;
-        break;
-    case SDL_GL_DEPTH_SIZE:
-        attr = GL_DEPTH_BITS;
-        break;
-    case SDL_GL_STENCIL_SIZE:
-        attr = GL_STENCIL_BITS;
-        break;
-    case SDL_GL_ACCUM_RED_SIZE:
-        attr = GL_ACCUM_RED_BITS;
-        break;
-    case SDL_GL_ACCUM_GREEN_SIZE:
-        attr = GL_ACCUM_GREEN_BITS;
-        break;
-    case SDL_GL_ACCUM_BLUE_SIZE:
-        attr = GL_ACCUM_BLUE_BITS;
-        break;
-    case SDL_GL_ACCUM_ALPHA_SIZE:
-        attr = GL_ACCUM_ALPHA_BITS;
-        break;
-    case SDL_GL_STEREO:
-        attr = GL_STEREO;
-        break;
-    case SDL_GL_MULTISAMPLEBUFFERS:
-        attr = GL_SAMPLE_BUFFERS_ARB;
-        break;
-    case SDL_GL_MULTISAMPLESAMPLES:
-        attr = GL_SAMPLES_ARB;
-        break;
-    case SDL_GL_BUFFER_SIZE:
-        {
-            GLint bits = 0;
-            GLint component;
-
-            /* there doesn't seem to be a single flag in OpenGL for this! */
-            glGetIntegerv (GL_RED_BITS, &component);
-            bits += component;
-            glGetIntegerv (GL_GREEN_BITS, &component);
-            bits += component;
-            glGetIntegerv (GL_BLUE_BITS, &component);
-            bits += component;
-            glGetIntegerv (GL_ALPHA_BITS, &component);
-            bits += component;
-
-            *value = bits;
-            return 0;
-        }
-    case SDL_GL_ACCELERATED_VISUAL:
-        {
-            long val;
-            /* FIXME: How do we get this information here?
-               [fmt getValues: &val forAttribute: NSOpenGLPFAAccelerated attr forVirtualScreen: 0];
-             */
-            val = (this->gl_config.accelerated != 0);;
-            *value = val;
-            return 0;
-        }
-    case SDL_GL_SWAP_CONTROL:
-        {
-            long val;
-          [gl_context getValues: &val forParameter:NSOpenGLCPSwapInterval];
-            *value = val;
-            return 0;
-        }
-    }
-
-    glGetIntegerv (attr, (GLint *) value);
-    return 0;
-}
-
-int
-QZ_GL_MakeCurrent (_THIS)
-{
-    [gl_context makeCurrentContext];
-    return 0;
-}
-
-void
-QZ_GL_SwapBuffers (_THIS)
-{
-    [gl_context flushBuffer];
-}

src/video/quartz/SDL_QuartzKeys.h

-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2003  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
-*/
-#include "SDL_config.h"
-
-/* These are the Macintosh key scancode constants -- from Inside Macintosh */
-
-#define QZ_ESCAPE		0x35
-#define QZ_F1			0x7A
-#define QZ_F2			0x78
-#define QZ_F3			0x63
-#define QZ_F4			0x76
-#define QZ_F5			0x60
-#define QZ_F6			0x61
-#define QZ_F7			0x62
-#define QZ_F8			0x64
-#define QZ_F9			0x65
-#define QZ_F10			0x6D
-#define QZ_F11			0x67
-#define QZ_F12			0x6F
-#define QZ_PRINT		0x69
-#define QZ_SCROLLOCK    0x6B
-#define QZ_PAUSE		0x71
-#define QZ_POWER		0x7F
-#define QZ_BACKQUOTE	0x32
-#define QZ_1			0x12
-#define QZ_2			0x13
-#define QZ_3			0x14
-#define QZ_4			0x15
-#define QZ_5			0x17
-#define QZ_6			0x16
-#define QZ_7			0x1A
-#define QZ_8			0x1C
-#define QZ_9			0x19
-#define QZ_0			0x1D
-#define QZ_MINUS		0x1B
-#define QZ_EQUALS		0x18
-#define QZ_BACKSPACE	0x33
-#define QZ_INSERT		0x72
-#define QZ_HOME			0x73
-#define QZ_PAGEUP		0x74
-#define QZ_NUMLOCK		0x47
-#define QZ_KP_EQUALS	0x51
-#define QZ_KP_DIVIDE	0x4B
-#define QZ_KP_MULTIPLY	0x43
-#define QZ_TAB			0x30
-#define QZ_q			0x0C
-#define QZ_w			0x0D
-#define QZ_e			0x0E
-#define QZ_r			0x0F
-#define QZ_t			0x11
-#define QZ_y			0x10
-#define QZ_u			0x20
-#define QZ_i			0x22
-#define QZ_o			0x1F
-#define QZ_p			0x23
-#define QZ_LEFTBRACKET	0x21
-#define QZ_RIGHTBRACKET	0x1E
-#define QZ_BACKSLASH	0x2A
-#define QZ_DELETE		0x75
-#define QZ_END			0x77
-#define QZ_PAGEDOWN		0x79
-#define QZ_KP7			0x59
-#define QZ_KP8			0x5B
-#define QZ_KP9			0x5C
-#define QZ_KP_MINUS		0x4E
-#define QZ_CAPSLOCK		0x39
-#define QZ_a			0x00
-#define QZ_s			0x01
-#define QZ_d			0x02
-#define QZ_f			0x03
-#define QZ_g			0x05
-#define QZ_h			0x04
-#define QZ_j			0x26
-#define QZ_k			0x28
-#define QZ_l			0x25
-#define QZ_SEMICOLON	0x29
-#define QZ_QUOTE		0x27
-#define QZ_RETURN		0x24
-#define QZ_KP4			0x56
-#define QZ_KP5			0x57
-#define QZ_KP6			0x58
-#define QZ_KP_PLUS		0x45
-#define QZ_LSHIFT		0x38
-#define QZ_z			0x06
-#define QZ_x			0x07
-#define QZ_c			0x08
-#define QZ_v			0x09
-#define QZ_b			0x0B
-#define QZ_n			0x2D
-#define QZ_m			0x2E
-#define QZ_COMMA		0x2B
-#define QZ_PERIOD		0x2F
-#define QZ_SLASH		0x2C
-#if 1                           /* Panther now defines right side keys */
-#define QZ_RSHIFT		0x3C
-#endif
-#define QZ_UP			0x7E
-#define QZ_KP1			0x53
-#define QZ_KP2			0x54
-#define QZ_KP3			0x55
-#define QZ_KP_ENTER		0x4C
-#define QZ_LCTRL		0x3B
-#define QZ_LALT			0x3A
-#define QZ_LMETA		0x37
-#define QZ_SPACE		0x31
-#if 1                           /* Panther now defines right side keys */
-#define QZ_RMETA		0x36
-#define QZ_RALT			0x3D
-#define QZ_RCTRL		0x3E
-#endif
-#define QZ_LEFT			0x7B
-#define QZ_DOWN			0x7D
-#define QZ_RIGHT		0x7C
-#define QZ_KP0			0x52
-#define QZ_KP_PERIOD	0x41
-
-/* 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
-#define QZ_IBOOK_DOWN		0x3D
-#define QZ_IBOOK_UP			0x3E
-/* vi: set ts=4 sw=4 expandtab: */

test/testsprite.c

@@ -3,6 +3,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <time.h>
+#include <math.h>
 
 #include "SDL.h"