Mercurial > sdl-ios-xcode
view src/video/xbios/SDL_xbios.h @ 1133:609c060fd2a2
The MacOSX Carbon/Cocoa/X11 all in one library patch. Relevant emails:
To: SDL Developers <sdl@libsdl.org>
From: =?ISO-8859-1?Q?Anders_F_Bj=F6rklund?= <afb@algonet.se>
Date: Mon, 30 May 2005 23:29:04 +0200
Subject: [SDL] Mac OS X Video Drivers [patch]
I've updated/added the Carbon and X11 video drivers
to the Mac OS X port of SDL 1.2 (the CVS version),
and made the Cocoa driver and runtime *optional*.
The default is still Cocoa, and the "Quartz" driver.
But you can now also use "toolbox" for Carbon, and
"x11" for running with Apple's (or other) X11 server:
export SDL_VIDEODRIVER=x11
export SDL_VIDEO_GL_DRIVER=/usr/X11R6/lib/libGL.dylib
It also checks if the frameworks are available, by a:
#include <Carbon/Carbon.h> or #import <Cocoa/Cocoa.h>
(this should make it configure on plain Darwin as well?)
Here are the new configure targets:
--enable-video-cocoa use Cocoa/Quartz video driver default=yes
--enable-video-carbon use Carbon/QuickDraw video driver default=yes
--enable-video-x11 use X11 video driver default=no
./configure --enable-video-cocoa --enable-video-carbon
--enable-video-x11 \
--x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib
The Carbon version is just an updated version of the old
SDL driver for Mac OS 9, and could probably be improved...
(but it does work, including the Carbon version of SDLmain)
If you disable cocoa, you can run with -framework Carbon only,
and the C version of SDL_main.c. And if you disable carbon too,
you can still use the X11 version which doesn't require SDLmain.
I updated the DrawSprocket version, but did not include it.
(no blitters or VRAM GWorlds etc. available on OS X anyway)
Besides for Mac OS 9, I don't think there's any use for it ?
And note that any performance on Mac OS X equals OpenGL anyway...
You can get "fair" software SDL results on captured CG displays,
but for decent frame rates you need to be using GL for rendering.
Finally, here is the patch itself:
http://www.algonet.se/~afb/SDL-12CVS-macvideo.patch
--anders
PS. It says "video", but as usual it applies to mouse/keyboard too.
------
To: A list for developers using the SDL library <sdl@libsdl.org>
From: =?ISO-8859-1?Q?Anders_F_Bj=F6rklund?= <afb@algonet.se>
Date: Sun, 4 Sep 2005 10:02:15 +0200
Subject: [SDL] Updated Mac patch
Updated the previous Mac patch to disable Carbon by default.
Also "fixed" the SDL.spec again, so that it builds on Darwin.
http://www.algonet.se/~afb/SDL-1.2.9-mac.patch
Also applied fine to SDL12 CVS, when I tried it.
author | Ryan C. Gordon <icculus@icculus.org> |
---|---|
date | Thu, 08 Sep 2005 06:16:14 +0000 |
parents | fba6b67b4d60 |
children | c9b51268668f |
line wrap: on
line source
/* SDL - Simple DirectMedia Layer Copyright (C) 1997-2004 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 */ #ifdef SAVE_RCSID static char rcsid = "@(#) $Id$"; #endif #ifndef _SDL_xbios_h #define _SDL_xbios_h #include "SDL_types.h" #include "SDL_sysvideo.h" /* Hidden "this" pointer for the video functions */ #define _THIS SDL_VideoDevice *this /* TT video modes: 2 Falcon RVB: 16 (could be *2 by adding PAL/NTSC modes) Falcon VGA: 6 ST low: 1 */ #define SDL_NUMMODES 16 typedef struct { Uint16 number; /* Video mode number */ Uint16 width; /* Size */ Uint16 height; Uint16 depth; /* bits per plane */ SDL_bool doubleline; /* Double the lines ? */ } xbiosmode_t; /* Private display data */ #define NUM_MODELISTS 2 /* 8 and 16 bits-per-pixel */ struct SDL_PrivateVideoData { long cookie_vdo; int old_video_mode; /* Old video mode before entering SDL */ void *old_video_base; /* Old pointer to screen buffer */ void *old_palette; /* Old palette */ Uint32 old_num_colors; /* Nb of colors in saved palette */ int num_modes; /* Number of xbios video modes */ xbiosmode_t *mode_list; /* List of xbios video modes */ void *screens[2]; /* Pointers to aligned screen buffer */ void *screensmem[2]; /* Pointers to screen buffer */ void *shadowscreen; /* Shadow screen for c2p conversion */ int doubleline; /* Double line mode ? */ int frame_number; /* Number of frame for double buffer */ int pitch; /* Destination line width for C2P */ int width, height; /* Screen size for centered C2P */ SDL_bool centscreen; /* Centscreen extension present ? */ SDL_Rect *SDL_modelist[NUM_MODELISTS][SDL_NUMMODES+1]; xbiosmode_t *videomodes[NUM_MODELISTS][SDL_NUMMODES+1]; }; /* _VDO cookie values */ enum { VDO_ST=0, VDO_STE, VDO_TT, VDO_F30 }; /* Monitor types */ enum { MONITOR_MONO=0, MONITOR_TV, MONITOR_VGA, MONITOR_RGB }; /* EgetShift masks */ #define ES_BANK 0x000f #define ES_MODE 0x0700 #define ES_GRAY 0x1000 #define ES_SMEAR 0x8000 /* TT shifter modes */ #define ST_LOW 0x0000 #define ST_MED 0x0100 #define ST_HIGH 0x0200 #define TT_LOW 0x0700 #define TT_MED 0x0300 #define TT_HIGH 0x0600 /* Hidden structure -> variables names */ #define SDL_modelist (this->hidden->SDL_modelist) #define XBIOS_mutex (this->hidden->mutex) #define XBIOS_cvdo (this->hidden->cookie_vdo) #define XBIOS_oldpalette (this->hidden->old_palette) #define XBIOS_oldnumcol (this->hidden->old_num_colors) #define XBIOS_oldvbase (this->hidden->old_video_base) #define XBIOS_oldvmode (this->hidden->old_video_mode) #define XBIOS_nummodes (this->hidden->num_modes) #define XBIOS_modelist (this->hidden->mode_list) #define XBIOS_screens (this->hidden->screens) #define XBIOS_screensmem (this->hidden->screensmem) #define XBIOS_shadowscreen (this->hidden->shadowscreen) #define XBIOS_videomodes (this->hidden->videomodes) #define XBIOS_doubleline (this->hidden->doubleline) #define XBIOS_fbnum (this->hidden->frame_number) #define XBIOS_pitch (this->hidden->pitch) #define XBIOS_width (this->hidden->width) #define XBIOS_height (this->hidden->height) #define XBIOS_centscreen (this->hidden->centscreen) /*--- Functions prototypes ---*/ void SDL_XBIOS_AddMode(_THIS, Uint16 modecode, Uint16 width, Uint16 height, Uint16 depth, SDL_bool flags); #endif /* _SDL_xbios_h */