Mercurial > sdl-ios-xcode
view src/video/Xext/extensions/xf86vmode.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 | 585a7e1285ae |
children | 782fd950bd46 c121d94672cb |
line wrap: on
line source
/* $XFree86: xc/include/extensions/xf86vmode.h,v 3.30 2001/05/07 20:09:50 mvojkovi Exp $ */ /* Copyright 1995 Kaleb S. KEITHLEY Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL Kaleb S. KEITHLEY BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. Except as contained in this notice, the name of Kaleb S. KEITHLEY shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from Kaleb S. KEITHLEY */ /* $Xorg: xf86vmode.h,v 1.3 2000/08/18 04:05:46 coskrey Exp $ */ /* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */ #ifndef _XF86VIDMODE_H_ #define _XF86VIDMODE_H_ #include <X11/Xfuncproto.h> #include <X11/Xmd.h> #include "SDL_name.h" #define X_XF86VidModeQueryVersion 0 #define X_XF86VidModeGetModeLine 1 #define X_XF86VidModeModModeLine 2 #define X_XF86VidModeSwitchMode 3 #define X_XF86VidModeGetMonitor 4 #define X_XF86VidModeLockModeSwitch 5 #define X_XF86VidModeGetAllModeLines 6 #define X_XF86VidModeAddModeLine 7 #define X_XF86VidModeDeleteModeLine 8 #define X_XF86VidModeValidateModeLine 9 #define X_XF86VidModeSwitchToMode 10 #define X_XF86VidModeGetViewPort 11 #define X_XF86VidModeSetViewPort 12 /* new for version 2.x of this extension */ #define X_XF86VidModeGetDotClocks 13 #define X_XF86VidModeSetClientVersion 14 #define X_XF86VidModeSetGamma 15 #define X_XF86VidModeGetGamma 16 #define X_XF86VidModeGetGammaRamp 17 #define X_XF86VidModeSetGammaRamp 18 #define X_XF86VidModeGetGammaRampSize 19 #define CLKFLAG_PROGRAMABLE 1 #ifdef XF86VIDMODE_EVENTS #define XF86VidModeNotify 0 #define XF86VidModeNumberEvents (XF86VidModeNotify + 1) #define XF86VidModeNotifyMask 0x00000001 #define XF86VidModeNonEvent 0 #define XF86VidModeModeChange 1 #else #define XF86VidModeNumberEvents 0 #endif #define XF86VidModeBadClock 0 #define XF86VidModeBadHTimings 1 #define XF86VidModeBadVTimings 2 #define XF86VidModeModeUnsuitable 3 #define XF86VidModeExtensionDisabled 4 #define XF86VidModeClientNotLocal 5 #define XF86VidModeZoomLocked 6 #define XF86VidModeNumberErrors (XF86VidModeZoomLocked + 1) #ifndef _XF86VIDMODE_SERVER_ typedef struct { unsigned short hdisplay; unsigned short hsyncstart; unsigned short hsyncend; unsigned short htotal; unsigned short hskew; unsigned short vdisplay; unsigned short vsyncstart; unsigned short vsyncend; unsigned short vtotal; unsigned int flags; int privsize; #if defined(__cplusplus) || defined(c_plusplus) /* private is a C++ reserved word */ INT32 *c_private; #else INT32 *private; #endif } SDL_NAME(XF86VidModeModeLine); typedef struct { unsigned int dotclock; unsigned short hdisplay; unsigned short hsyncstart; unsigned short hsyncend; unsigned short htotal; unsigned short hskew; unsigned short vdisplay; unsigned short vsyncstart; unsigned short vsyncend; unsigned short vtotal; unsigned int flags; int privsize; #if defined(__cplusplus) || defined(c_plusplus) /* private is a C++ reserved word */ INT32 *c_private; #else INT32 *private; #endif } SDL_NAME(XF86VidModeModeInfo); typedef struct { float hi; float lo; } SDL_NAME(XF86VidModeSyncRange); typedef struct { char* vendor; char* model; float EMPTY; unsigned char nhsync; SDL_NAME(XF86VidModeSyncRange)* hsync; unsigned char nvsync; SDL_NAME(XF86VidModeSyncRange)* vsync; } SDL_NAME(XF86VidModeMonitor); typedef struct { int type; /* of event */ unsigned long serial; /* # of last request processed by server */ Bool send_event; /* true if this came from a SendEvent req */ Display *display; /* Display the event was read from */ Window root; /* root window of event screen */ int state; /* What happened */ int kind; /* What happened */ Bool forced; /* extents of new region */ Time time; /* event timestamp */ } SDL_NAME(XF86VidModeNotifyEvent); typedef struct { float red; /* Red Gamma value */ float green; /* Green Gamma value */ float blue; /* Blue Gamma value */ } SDL_NAME(XF86VidModeGamma); #define SDL_XF86VidModeSelectNextMode(disp, scr) \ SDL_NAME(XF86VidModeSwitchMode)(disp, scr, 1) #define SDL_XF86VidModeSelectPrevMode(disp, scr) \ SDL_NAME(XF86VidModeSwitchMode)(disp, scr, -1) _XFUNCPROTOBEGIN Bool SDL_NAME(XF86VidModeQueryVersion)( Display* /* dpy */, int* /* majorVersion */, int* /* minorVersion */ ); Bool SDL_NAME(XF86VidModeQueryExtension)( Display* /* dpy */, int* /* event_base */, int* /* error_base */ ); Bool SDL_NAME(XF86VidModeSetClientVersion)( Display* /* dpy */ ); Bool SDL_NAME(XF86VidModeGetModeLine)( Display* /* dpy */, int /* screen */, int* /* dotclock */, SDL_NAME(XF86VidModeModeLine)* /* modeline */ ); Bool SDL_NAME(XF86VidModeGetAllModeLines)( Display* /* dpy */, int /* screen */, int* /* modecount */, SDL_NAME(XF86VidModeModeInfo)*** /* modelinesPtr */ ); Bool SDL_NAME(XF86VidModeAddModeLine)( Display* /* dpy */, int /* screen */, SDL_NAME(XF86VidModeModeInfo)* /* new modeline */, SDL_NAME(XF86VidModeModeInfo)* /* after modeline */ ); Bool SDL_NAME(XF86VidModeDeleteModeLine)( Display* /* dpy */, int /* screen */, SDL_NAME(XF86VidModeModeInfo)* /* modeline */ ); Bool SDL_NAME(XF86VidModeModModeLine)( Display* /* dpy */, int /* screen */, SDL_NAME(XF86VidModeModeLine)* /* modeline */ ); Status SDL_NAME(XF86VidModeValidateModeLine)( Display* /* dpy */, int /* screen */, SDL_NAME(XF86VidModeModeInfo)* /* modeline */ ); Bool SDL_NAME(XF86VidModeSwitchMode)( Display* /* dpy */, int /* screen */, int /* zoom */ ); Bool SDL_NAME(XF86VidModeSwitchToMode)( Display* /* dpy */, int /* screen */, SDL_NAME(XF86VidModeModeInfo)* /* modeline */ ); Bool SDL_NAME(XF86VidModeLockModeSwitch)( Display* /* dpy */, int /* screen */, int /* lock */ ); Bool SDL_NAME(XF86VidModeGetMonitor)( Display* /* dpy */, int /* screen */, SDL_NAME(XF86VidModeMonitor)* /* monitor */ ); Bool SDL_NAME(XF86VidModeGetViewPort)( Display* /* dpy */, int /* screen */, int* /* x return */, int* /* y return */ ); Bool SDL_NAME(XF86VidModeSetViewPort)( Display* /* dpy */, int /* screen */, int /* x */, int /* y */ ); Bool SDL_NAME(XF86VidModeGetDotClocks)( Display* /* dpy */, int /* screen */, int* /* flags return */, int* /* number of clocks return */, int* /* max dot clock return */, int** /* clocks return */ ); Bool SDL_NAME(XF86VidModeGetGamma)( Display* /* dpy */, int /* screen */, SDL_NAME(XF86VidModeGamma)* /* Gamma */ ); Bool SDL_NAME(XF86VidModeSetGamma)( Display* /* dpy */, int /* screen */, SDL_NAME(XF86VidModeGamma)* /* Gamma */ ); Bool SDL_NAME(XF86VidModeSetGammaRamp)( Display* /* dpy */, int /* screen */, int /* size */, unsigned short* /* red array */, unsigned short* /* green array */, unsigned short* /* blue array */ ); Bool SDL_NAME(XF86VidModeGetGammaRamp)( Display* /* dpy */, int /* screen */, int /* size */, unsigned short* /* red array */, unsigned short* /* green array */, unsigned short* /* blue array */ ); Bool SDL_NAME(XF86VidModeGetGammaRampSize)( Display* /* dpy */, int /* screen */, int* /* size */ ); _XFUNCPROTOEND #endif #endif