Skip to content

L
libSDL
Commit 72f7279b authored by Sam Lantinga's avatar Sam Lantinga
Browse files
Options

Added initial support for Quartz video (thanks Darrell!) 

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%4048
parent d9a2eb5e
Expand all Show whitespace changes
Inline Side-by-side
Showing with 2131 additions and 33 deletions
BUGS
View file @ 72f7279b
...@@ -70,22 +70,35 @@ MacOS: ...@@ -70,22 +70,35 @@ MacOS:
Not all of the keys are properly recognized on the keyboard. Not all of the keys are properly recognized on the keyboard.
MacOS X: MacOS X:
Fullscreen mode doesn't work - it requires the QuickTime framework Joystick and CD-ROM functions are not implemented yet.
and that the new SDL window gets raised to the top of the Z order.
Closing window from window's close widget not implemented yet.
Minimizing the window erases the framebuffer to the pinstripe pattern.
Window may not close when unsetting video mode and resetting.
Depth switching for windowed mode isn't implemented yet.
Palette handling isn't implemented in windowed mode yet. Palette handling isn't implemented in windowed mode yet.
Native sound and video routines are not finished, though Carbon Command-line arguments Dialog is not implemented yet.
seems to work fairly well.
Joysticks and CD-ROM functions are not implemented yet. Fullscreen drawing has some artifacts.
SDL_WM_GrabInput() is not implemented. Fullscreen window covers *all* other windows - even force quit.
Does anyone know how to do this? SDL_WM_GrabInput() is designed
to prevent the user from switching input and mouse focus away from
the SDL application.
Continuous relative mouse motion is not implemented. Fullscreen OpenGL for the software renderer is broken.
Some OpenGL parameters are not accounted for, for example color bits customization.
Getting OpenGL context parameters is not implemented.
Continuous mouse motion perhaps is not as smooth as it should be.
SDL_WM_GrabInput() is implemented, but it "freezes" the hardware
cursor in the center of the window/screen. Also, mouse moved events
are not generated, and the keyboard cannot be grabbed.
Not all of the keys are properly recognized on the keyboard. Not all of the keys are properly recognized on the keyboard.
......
README.MacOSX
View file @ 72f7279b
...@@ -34,11 +34,80 @@ and linking, respectively: ...@@ -34,11 +34,80 @@ and linking, respectively:
sdl-config knows about the linking path and -framework, so it's sdl-config knows about the linking path and -framework, so it's
recommended to use it to fill in your Makefile variables. recommended to use it to fill in your Makefile variables.
[Add instructions for how to build using PB] ==============================================================================
Using the Simple DirectMedia Layer with Project Builder
==============================================================================
These instructions are for using Apple's Project Builder IDE to build SDL applications.
- Building the Framework
The SDL Library is packaged as a framework bundle, an organized
relocatable folder heirarchy of executible code, interface headers,
and additional resources. For practical purposes, you can think of a
framework as a more user and system-friendly shared library, whose library
file behaves more or less like a standard UNIX shared library.
To build the framework, simply open the framework project and build it.
By default, the framework bundle "SDL.framework" is installed in
~/Library/Frameworks. Therefore, the testers and project stationary expect
it to be located there. However, it will function the same in any of the
following locations:
~/Library/Frameworks
/Local/Library/Frameworks
/System/Library/Frameworks
- Build Options
There are two "Build Styles" (See the "Targets" tab) for SDL.
"Deployment" should be used if you aren't tweaking the SDL library.
"Development" should be used to debug SDL apps or the library itself.
- Building the Testers
Open the SDLTest project and build away!
- Using the Project Stationary
Copy the stationary to the indicated folders to access it from
the "New Project" and "Add target" menus. What could be easier?
- Setting up a new project by hand
Some of you won't want to use the Stationary so I'll give some tips:
* Create a new "Cocoa Application"
* Add src/main/macosx/SDLMain.m , .h and .nib to your project
* Remove "main.c" from your project
* Remove "MainMenu.nib" from your project
* Add "$(HOME)/Library/Frameworks/SDL.framework/Headers" to include path
* Add "$(HOME)/Library/Frameworks" to the frameworks search path
* Add "-framework SDL" to the "OTHER_LDFLAGS" variable
* Set the "Main Nib File" under "Application Settings" to "SDLMain.nib"
* Add your files
* Clean and build
- Building from command line
Use pbxbuild in the same directory as your .pbproj file
- Running your app
You can send command line args to your app by either invoking it from
the command line (in *.app/Contents/MacOS) or by entering them in the
"Executibles" panel of the target settings.
As of this writing (Sep 2000), OS X is in public beta. This means - Implementation Notes
that while most of the APIs are frozen, things are still subject to Some things that may be of interest about how it all works...
change, and many of the known problems will be resolved before the * Working directory
final release comes out. As defined in the SDLMain.m file, the working directory of your SDL app
is by default set to its parent. You may wish to change this to better
suit your needs.
* You have a Cocoa App!
Your SDL app is essentially a Cocoa application. When your app
starts up and the libraries finish loading, a Cocoa procedure is called,
which sets up the working directory and calls your main() method.
You are free to modify your Cocoa app with generally no consequence
to SDL. You cannot, however, easily change the SDL window itself.
Functionality may be added in the future to help this.
* My development setup:
I am using version 1.0.1 (v63.0) of Project Builder on MacOS X 10.0.3,
from the Developer Tools CD for May 2001.
As of May 31 2001, Apple hasn't released this version of the tools to the public,
but I expect that things will still work on older versions.
Known bugs are listed in the file "BUGS" Known bugs are listed in the file "BUGS"
configure.in
View file @ 72f7279b
...@@ -63,6 +63,10 @@ case "$target" in ...@@ -63,6 +63,10 @@ case "$target" in
*-*-linux*) *-*-linux*)
AC_PROG_CXX AC_PROG_CXX
;; ;;
*-*-darwin*)
OBJC="???"
AC_SUBST(OBJC)
;;
esac esac
AC_PROG_INSTALL AC_PROG_INSTALL
AC_FUNC_ALLOCA AC_FUNC_ALLOCA
...@@ -1979,6 +1983,7 @@ src/video/ggi/Makefile ...@@ -1979,6 +1983,7 @@ src/video/ggi/Makefile
src/video/maccommon/Makefile src/video/maccommon/Makefile
src/video/macdsp/Makefile src/video/macdsp/Makefile
src/video/macrom/Makefile src/video/macrom/Makefile
src/video/quartz/Makefile
src/video/svga/Makefile src/video/svga/Makefile
src/video/aalib/Makefile src/video/aalib/Makefile
src/video/wincommon/Makefile src/video/wincommon/Makefile
......
docs.html
View file @ 72f7279b
...@@ -16,6 +16,7 @@ be found at the <A HREF="http://www.libsdl.org/"> main SDL page</A>. ...@@ -16,6 +16,7 @@ be found at the <A HREF="http://www.libsdl.org/"> main SDL page</A>.
Major changes since SDL 1.0.0: Major changes since SDL 1.0.0:
</H2> </H2>
<UL> <UL>
<LI> 1.2.1: Added initial support for Quartz video (thanks Darrell!)
<LI> 1.2.1: Added native OpenBSD audio driver (thanks vedge!) <LI> 1.2.1: Added native OpenBSD audio driver (thanks vedge!)
<LI> 1.2.1: Added detection of Open Sound System on Solaris x86 <LI> 1.2.1: Added detection of Open Sound System on Solaris x86
<LI> 1.2.1: Added initial support for Nano-X (thanks Hsieh-Fu!) <LI> 1.2.1: Added initial support for Nano-X (thanks Hsieh-Fu!)
......
include/SDL_main.h
View file @ 72f7279b
...@@ -31,7 +31,7 @@ static char rcsid = ...@@ -31,7 +31,7 @@ static char rcsid =
/* Redefine main() on Win32 and MacOS so that it is called by winmain.c */ /* Redefine main() on Win32 and MacOS so that it is called by winmain.c */
#if defined(WIN32) || (defined(__MWERKS__) && !defined(__BEOS__)) || \ #if defined(WIN32) || (defined(__MWERKS__) && !defined(__BEOS__)) || \
defined(macintosh) defined(macintosh) || defined(__APPLE__)
#ifdef __cplusplus #ifdef __cplusplus
#define C_LINKAGE "C" #define C_LINKAGE "C"
......
include/SDL_video.h
View file @ 72f7279b
...@@ -878,6 +878,10 @@ typedef enum { ...@@ -878,6 +878,10 @@ typedef enum {
*/ */
extern DECLSPEC SDL_GrabMode SDL_WM_GrabInput(SDL_GrabMode mode); extern DECLSPEC SDL_GrabMode SDL_WM_GrabInput(SDL_GrabMode mode);
/* Not in public API at the moment - do not use! */
extern DECLSPEC int SDL_SoftStretch(SDL_Surface *src, SDL_Rect *srcrect,
SDL_Surface *dst, SDL_Rect *dstrect);
/* Ends C function definitions when using C++ */ /* Ends C function definitions when using C++ */
#ifdef __cplusplus #ifdef __cplusplus
} }
......
src/audio/macrom/SDL_romaudio.c
View file @ 72f7279b
...@@ -106,8 +106,7 @@ static void callBackProc (SndChannel *chan, SndCommand *cmd_passed ) { ...@@ -106,8 +106,7 @@ static void callBackProc (SndChannel *chan, SndCommand *cmd_passed ) {
SndCommand cmd; SndCommand cmd;
SDL_AudioDevice *audio = (SDL_AudioDevice *)chan->userInfo; SDL_AudioDevice *audio = (SDL_AudioDevice *)chan->userInfo;
fill_me = cmd_passed->param2; /* buffer that has just finished playing, fill_me = cmd_passed->param2; /* buffer that has just finished playing, so fill it */
so fill it */
play_me = ! fill_me; /* filled buffer to play _now_ */ play_me = ! fill_me; /* filled buffer to play _now_ */
if ( ! audio->enabled ) { if ( ! audio->enabled ) {
...@@ -126,8 +125,14 @@ so fill it */ ...@@ -126,8 +125,14 @@ so fill it */
if ( ! audio->paused ) { if ( ! audio->paused ) {
if ( audio->convert.needed ) { if ( audio->convert.needed ) {
#if MACOSX
SDL_mutexP(audio->mixer_lock);
#endif
audio->spec.callback(audio->spec.userdata, audio->spec.callback(audio->spec.userdata,
(Uint8 *)audio->convert.buf,audio->convert.len); (Uint8 *)audio->convert.buf,audio->convert.len);
#if MACOSX
SDL_mutexV(audio->mixer_lock);
#endif
SDL_ConvertAudio(&audio->convert); SDL_ConvertAudio(&audio->convert);
#if 0 #if 0
if ( audio->convert.len_cvt != audio->spec.size ) { if ( audio->convert.len_cvt != audio->spec.size ) {
...@@ -137,8 +142,14 @@ so fill it */ ...@@ -137,8 +142,14 @@ so fill it */
memcpy(buffer[fill_me], audio->convert.buf, memcpy(buffer[fill_me], audio->convert.buf,
audio->convert.len_cvt); audio->convert.len_cvt);
} else { } else {
#if MACOSX
SDL_mutexP(audio->mixer_lock);
#endif
audio->spec.callback(audio->spec.userdata, audio->spec.callback(audio->spec.userdata,
(Uint8 *)buffer[fill_me], audio->spec.size); (Uint8 *)buffer[fill_me], audio->spec.size);
#if MACOSX
SDL_mutexV(audio->mixer_lock);
#endif
} }
} }
...@@ -150,6 +161,7 @@ so fill it */ ...@@ -150,6 +161,7 @@ so fill it */
SndDoCommand (chan, &cmd, 0); SndDoCommand (chan, &cmd, 0);
} }
} }
static int Mac_OpenAudio(_THIS, SDL_AudioSpec *spec) { static int Mac_OpenAudio(_THIS, SDL_AudioSpec *spec) {
......
src/main/macosx/SDLMain.h 0 → 100644
View file @ 72f7279b
#import <Cocoa/Cocoa.h>
@interface SDLMain : NSObject
{
}
- (IBAction)quit:(id)sender;
- (IBAction)makeFullscreen:(id)sender;
@end
src/main/macosx/SDLMain.m 0 → 100644
View file @ 72f7279b
/* SDLMain.m - main entry point for our Cocoa-ized SDL app
Darrell Walisser - dwaliss1@purdue.edu
Feel free to customize this file to suit your needs
*/
#import "SDL.h"
#import "SDLMain.h"
#import <sys/param.h> /* for MAXPATHLEN */
#import <unistd.h>
static int gArgc;
static char **gArgv;
/* The main class of the application, the application's delegate */
@implementation SDLMain
/* Invoked from the Quit menu item */
- (void) quit:(id)sender
{
SDL_Event event;
event.type = SDL_QUIT;
SDL_PushEvent(&event);
}
/* Invoked from the "Make fulllscreen" menu item */
- (void) makeFullscreen:(id)sender
{
}
/* Set the working directory to the .app's parent directory */
- (void) setupWorkingDirectory
{
char parentdir[MAXPATHLEN];
char *c;
strncpy ( parentdir, gArgv[0], MAXPATHLEN );
c = (char*) parentdir;
while (*c != '\0') /* go to end */
c++;
while (*c != '/') /* back up to parent */
c--;
*c = '\0'; /* cut off last part (binary name) */
assert ( chdir (parentdir) == 0 ); /* chdir to the binary app's parent */
assert ( chdir ("../../../") == 0 ); /* chdir to the .app's parent */
}
/* Called when the internal event loop has just started running */
- (void) applicationDidFinishLaunching: (NSNotification *) note
{
/* Set the working directory to the .app's parent directory */
[ self setupWorkingDirectory ];
/* This is passed if we are launched by double-clicking */
if ( gArgc >= 2 && strncmp (gArgv[1], "-psn", 4) == 0 )
gArgc = 1;
/* Hand off to main application code */
SDL_main (gArgc, gArgv);
exit(0);
}
@end
#ifdef main
# undef main
#endif
/* Main entry point to executible - should *not* be SDL_main! */
int main (int argc, char **argv) {
/* Copy the arguments into a global variable */
int i;
gArgc = argc;
gArgv = (char**) malloc (sizeof(*gArgv) * gArgc);
assert (gArgv != NULL);
for (i = 0; i < gArgc; i++) {
gArgv[i] = strdup (argv[i]);
}
NSApplicationMain (argc, argv);
return 0;
}
\ No newline at end of file
src/main/macosx/exports/Makefile 0 → 100644
View file @ 72f7279b
EXPORTS = SDL.x
HEADERS = \
../../../../include/SDL.h \
../../../../include/SDL_active.h \
../../../../include/SDL_audio.h \
../../../../include/SDL_byteorder.h \
../../../../include/SDL_cdrom.h \
../../../../include/SDL_copying.h \
../../../../include/SDL_endian.h \
../../../../include/SDL_error.h \
../../../../include/SDL_events.h \
../../../../include/SDL_getenv.h \
../../../../include/SDL_joystick.h \
../../../../include/SDL_keyboard.h \
../../../../include/SDL_keysym.h \
../../../../include/SDL_mouse.h \
../../../../include/SDL_mutex.h \
../../../../include/SDL_quit.h \
../../../../include/SDL_rwops.h \
../../../../include/SDL_syswm.h \
../../../../include/SDL_thread.h \
../../../../include/SDL_timer.h \
../../../../include/SDL_types.h \
../../../../include/SDL_version.h \
../../../../include/SDL_video.h
all: $(EXPORTS)
$(EXPORTS): $(HEADERS)
perl gendef.pl $(HEADERS) >$@ || rm $@
clean:
rm -f $(EXPORTS)
src/main/macosx/exports/SDL.x 0 → 100644
View file @ 72f7279b
_SDL_Init
_SDL_InitSubSystem
_SDL_QuitSubSystem
_SDL_WasInit
_SDL_Quit
_SDL_GetAppState
_SDL_AudioInit
_SDL_AudioQuit
_SDL_AudioDriverName
_SDL_OpenAudio
_SDL_GetAudioStatus
_SDL_PauseAudio
_SDL_LoadWAV_RW
_SDL_FreeWAV
_SDL_BuildAudioCVT
_SDL_ConvertAudio
_SDL_MixAudio
_SDL_LockAudio
_SDL_UnlockAudio
_SDL_CloseAudio
_SDL_CDNumDrives
_SDL_CDName
_SDL_CDOpen
_SDL_CDStatus
_SDL_CDPlayTracks
_SDL_CDPlay
_SDL_CDPause
_SDL_CDResume
_SDL_CDStop
_SDL_CDEject
_SDL_CDClose
_SDL_ReadLE16
_SDL_ReadBE16
_SDL_ReadLE32
_SDL_ReadBE32
_SDL_ReadLE64
_SDL_ReadBE64
_SDL_WriteLE16
_SDL_WriteBE16
_SDL_WriteLE32
_SDL_WriteBE32
_SDL_WriteLE64
_SDL_WriteBE64
_SDL_SetError
_SDL_GetError
_SDL_ClearError
_SDL_PumpEvents
_SDL_PeepEvents
_SDL_PollEvent
_SDL_WaitEvent
_SDL_PushEvent
_SDL_SetEventFilter
_SDL_GetEventFilter
_SDL_EventState
_SDL_putenv
_SDL_getenv
_SDL_NumJoysticks
_SDL_JoystickName
_SDL_JoystickOpen
_SDL_JoystickOpened
_SDL_JoystickIndex
_SDL_JoystickNumAxes
_SDL_JoystickNumBalls
_SDL_JoystickNumHats
_SDL_JoystickNumButtons
_SDL_JoystickUpdate
_SDL_JoystickEventState
_SDL_JoystickGetAxis
_SDL_JoystickGetHat
_SDL_JoystickGetBall
_SDL_JoystickGetButton
_SDL_JoystickClose
_SDL_EnableUNICODE
_SDL_EnableKeyRepeat
_SDL_GetKeyState
_SDL_GetModState
_SDL_SetModState
_SDL_GetKeyName
_SDL_GetMouseState
_SDL_GetRelativeMouseState
_SDL_WarpMouse
_SDL_CreateCursor
_SDL_SetCursor
_SDL_GetCursor
_SDL_FreeCursor
_SDL_ShowCursor
_SDL_CreateMutex
_SDL_mutexP
_SDL_mutexV
_SDL_DestroyMutex
_SDL_CreateSemaphore
_SDL_DestroySemaphore
_SDL_SemWait
_SDL_SemTryWait
_SDL_SemWaitTimeout
_SDL_SemPost
_SDL_SemValue
_SDL_CreateCond
_SDL_DestroyCond
_SDL_CondSignal
_SDL_CondBroadcast
_SDL_CondWait
_SDL_CondWaitTimeout
_SDL_RWFromFile
_SDL_RWFromFP
_SDL_RWFromMem
_SDL_AllocRW
_SDL_FreeRW
_SDL_GetWMInfo
_SDL_CreateThread
_SDL_ThreadID
_SDL_GetThreadID
_SDL_WaitThread
_SDL_KillThread
_SDL_GetTicks
_SDL_Delay
_SDL_SetTimer
_SDL_AddTimer
_SDL_RemoveTimer
_SDL_Linked_Version
_SDL_VideoInit
_SDL_VideoQuit
_SDL_VideoDriverName
_SDL_GetVideoSurface
_SDL_GetVideoInfo
_SDL_VideoModeOK
_SDL_ListModes
_SDL_SetVideoMode
_SDL_UpdateRects
_SDL_UpdateRect
_SDL_Flip
_SDL_SetGamma
_SDL_SetGammaRamp
_SDL_GetGammaRamp
_SDL_SetColors
_SDL_SetPalette
_SDL_MapRGB
_SDL_MapRGBA
_SDL_GetRGB
_SDL_GetRGBA
_SDL_CreateRGBSurface
_SDL_CreateRGBSurfaceFrom
_SDL_FreeSurface
_SDL_LockSurface
_SDL_UnlockSurface
_SDL_LoadBMP_RW
_SDL_SaveBMP_RW
_SDL_SetColorKey
_SDL_SetAlpha
_SDL_SetClipRect
_SDL_GetClipRect
_SDL_ConvertSurface
_SDL_UpperBlit
_SDL_LowerBlit
_SDL_FillRect
_SDL_DisplayFormat
_SDL_DisplayFormatAlpha
_SDL_CreateYUVOverlay
_SDL_LockYUVOverlay
_SDL_UnlockYUVOverlay
_SDL_DisplayYUVOverlay
_SDL_FreeYUVOverlay
_SDL_GL_LoadLibrary
_SDL_GL_GetProcAddress
_SDL_GL_SetAttribute
_SDL_GL_GetAttribute
_SDL_GL_SwapBuffers
_SDL_GL_UpdateRects
_SDL_GL_Lock
_SDL_GL_Unlock
_SDL_WM_SetCaption
_SDL_WM_GetCaption
_SDL_WM_SetIcon
_SDL_WM_IconifyWindow
_SDL_WM_ToggleFullScreen
_SDL_WM_GrabInput
_SDL_SoftStretch
src/main/macosx/exports/gendef.pl 0 → 100644
View file @ 72f7279b
#!/usr/bin/perl
#
# Program to take a set of header files and generate DLL export definitions
while ( ($file = shift(@ARGV)) ) {
if ( ! defined(open(FILE, $file)) ) {
warn "Couldn't open $file: $!\n";
next;
}
$printed_header = 0;
$file =~ s,.*/,,;
while (<FILE>) {
if ( /DECLSPEC.*\s\**([^\s\(]+)\(/ ) {
print "\t_$1\n";
} elsif ( /DECLSPEC.*\s\**([^\s\(]+)$/ ) {
print "\t_$1\n";
}
}
close(FILE);
}
src/video/SDL_sysvideo.h
View file @ 72f7279b
...@@ -63,7 +63,7 @@ typedef struct SDL_VideoDevice SDL_VideoDevice; ...@@ -63,7 +63,7 @@ typedef struct SDL_VideoDevice SDL_VideoDevice;
#endif #endif
struct SDL_VideoDevice { struct SDL_VideoDevice {
/* * * */ /* * * */
/* The name of this audio driver */ /* The name of this video driver */
const char *name; const char *name;
/* * * */ /* * * */
...@@ -377,10 +377,12 @@ extern VideoBootStrap TOOLBOX_bootstrap; ...@@ -377,10 +377,12 @@ extern VideoBootStrap TOOLBOX_bootstrap;
#ifdef ENABLE_DRAWSPROCKET #ifdef ENABLE_DRAWSPROCKET
extern VideoBootStrap DSp_bootstrap; extern VideoBootStrap DSp_bootstrap;
#endif #endif
#ifdef ENABLE_QUARTZ
extern VideoBootStrap QZ_bootstrap;
#endif
#ifdef ENABLE_CYBERGRAPHICS #ifdef ENABLE_CYBERGRAPHICS
extern VideoBootStrap CGX_bootstrap; extern VideoBootStrap CGX_bootstrap;
#endif #endif
/* This is the current video device */ /* This is the current video device */
extern SDL_VideoDevice *current_video; extern SDL_VideoDevice *current_video;
......
src/video/SDL_video.c
View file @ 72f7279b
...@@ -84,6 +84,9 @@ static VideoBootStrap *bootstrap[] = { ...@@ -84,6 +84,9 @@ static VideoBootStrap *bootstrap[] = {
#ifdef ENABLE_DRAWSPROCKET #ifdef ENABLE_DRAWSPROCKET
&DSp_bootstrap, &DSp_bootstrap,
#endif #endif
#ifdef ENABLE_QUARTZ
&QZ_bootstrap,
#endif
#ifdef ENABLE_CYBERGRAPHICS #ifdef ENABLE_CYBERGRAPHICS
&CGX_bootstrap, &CGX_bootstrap,
#endif #endif
......
src/video/macrom/SDL_romvideo.c
View file @ 72f7279b
...@@ -34,7 +34,7 @@ static char rcsid = ...@@ -34,7 +34,7 @@ static char rcsid =
is still at the back on MacOS X, which is where this code is needed. is still at the back on MacOS X, which is where this code is needed.
*/ */
#if USE_QUICKTIME #if USE_QUICKTIME
#include <Movies.h> #include <QuickTime/Movies.h>
#endif #endif
#else #else
#include <LowMem.h> #include <LowMem.h>
......
src/video/quartz/Makefile.am 0 → 100644
View file @ 72f7279b
## Makefile.am for SDL using the MacOS X Quartz video driver
noinst_LTLIBRARIES = libvideo_quartz.la
libvideo_quartz_la_SOURCES = $(QUARTZ_SRCS)
# The SDL MacOS X Quartz video driver sources
QUARTZ_SRCS = \
SDL_QuartzEvents.m \
SDL_QuartzKeys.h \
SDL_QuartzVideo.h \
SDL_QuartzVideo.m \
SDL_QuartzWM.m \
SDL_QuartzWindow.m
src/video/quartz/SDL_QuartzEvents.m 0 → 100644
View file @ 72f7279b
This diff is collapsed.
src/video/quartz/SDL_QuartzKeys.h 0 → 100644
View file @ 72f7279b
/*
SDL - Simple DirectMedia Layer
Copyright (C) 1997, 1998, 1999, 2000, 2001 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@devolution.com
*/
/* 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 0 /* These are the same as the left versions - use left by default */
#define QZ_RSHIFT 0x38
#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 0 /* These are the same as the left versions - use left by default */
#define QZ_RMETA 0x37
#define QZ_RALT 0x3A
#define QZ_RCTRL 0x3B
#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 MacOS 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
src/video/quartz/SDL_QuartzVideo.h 0 → 100644
View file @ 72f7279b
/*
SDL - Simple DirectMedia Layer
Copyright (C) 1997, 1998, 1999, 2000, 2001 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@devolution.com
*/
/*
@file SDL_QuartzVideo.h
@author Darrell Walisser
@abstract SDL video driver for MacOS X.
@discussion
TODO
- Hardware Cursor support with NSCursor instead of Carbon
- Keyboard repeat/mouse speed adjust (if needed)
- Multiple monitor support (currently only main display)
- Accelerated blitting support
- Set the window icon (dock icon when API is available)
- Avoid erasing window on minimize, or disable minimize
Problems:
- OGL not working in full screen with software renderer
- SetColors sets palette correctly but clears framebuffer
- Crash in CG after several mode switches
- Retained windows don't draw their title bar quite right (OS Bug)
- Should I do depth switching for windowed modes?
- Launch times are slow, maybe prebinding will help
- Direct framebuffer access has some artifacts, maybe a driver issue
- Cursor in 8 bit modes is screwy
- Modifier + mouse-down maps alternate mouse button, but if modifier is released
before mouse button, corresponding mouse-up event is not generated.
- Clicking in content activates app, but doesn't generate the activate event,
and subsequent switches generate no activate/deactivate events! (OS Bug I hope)
*/
#include <ApplicationServices/ApplicationServices.h>
#include <OpenGL/OpenGL.h>
#include <Cocoa/Cocoa.h>
#include <Carbon/Carbon.h>
#include "SDL_video.h"
#include "SDL_error.h"
#include "SDL_syswm.h"
#include "SDL_sysvideo.h"
#include "SDL_pixels_c.h"
#include "SDL_events_c.h"
/* This is a workaround to directly access NSOpenGLContext's CGL context */
/* We need to do this in order to check for errors */
@interface NSOpenGLContext (CGLContextAccess)
- (CGLContextObj) cglContext;
@end
@implementation NSOpenGLContext (CGLContextAccess)
- (CGLContextObj) cglContext;
{
return _contextAuxiliary;
}
@end
typedef struct SDL_PrivateVideoData {
CGDirectDisplayID display; /* 0 == main display */
CFDictionaryRef mode;
CFDictionaryRef save_mode;
CFArrayRef mode_list;
CGDirectPaletteRef palette;
NSOpenGLContext *gl_context;
int width, height, bpp;
Uint32 flags;
/* Window-only fields */
NSWindow *window;
NSQuickDrawView *view;
NSString *title;
} SDL_PrivateVideoData ;
#define _THIS SDL_VideoDevice *this
#define display_id (this->hidden->display)
#define mode (this->hidden->mode)
#define save_mode (this->hidden->save_mode)
#define mode_list (this->hidden->mode_list)
#define palette (this->hidden->palette)
#define glcontext (this->hidden->glcontext)
#define objc_video (this->hidden->objc_video)
#define gl_context (this->hidden->gl_context)
#define device_width (this->hidden->width)
#define device_height (this->hidden->height)
#define device_bpp (this->hidden->bpp)
#define mode_flags (this->hidden->flags)
#define window (this->hidden->window)
#define windowView (this->hidden->view)
#define windowTitle (this->hidden->title)
/* Interface for hardware fill not (yet) in the public API */
int CGSDisplayHWFill (CGDirectDisplayID id, unsigned int x, unsigned int y,
unsigned int w, unsigned int h, unsigned int color);
int CGSDisplayCanHWFill (CGDirectDisplayID id);
/* Bootstrap functions */
static int QZ_Available ();
static SDL_VideoDevice* QZ_CreateDevice (int device_index);
static void QZ_DeleteDevice (SDL_VideoDevice *device);
/* Initialization, Query, Setup, and Redrawing functions */
static int QZ_VideoInit (_THIS, SDL_PixelFormat *video_format);
static SDL_Rect** QZ_ListModes (_THIS, SDL_PixelFormat *format,
Uint32 flags);
static void QZ_UnsetVideoMode (_THIS);
static SDL_Surface* QZ_SetVideoMode (_THIS, SDL_Surface *current,
int width, int height, int bpp,
Uint32 flags);
static int QZ_ToggleFullScreen (_THIS, int on);
static int QZ_SetColors (_THIS, int first_color,
int num_colors, SDL_Color *colors);
static void QZ_DirectUpdate (_THIS, int num_rects, SDL_Rect *rects);
static void QZ_UpdateRects (_THIS, int num_rects, SDL_Rect *rects);
static void QZ_VideoQuit (_THIS);
/* Hardware surface functions (for fullscreen mode only) */
static int QZ_FillHWRect (_THIS, SDL_Surface *dst, SDL_Rect *rect, Uint32 color);
static int QZ_LockHWSurface(_THIS, SDL_Surface *surface);
static void QZ_UnlockHWSurface(_THIS, SDL_Surface *surface);
static void QZ_FreeHWSurface (_THIS, SDL_Surface *surface);
/* static int QZ_FlipHWSurface (_THIS, SDL_Surface *surface); */
/* Gamma Functions */
static int QZ_SetGamma (_THIS, float red, float green, float blue);
static int QZ_GetGamma (_THIS, float *red, float *green, float *blue);
static int QZ_SetGammaRamp (_THIS, Uint16 *ramp);
static int QZ_GetGammaRamp (_THIS, Uint16 *ramp);
/* OpenGL functions */
static int QZ_SetupOpenGL (_THIS, int bpp, Uint32 flags);
static void QZ_TearDownOpenGL (_THIS);
static void* QZ_GL_GetProcAddress (_THIS, const char *proc);
static int QZ_GL_GetAttribute (_THIS, SDL_GLattr attrib, int* value);
static int QZ_GL_MakeCurrent (_THIS);
static void QZ_GL_SwapBuffers (_THIS);
static int QZ_GL_LoadLibrary (_THIS, const char *location);
/* Private function to warp the cursor (used internally) */
static void QZ_PrivateWarpCursor (_THIS, int fullscreen, int h, int x, int y);
/* Cursor and Mouse functions */
static void QZ_FreeWMCursor (_THIS, WMcursor *cursor);
static WMcursor* QZ_CreateWMCursor (_THIS, Uint8 *data, Uint8 *mask,
int w, int h, int hot_x, int hot_y);
static int QZ_ShowWMCursor (_THIS, WMcursor *cursor);
static void QZ_WarpWMCursor (_THIS, Uint16 x, Uint16 y);
static void QZ_MoveWMCursor (_THIS, int x, int y);
static void QZ_CheckMouseMode (_THIS);
/* Event functions */
static void QZ_InitOSKeymap (_THIS);
static void QZ_PumpEvents (_THIS);
/* Window Manager functions */
static void QZ_SetCaption (_THIS, const char *title, const char *icon);
static void QZ_SetIcon (_THIS, SDL_Surface *icon, Uint8 *mask);
static int QZ_IconifyWindow (_THIS);
static SDL_GrabMode QZ_GrabInput (_THIS, SDL_GrabMode grab_mode);
/*static int QZ_GetWMInfo (_THIS, SDL_SysWMinfo *info);*/
src/video/quartz/SDL_QuartzVideo.m 0 → 100644
View file @ 72f7279b
This diff is collapsed.
src/video/quartz/SDL_QuartzWM.m 0 → 100644
View file @ 72f7279b
/*
SDL - Simple DirectMedia Layer
Copyright (C) 1997, 1998, 1999, 2000, 2001 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@devolution.com
*/
struct WMcursor {
Cursor curs;
};
static void QZ_FreeWMCursor (_THIS, WMcursor *cursor) {
if ( cursor != NULL )
free (cursor);
}
/* Use the Carbon cursor routines for now */
static WMcursor* QZ_CreateWMCursor (_THIS, Uint8 *data, Uint8 *mask,
int w, int h, int hot_x, int hot_y) {
WMcursor *cursor;
int row, bytes;
cursor = (WMcursor *)malloc(sizeof(WMcursor));
if ( cursor == NULL ) {
SDL_OutOfMemory();
return(NULL);
}
memset(cursor, 0, sizeof(*cursor));
bytes = (w/8);
if ( bytes > 2 ) {
bytes = 2;
}
for ( row=0; row<h && (row < 16); ++row ) {
memcpy(&cursor->curs.data[row], data, bytes);
data += w/8;
}
for ( row=0; row<h && (row < 16); ++row ) {
memcpy(&cursor->curs.mask[row], mask, bytes);
mask += w/8;
}
cursor->curs.hotSpot.h = hot_x;
cursor->curs.hotSpot.v = hot_y;
return(cursor);
}
static int QZ_ShowWMCursor (_THIS, WMcursor *cursor) {
static int visible = 1;
if ( cursor == NULL) {
if ( visible ) {
HideCursor ();
visible = 0;
}
}
else {
SetCursor(&cursor->curs);
if ( ! visible ) {
ShowCursor ();
visible = 1;
}
}
return 1;
}
static void QZ_PrivateWarpCursor (_THIS, int fullscreen, int h, int x, int y) {
CGPoint p;
/* We require absolute screen coordiates for our warp */
p.x = x;
p.y = h - y;
if ( fullscreen )
/* Already absolute coordinates */
CGDisplayMoveCursorToPoint(display_id, p);
else {
/* Convert to absolute screen coordinates */
NSPoint base, screen;
base = NSMakePoint (p.x, p.y);
screen = [ window convertBaseToScreen:base ];
p.x = screen.x;
p.y = device_height - screen.y;
CGDisplayMoveCursorToPoint (display_id, p);
}
}
static void QZ_WarpWMCursor (_THIS, Uint16 x, Uint16 y) {
/* Only allow warping when in foreground */
if ( ! inForeground )
return;
/* Do the actual warp */
QZ_PrivateWarpCursor (this, SDL_VideoSurface->flags & SDL_FULLSCREEN,
SDL_VideoSurface->h, x, y);
/* Generate mouse moved event */
SDL_PrivateMouseMotion (SDL_RELEASED, 0, x, y);
}
static void QZ_MoveWMCursor (_THIS, int x, int y) { }
static void QZ_CheckMouseMode (_THIS) { }
static void QZ_SetCaption (_THIS, const char *title, const char *icon) {
NSString *str = [ [ NSString alloc ] initWithCString:title ];
if (window != nil)
[ window setTitle:str ];
[ windowTitle release ];
windowTitle = str;
}
static void QZ_SetIcon (_THIS, SDL_Surface *icon, Uint8 *mask) {
/* Convert icon/mask to NSImage, assign with NSWindow's setMiniwindowImage method */
}
static int QZ_IconifyWindow (_THIS) {
/* Bug! minimize erases the framebuffer */
if ( ! [ window isMiniaturized ] ) {
[ window miniaturize:nil ];
return 1;
}
else {
SDL_SetError ("window already iconified");
return 0;
}
}
/*
static int QZ_GetWMInfo (_THIS, SDL_SysWMinfo *info) {
info->nsWindowPtr = window;
return 0;
}*/
static SDL_GrabMode QZ_GrabInput (_THIS, SDL_GrabMode grab_mode) {
switch (grab_mode) {
case SDL_GRAB_QUERY:
break;
case SDL_GRAB_OFF:
CGAssociateMouseAndMouseCursorPosition (1);
currentGrabMode = SDL_GRAB_OFF;
break;
case SDL_GRAB_ON:
QZ_WarpWMCursor (this, SDL_VideoSurface->w / 2, SDL_VideoSurface->h / 2);
CGAssociateMouseAndMouseCursorPosition (0);
currentGrabMode = SDL_GRAB_ON;
break;
case SDL_GRAB_FULLSCREEN:
break;
}
return currentGrabMode;
}
src/video/quartz/SDL_QuartzWindow.m 0 → 100644
View file @ 72f7279b
/* Subclass of NSWindow to allow customization if we need it */
@interface SDL_QuartzWindow : NSWindow
{}
- (void)miniaturize:(id)sender;
- (void)deminiaturize:(id)sender;
@end
@implementation SDL_QuartzWindow
/* These methods should be rewritten to fix the miniaturize bug */
- (void)miniaturize:(id)sender
{
[ super miniaturize:sender ];
}
- (void)deminiaturize:(id)sender
{
/* Let the app know they have to redraw everything */
SDL_PrivateExpose ();
[ super deminiaturize:sender ];
}
@end
test/testtypes.c
View file @ 72f7279b
#include <stdio.h> #include <stdio.h>
#include "SDL_main.h"
#include "SDL_types.h" #include "SDL_types.h"
int main(int argc, char *argv[]) int main(int argc, char *argv[])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment