view src/video/nanox/SDL_nxvideo.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 b8d311d90021
children 19418e4422cb
line wrap: on
line source

/*
    SDL - Simple DirectMedia Layer
    Copyright (C) 1997-2004 Sam Lantinga
    Copyright (C) 2001  Hsieh-Fu Tsai

    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
    
    Hsieh-Fu Tsai
    clare@setabox.com
*/

#ifndef _SDL_nxvideo_h
#define _SDL_nxvideo_h

#include <microwin/nano-X.h>

#include "SDL_sysvideo.h"

#ifdef ENABLE_NANOX_DEBUG
#define Dprintf printf
#else
#define Dprintf(ignore...)
#endif

// Hidden "this" pointer for the video functions
#define _THIS   SDL_VideoDevice * this

// Private display data
typedef struct NX_SDL_VISUAL {
    int    bpp ;
    Uint32 red_mask ;
    Uint32 green_mask ;
    Uint32 blue_mask ;
} nx_sdl_visual_t ;

struct SDL_PrivateVideoData {
    GR_WINDOW_ID    SDL_Window ;
    GR_WINDOW_ID    FSwindow ;
    // Flag: true if we have been passed a window
    char            * SDL_windowid ;
    GR_GC_ID        GC ;
    unsigned char   * Image ;
    unsigned char   * Image_buff ;	/* for GrArea*/
    unsigned char   * Clientfb;		/* for DirectFB*/
    nx_sdl_visual_t SDL_Visual ;
    // The current list of available video modes
    SDL_Rect        ** modelist ;
    int             currently_fullscreen ;
    // for fullscreen
    int             OffsetX, OffsetY ;
    // for GammaRamp
    Uint16          * GammaRamp_R, * GammaRamp_G, * GammaRamp_B ;
    // for GrArea, r_mask, g_mask, b_mask
    int             pixel_type ;
#ifdef ENABLE_NANOX_DIRECT_FB
    GR_WINDOW_FB_INFO fbinfo;
#endif
} ;

#define SDL_Window           (this -> hidden -> SDL_Window)
#define FSwindow             (this -> hidden -> FSwindow)
#define SDL_windowid         (this -> hidden -> SDL_windowid)
#define SDL_GC               (this -> hidden -> GC)
#define SDL_Image            (this -> hidden -> Image)
#define Image_buff           (this -> hidden -> Image_buff)
#define Clientfb             (this -> hidden -> Clientfb)
#define SDL_Visual           (this -> hidden -> SDL_Visual)
#define SDL_modelist         (this -> hidden -> modelist)
#define currently_fullscreen (this -> hidden -> currently_fullscreen)
#define OffsetX              (this -> hidden -> OffsetX)
#define OffsetY              (this -> hidden -> OffsetY)
#define GammaRamp_R          (this -> hidden -> GammaRamp_R)
#define GammaRamp_G          (this -> hidden -> GammaRamp_G)
#define GammaRamp_B          (this -> hidden -> GammaRamp_B)
#define pixel_type           (this -> hidden -> pixel_type)
#define fbinfo               (this -> hidden -> fbinfo)

#define CI_SIZE 256   // color index size

#endif  // _SDL_nxvideo_h