2001-06-07 14:28:11 +00:00
|
|
|
/*
|
|
|
|
SDL - Simple DirectMedia Layer
|
2008-12-08 00:25:42 +00:00
|
|
|
Copyright (C) 1997-2009 Sam Lantinga
|
2001-06-07 14:28:11 +00:00
|
|
|
|
|
|
|
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
|
2001-12-14 12:38:15 +00:00
|
|
|
slouken@libsdl.org
|
2001-06-07 14:28:11 +00:00
|
|
|
*/
|
2006-02-21 08:47:46 +00:00
|
|
|
#include "SDL_config.h"
|
2001-06-07 14:28:11 +00:00
|
|
|
|
|
|
|
#include "SDL_QuartzVideo.h"
|
2004-01-04 14:55:35 +00:00
|
|
|
#include "SDL_QuartzWindow.h"
|
2001-06-07 14:28:11 +00:00
|
|
|
|
2011-09-14 13:35:10 -04:00
|
|
|
#if (MAC_OS_X_VERSION_MIN_REQUIRED < 1060) /* Fixed in Snow Leopard */
|
2009-09-21 06:08:23 +00:00
|
|
|
/*
|
2004-01-04 14:55:35 +00:00
|
|
|
Add methods to get at private members of NSScreen.
|
|
|
|
Since there is a bug in Apple's screen switching code
|
|
|
|
that does not update this variable when switching
|
|
|
|
to fullscreen, we'll set it manually (but only for the
|
|
|
|
main screen).
|
|
|
|
*/
|
|
|
|
@interface NSScreen (NSScreenAccess)
|
|
|
|
- (void) setFrame:(NSRect)frame;
|
|
|
|
@end
|
|
|
|
|
|
|
|
@implementation NSScreen (NSScreenAccess)
|
|
|
|
- (void) setFrame:(NSRect)frame;
|
|
|
|
{
|
|
|
|
_frame = frame;
|
|
|
|
}
|
|
|
|
@end
|
2009-09-21 06:08:23 +00:00
|
|
|
static inline void QZ_SetFrame(NSScreen *nsscreen, NSRect frame)
|
|
|
|
{
|
|
|
|
[nsscreen setFrame:frame];
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
static inline void QZ_SetFrame(NSScreen *nsscreen, NSRect frame)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
#endif
|
2004-01-04 14:55:35 +00:00
|
|
|
|
2007-12-29 21:31:26 +00:00
|
|
|
@interface SDLTranslatorResponder : NSTextView
|
|
|
|
{
|
|
|
|
}
|
|
|
|
- (void) doCommandBySelector:(SEL)myselector;
|
|
|
|
@end
|
|
|
|
|
|
|
|
@implementation SDLTranslatorResponder
|
|
|
|
- (void) doCommandBySelector:(SEL) myselector {}
|
|
|
|
@end
|
|
|
|
|
2009-09-21 06:08:23 +00:00
|
|
|
/* absent in 10.3.9. */
|
|
|
|
CG_EXTERN CGImageRef CGBitmapContextCreateImage (CGContextRef);
|
2004-01-04 14:55:35 +00:00
|
|
|
|
|
|
|
/* 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);
|
2006-02-07 11:18:21 +00:00
|
|
|
static void QZ_UnsetVideoMode (_THIS, BOOL to_desktop);
|
2004-01-04 14:55:35 +00:00
|
|
|
|
|
|
|
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);
|
|
|
|
|
2011-09-13 20:30:48 -04:00
|
|
|
#if (MAC_OS_X_VERSION_MIN_REQUIRED < 1070)
|
|
|
|
static int QZ_LockDoubleBuffer (_THIS, SDL_Surface *surface);
|
|
|
|
static void QZ_UnlockDoubleBuffer (_THIS, SDL_Surface *surface);
|
|
|
|
static int QZ_ThreadFlip (_THIS);
|
|
|
|
static int QZ_FlipDoubleBuffer (_THIS, SDL_Surface *surface);
|
|
|
|
static void QZ_DoubleBufferUpdate (_THIS, int num_rects, SDL_Rect *rects);
|
|
|
|
static void QZ_DirectUpdate (_THIS, int num_rects, SDL_Rect *rects);
|
|
|
|
#endif
|
|
|
|
|
2004-01-04 14:55:35 +00:00
|
|
|
static void QZ_UpdateRects (_THIS, int num_rects, SDL_Rect *rects);
|
|
|
|
static void QZ_VideoQuit (_THIS);
|
|
|
|
|
|
|
|
static int QZ_LockHWSurface(_THIS, SDL_Surface *surface);
|
|
|
|
static void QZ_UnlockHWSurface(_THIS, SDL_Surface *surface);
|
Patch by me to fix crash described below.
--ryan.
To: sdl@libsdl.org
From: Rainer Deyke <rainerd@eldwood.com>
Date: Tue, 16 Aug 2005 01:08:18 -0600
Subject: [SDL] Bug report: SDL_CreateRGBSurface with SDL_HWSURFACE crashes
If SDL is in full-screen mode with a hardware video surface on OS X,
SDL_CreateRGBSurface with SDL_HWSURFACE crashes. The crash occurs on
line 109 of SDL_Surface.c. This was tested on OS X 10.3.9 with both SDL
1.2.8 and the latest CVS. Here is a small C++ program that demonstrates
the problem:
#include "SDL.h"
#include <stdio.h>
namespace {
void wait_for_key()
{
SDL_Event e;
printf("%d\n", SDL_GetAppState());
while (SDL_WaitEvent(&e)) {
if (e.type == SDL_KEYDOWN || e.type == SDL_QUIT) return;
}
}
}
int main(int, char *[])
{
SDL_Init(SDL_INIT_VIDEO);
SDL_Surface *screen
= SDL_SetVideoMode(640, 480, 32, SDL_FULLSCREEN | SDL_HWSURFACE);
SDL_Surface *s = SDL_CreateRGBSurface(SDL_HWSURFACE, 640, 480, 32,
screen->format->Rmask, screen->format->Gmask,
screen->format->Bmask, screen->format->Amask);
wait_for_key();
if (s) SDL_FreeSurface(s);
SDL_Quit();
printf("Success!\n");
return 0;
}
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401121
2005-08-18 06:46:32 +00:00
|
|
|
static int QZ_AllocHWSurface(_THIS, SDL_Surface *surface);
|
2004-01-04 14:55:35 +00:00
|
|
|
static void QZ_FreeHWSurface (_THIS, SDL_Surface *surface);
|
2001-06-07 14:28:11 +00:00
|
|
|
|
|
|
|
/* Bootstrap binding, enables entry point into the driver */
|
|
|
|
VideoBootStrap QZ_bootstrap = {
|
2002-01-22 18:46:28 +00:00
|
|
|
"Quartz", "Mac OS X CoreGraphics", QZ_Available, QZ_CreateDevice
|
2001-06-07 14:28:11 +00:00
|
|
|
};
|
|
|
|
|
2011-09-14 03:12:48 -04:00
|
|
|
/* Disable compiler warnings we can't avoid. */
|
|
|
|
#if (defined(__GNUC__) && (__GNUC__ >= 4))
|
2011-09-14 03:23:35 -04:00
|
|
|
# if (MAC_OS_X_VERSION_MAX_ALLOWED <= 1070)
|
|
|
|
# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
|
2011-09-14 03:12:48 -04:00
|
|
|
# endif
|
|
|
|
#endif
|
|
|
|
|
2011-09-13 20:30:48 -04:00
|
|
|
static inline BOOL IS_LION_OR_LATER(_THIS)
|
|
|
|
{
|
|
|
|
return (system_version >= 0x1070);
|
|
|
|
}
|
|
|
|
|
2011-08-23 06:04:54 -04:00
|
|
|
static inline BOOL IS_SNOW_LEOPARD_OR_LATER(_THIS)
|
|
|
|
{
|
|
|
|
return (system_version >= 0x1060);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void QZ_ReleaseDisplayMode(_THIS, const void *moderef)
|
|
|
|
{
|
|
|
|
/* we only own these references in the 10.6+ API. */
|
2011-08-25 03:04:24 -04:00
|
|
|
#if (MAC_OS_X_VERSION_MAX_ALLOWED >= 1060)
|
2011-09-16 01:37:44 -04:00
|
|
|
if (use_new_mode_apis) {
|
2011-08-23 06:04:54 -04:00
|
|
|
CGDisplayModeRelease((CGDisplayModeRef) moderef);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
static void QZ_ReleaseDisplayModeList(_THIS, CFArrayRef mode_list)
|
|
|
|
{
|
|
|
|
/* we only own these references in the 10.6+ API. */
|
2011-08-25 03:04:24 -04:00
|
|
|
#if (MAC_OS_X_VERSION_MAX_ALLOWED >= 1060)
|
2011-09-16 01:37:44 -04:00
|
|
|
if (use_new_mode_apis) {
|
2011-08-23 06:04:54 -04:00
|
|
|
CFRelease(mode_list);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-06-07 14:28:11 +00:00
|
|
|
/* Bootstrap functions */
|
2009-10-10 14:59:32 +00:00
|
|
|
static int QZ_Available ()
|
|
|
|
{
|
2001-06-07 14:28:11 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2009-10-10 14:59:32 +00:00
|
|
|
static SDL_VideoDevice* QZ_CreateDevice (int device_index)
|
|
|
|
{
|
2002-01-22 18:46:28 +00:00
|
|
|
#pragma unused (device_index)
|
2001-06-07 14:28:11 +00:00
|
|
|
|
|
|
|
SDL_VideoDevice *device;
|
|
|
|
SDL_PrivateVideoData *hidden;
|
|
|
|
|
2006-05-01 11:07:04 +00:00
|
|
|
device = (SDL_VideoDevice*) SDL_malloc (sizeof (*device) );
|
|
|
|
hidden = (SDL_PrivateVideoData*) SDL_malloc (sizeof (*hidden) );
|
2001-06-07 14:28:11 +00:00
|
|
|
|
|
|
|
if (device == NULL || hidden == NULL)
|
|
|
|
SDL_OutOfMemory ();
|
|
|
|
|
2006-05-01 11:07:04 +00:00
|
|
|
SDL_memset (device, 0, sizeof (*device) );
|
|
|
|
SDL_memset (hidden, 0, sizeof (*hidden) );
|
2002-01-22 18:46:28 +00:00
|
|
|
|
2001-06-07 14:28:11 +00:00
|
|
|
device->hidden = hidden;
|
|
|
|
|
|
|
|
device->VideoInit = QZ_VideoInit;
|
|
|
|
device->ListModes = QZ_ListModes;
|
|
|
|
device->SetVideoMode = QZ_SetVideoMode;
|
|
|
|
device->ToggleFullScreen = QZ_ToggleFullScreen;
|
To: sdl@libsdl.org
From: Christian Walther <cwalther@gmx.ch>
Date: Thu, 15 Dec 2005 21:19:53 +0100
Subject: [SDL] More mouse enhancements for Mac OS X
The attached patch brings two more enhancements to mouse handling on Mac
OS X (Quartz):
1. Currently, after launching an SDL application, SDL's notion of the
mouse position is stuck in the top left corner (0,0) until the first
time the mouse is moved. That's because the UpdateMouse() function isn't
implemented in the Quartz driver. This patch adds it.
2. When grabbing input while the mouse cursor is hidden, the function
CGAssociateMouseAndMouseCursorPosition(0) is called, which prevents the
system's notion of the mouse location from moving (and therefore leaving
the SDL window) even when the mouse is moved. However, apparently the
Wacom tablet driver (and maybe other special pointing device drivers)
doesn't care about that setting and still allows the mouse location to
go outside of the window. Interestingly, the system cursor, which is
made visible by the existing code in SDL in that case, does not follow
the mouse location, but appears in the middle of the SDL window. The
mouse location being outside of the window however means that mouse
button events go to background applications (or the dock or whatever is
there), which is very confusing to the user who sees no cursor outside
of the SDL window.
I have not found any way of intercepting these events (and that's
probably by design, as "normal" applications shouldn't prevent the user
from bringing other applications' windows to the front by clicking on
them). An idea would be placing a fully transparent, screen-filling
window in front of everything, but I fear that this might affect
rendering performance (by doing unnecessary compositing, using up
memory, or whatever).
The deluxe solution to the problem would be talking to the tablet
driver using AppleEvents to tell it to constrain its mapped area to the
window (see Wacom's "TabletEventDemo" sample app,
http://www.wacomeng.com/devsupport/mac/downloads.html), but I think that
the bloat that solution would add to SDL would outweigh its usefulness.
What I did instead in my patch is reassociating mouse and cursor when
the mouse leaves the window while an invisible grab is in effect, and
restoring the grab when the window is entered. That way, the grab can
still be effectively broken by a tablet, but at least it's obvious to
the user that it is broken. That change is minimal - it doesn't affect
operation with a mouse (or a trackpad), and the code that it adds is not
executed on every PumpEvents() call, only when entering and leaving the
window.
Unless there are any concerns about the patch, please apply. Feel free
to shorten the lengthy comment in SDL_QuartzEvents.m if you think it's
too verbose.
Thanks
-Christian
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401215
2006-01-02 00:31:00 +00:00
|
|
|
device->UpdateMouse = QZ_UpdateMouse;
|
2001-06-07 14:28:11 +00:00
|
|
|
device->SetColors = QZ_SetColors;
|
2011-09-13 20:30:48 -04:00
|
|
|
/* device->UpdateRects = QZ_UpdateRects; this is determined by SetVideoMode() */
|
2001-06-07 14:28:11 +00:00
|
|
|
device->VideoQuit = QZ_VideoQuit;
|
2002-01-22 18:46:28 +00:00
|
|
|
|
2001-06-07 14:28:11 +00:00
|
|
|
device->LockHWSurface = QZ_LockHWSurface;
|
|
|
|
device->UnlockHWSurface = QZ_UnlockHWSurface;
|
Patch by me to fix crash described below.
--ryan.
To: sdl@libsdl.org
From: Rainer Deyke <rainerd@eldwood.com>
Date: Tue, 16 Aug 2005 01:08:18 -0600
Subject: [SDL] Bug report: SDL_CreateRGBSurface with SDL_HWSURFACE crashes
If SDL is in full-screen mode with a hardware video surface on OS X,
SDL_CreateRGBSurface with SDL_HWSURFACE crashes. The crash occurs on
line 109 of SDL_Surface.c. This was tested on OS X 10.3.9 with both SDL
1.2.8 and the latest CVS. Here is a small C++ program that demonstrates
the problem:
#include "SDL.h"
#include <stdio.h>
namespace {
void wait_for_key()
{
SDL_Event e;
printf("%d\n", SDL_GetAppState());
while (SDL_WaitEvent(&e)) {
if (e.type == SDL_KEYDOWN || e.type == SDL_QUIT) return;
}
}
}
int main(int, char *[])
{
SDL_Init(SDL_INIT_VIDEO);
SDL_Surface *screen
= SDL_SetVideoMode(640, 480, 32, SDL_FULLSCREEN | SDL_HWSURFACE);
SDL_Surface *s = SDL_CreateRGBSurface(SDL_HWSURFACE, 640, 480, 32,
screen->format->Rmask, screen->format->Gmask,
screen->format->Bmask, screen->format->Amask);
wait_for_key();
if (s) SDL_FreeSurface(s);
SDL_Quit();
printf("Success!\n");
return 0;
}
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401121
2005-08-18 06:46:32 +00:00
|
|
|
device->AllocHWSurface = QZ_AllocHWSurface;
|
2001-06-07 14:28:11 +00:00
|
|
|
device->FreeHWSurface = QZ_FreeHWSurface;
|
|
|
|
|
|
|
|
device->SetGamma = QZ_SetGamma;
|
|
|
|
device->GetGamma = QZ_GetGamma;
|
|
|
|
device->SetGammaRamp = QZ_SetGammaRamp;
|
|
|
|
device->GetGammaRamp = QZ_GetGammaRamp;
|
|
|
|
|
|
|
|
device->GL_GetProcAddress = QZ_GL_GetProcAddress;
|
|
|
|
device->GL_GetAttribute = QZ_GL_GetAttribute;
|
|
|
|
device->GL_MakeCurrent = QZ_GL_MakeCurrent;
|
|
|
|
device->GL_SwapBuffers = QZ_GL_SwapBuffers;
|
|
|
|
device->GL_LoadLibrary = QZ_GL_LoadLibrary;
|
2002-01-22 18:46:28 +00:00
|
|
|
|
2001-06-07 14:28:11 +00:00
|
|
|
device->FreeWMCursor = QZ_FreeWMCursor;
|
|
|
|
device->CreateWMCursor = QZ_CreateWMCursor;
|
|
|
|
device->ShowWMCursor = QZ_ShowWMCursor;
|
|
|
|
device->WarpWMCursor = QZ_WarpWMCursor;
|
|
|
|
device->MoveWMCursor = QZ_MoveWMCursor;
|
|
|
|
device->CheckMouseMode = QZ_CheckMouseMode;
|
|
|
|
device->InitOSKeymap = QZ_InitOSKeymap;
|
|
|
|
device->PumpEvents = QZ_PumpEvents;
|
|
|
|
|
|
|
|
device->SetCaption = QZ_SetCaption;
|
|
|
|
device->SetIcon = QZ_SetIcon;
|
|
|
|
device->IconifyWindow = QZ_IconifyWindow;
|
|
|
|
/*device->GetWMInfo = QZ_GetWMInfo;*/
|
|
|
|
device->GrabInput = QZ_GrabInput;
|
2002-01-22 18:46:28 +00:00
|
|
|
|
2009-09-21 06:08:23 +00:00
|
|
|
/*
|
|
|
|
* This is a big hassle, needing QuickDraw and QuickTime on older
|
|
|
|
* systems, and god knows what on 10.6, so we immediately fail here,
|
|
|
|
* which causes SDL to make an RGB surface and manage the YUV overlay
|
|
|
|
* in software. Sorry. Use SDL 1.3 if you want YUV rendering in a pixel
|
|
|
|
* shader. :)
|
|
|
|
*/
|
|
|
|
/*device->CreateYUVOverlay = QZ_CreateYUVOverlay;*/
|
2002-06-01 23:05:05 +00:00
|
|
|
|
|
|
|
device->free = QZ_DeleteDevice;
|
2002-01-22 18:46:28 +00:00
|
|
|
|
2001-06-07 14:28:11 +00:00
|
|
|
return device;
|
|
|
|
}
|
|
|
|
|
2009-10-10 14:59:32 +00:00
|
|
|
static void QZ_DeleteDevice (SDL_VideoDevice *device)
|
|
|
|
{
|
2011-08-21 23:38:35 -04:00
|
|
|
_THIS = device;
|
2011-08-23 06:04:54 -04:00
|
|
|
QZ_ReleaseDisplayMode(this, save_mode);
|
|
|
|
QZ_ReleaseDisplayMode(this, mode);
|
2006-05-01 11:07:04 +00:00
|
|
|
SDL_free (device->hidden);
|
|
|
|
SDL_free (device);
|
2001-06-07 14:28:11 +00:00
|
|
|
}
|
|
|
|
|
2011-08-21 23:38:35 -04:00
|
|
|
static void QZ_GetModeInfo(_THIS, const void *_mode, Uint32 *w, Uint32 *h, Uint32 *bpp)
|
|
|
|
{
|
|
|
|
*w = *h = *bpp = 0;
|
|
|
|
if (_mode == NULL) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2011-08-25 03:04:24 -04:00
|
|
|
#if (MAC_OS_X_VERSION_MAX_ALLOWED >= 1060)
|
2011-09-16 01:37:44 -04:00
|
|
|
if (use_new_mode_apis) {
|
2011-08-21 23:38:35 -04:00
|
|
|
CGDisplayModeRef vidmode = (CGDisplayModeRef) _mode;
|
|
|
|
CFStringRef fmt = CGDisplayModeCopyPixelEncoding(vidmode);
|
|
|
|
|
|
|
|
*w = (Uint32) CGDisplayModeGetWidth(vidmode);
|
|
|
|
*h = (Uint32) CGDisplayModeGetHeight(vidmode);
|
|
|
|
|
|
|
|
/* we only care about the 32-bit modes... */
|
|
|
|
if (CFStringCompare(fmt, CFSTR(IO32BitDirectPixels),
|
|
|
|
kCFCompareCaseInsensitive) == kCFCompareEqualTo) {
|
|
|
|
*bpp = 32;
|
|
|
|
}
|
|
|
|
|
|
|
|
CFRelease(fmt);
|
2011-08-23 06:04:54 -04:00
|
|
|
}
|
2011-08-21 23:38:35 -04:00
|
|
|
#endif
|
2011-08-23 06:04:54 -04:00
|
|
|
|
2011-08-25 03:04:24 -04:00
|
|
|
#if (MAC_OS_X_VERSION_MIN_REQUIRED < 1060)
|
2011-09-16 01:37:44 -04:00
|
|
|
if (!use_new_mode_apis) {
|
2011-08-21 23:38:35 -04:00
|
|
|
CFDictionaryRef vidmode = (CFDictionaryRef) _mode;
|
|
|
|
CFNumberGetValue (
|
|
|
|
CFDictionaryGetValue (vidmode, kCGDisplayBitsPerPixel),
|
|
|
|
kCFNumberSInt32Type, bpp);
|
|
|
|
|
|
|
|
CFNumberGetValue (
|
|
|
|
CFDictionaryGetValue (vidmode, kCGDisplayWidth),
|
|
|
|
kCFNumberSInt32Type, w);
|
|
|
|
|
|
|
|
CFNumberGetValue (
|
|
|
|
CFDictionaryGetValue (vidmode, kCGDisplayHeight),
|
|
|
|
kCFNumberSInt32Type, h);
|
|
|
|
}
|
2011-08-23 06:04:54 -04:00
|
|
|
#endif
|
2011-08-21 23:38:35 -04:00
|
|
|
|
|
|
|
/* we only care about the 32-bit modes... */
|
|
|
|
if (*bpp != 32) {
|
|
|
|
*bpp = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-10-10 14:59:32 +00:00
|
|
|
static int QZ_VideoInit (_THIS, SDL_PixelFormat *video_format)
|
|
|
|
{
|
2007-07-11 07:53:12 +00:00
|
|
|
NSRect r = NSMakeRect(0.0, 0.0, 0.0, 0.0);
|
2007-04-06 20:30:41 +00:00
|
|
|
const char *env = NULL;
|
2011-08-21 23:38:35 -04:00
|
|
|
|
|
|
|
if ( Gestalt(gestaltSystemVersion, &system_version) != noErr )
|
|
|
|
system_version = 0;
|
|
|
|
|
2011-09-16 01:37:44 -04:00
|
|
|
use_new_mode_apis = NO;
|
|
|
|
|
|
|
|
#if (MAC_OS_X_VERSION_MAX_ALLOWED >= 1060)
|
|
|
|
use_new_mode_apis = IS_SNOW_LEOPARD_OR_LATER(this);
|
|
|
|
#endif
|
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
/* Initialize the video settings; this data persists between mode switches */
|
|
|
|
display_id = kCGDirectMainDisplay;
|
2009-10-10 14:59:32 +00:00
|
|
|
|
2009-10-10 15:10:06 +00:00
|
|
|
#if 0 /* The mouse event code needs to take this into account... */
|
|
|
|
env = getenv("SDL_VIDEO_FULLSCREEN_DISPLAY");
|
|
|
|
if ( env ) {
|
|
|
|
int monitor = SDL_atoi(env);
|
|
|
|
CGDirectDisplayID activeDspys [3];
|
|
|
|
CGDisplayCount dspyCnt;
|
|
|
|
CGGetActiveDisplayList (3, activeDspys, &dspyCnt);
|
|
|
|
if ( monitor >= 0 && monitor < dspyCnt ) {
|
|
|
|
display_id = activeDspys[monitor];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2011-08-25 03:04:24 -04:00
|
|
|
#if (MAC_OS_X_VERSION_MAX_ALLOWED >= 1060)
|
2011-09-16 01:37:44 -04:00
|
|
|
if (use_new_mode_apis) {
|
2011-08-21 23:38:35 -04:00
|
|
|
save_mode = CGDisplayCopyDisplayMode(display_id);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2011-08-25 03:04:24 -04:00
|
|
|
#if (MAC_OS_X_VERSION_MIN_REQUIRED < 1060)
|
2011-09-16 01:37:44 -04:00
|
|
|
if (!use_new_mode_apis) {
|
2011-08-21 23:38:35 -04:00
|
|
|
save_mode = CGDisplayCurrentMode(display_id);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2011-09-13 20:30:48 -04:00
|
|
|
#if (MAC_OS_X_VERSION_MIN_REQUIRED < 1070)
|
|
|
|
if (!IS_LION_OR_LATER(this)) {
|
|
|
|
palette = CGPaletteCreateDefaultColorPalette();
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2011-08-21 23:38:35 -04:00
|
|
|
if (save_mode == NULL) {
|
|
|
|
SDL_SetError("Couldn't figure out current display mode.");
|
|
|
|
return -1;
|
|
|
|
}
|
2001-06-07 14:28:11 +00:00
|
|
|
|
* Added configure option --enable-screensaver, to allow enabling the screensaver by default.
* Use XResetScreenSaver() instead of disabling screensaver entirely.
Full discussion summary from Erik on the SDL mailing list:
Current behaviour
=================
SDL changes the user's display power management settings without
permission from the user and without telling the user.
The interface that it uses to do so is DPMSDisable/DPMSEnable, which
should only ever be used by configuration utilities like KControl, never
by normal application programs, let alone by the libraries that they
use. Using an interface that is not at all intended for what SDL tries
to achieve means that it will not work as it should. Firstly, the power
management is completely disabled during the whole lifetime of the SDL
program, not only when it should be. Secondly, it makes SDL
non-reentrant, meaning that things will break when multiple SDL programs
are clients of the same X server simultaneously. Thirdly, no cleanup
mechanism ensures that the setting is restored if the client does not do
that (for example if it crashes).
In addition to that, this interface is broken on xorg,
[http://bugs.freedesktop.org/show_bug.cgi?id=13962], so what SDL tries
to do does not work at all on that implementation of the X Window
System. (The reason that the DPMSEnable works in KControl is that it
calls DPMSSetTimeout immediately after,
[http://websvn.kde.org/tags/KDE/3.5.9/kdebase/kcontrol/energy/energy.cpp?annotate=774532#l343]).
The problems that the current behaviour causes
==============================================
1. Information leak. When the user is away, someone might see what the
user has on the display when the user counts on the screensaver
preventing this. This does not even require physical access to the
workstation, it is enough to see it from a distance.
2. Draining battery. An SDL program that runs on a laptop will quickly
drain the battery while the user is away. The system will soon shut down
and require recharging before being usable again, while it should in
fact have consumed very little energy if the user's settings would have
been obeyed.
3. Wasting energy. Even if battery issues are not considered, energy as
such is wasted.
4. Display wear. The display may be worn out.
The problems that the current behaviour tries to solve
======================================================
1. Preventing screensaver while playing movies.
Many SDL applications are media players. They have reasons to prevent
screensavers from being activated while a movie is being played. When a
user clicks on the play button it can be interpreted as saying "play
this movie, but do not turn off the display while playing it, because I
will watch it even though I do not interact with the system".
2. Preventing screensaver when some input bypasses X.
Sometimes SDL uses input from another source than the X server, so
that the X server is bypassed. This obviously breaks the screensaver
handling. SDL tries to work around that.
3. Preventing screensaver when all input bypasses X.
There is something called Direct Graphics Access mode, where a
program takes control of both the display and the input devices from the
X server. This obviously means that the X server can not handle the
screensaver alone, since screensaver handling depends on input handling.
SDL does not do what it should to help the X server to handle the
screensaver. Nor does SDL take care of screeensaver handling itself. SDL
simply disables the screensaver completely.
How the problems should be solved
=================================
The correct way for an application program to prevent the screensaver
under X is to call XResetScreenSaver. This was recently discovered and
implemented by the mplayer developers,
[http://svn.mplayerhq.hu/mplayer?view=rev&revision=25637]. SDL needs to
wrap this in an API call (SDL_ResetScreenSaver) and implement it for the
other video targets (if they do not have a corresponding call, SDL
should do what it takes on that particular target, for example sending
fake key events).
1. When a movie is played, the player should reset the screensaver when
the animation is advanced to a new frame. The same applies to anything
similar, like slideshows.
2. When the X server is handling input, it must handle all input
(keyboards, mice, gamepads, ...). This is necessary, not only to be able
to handle the screensaver, but also so that it can send the events to
the correct (the currently active) client. If there is an input device
that the X server can not handle for some reason (such as lack of Plug
and Play capability), the program that handles the device as a
workaround must simulate what would happen if the X server would have
handled the device, by calling XResetScreenSaver when input is received
from the device.
3. When the X server is not handling the input, it depends on the
program that does to call XResetScreenSaver whenever an input event
occurs. Alternatively the program must handle the screensaver countdown
internally and call XActivateScreenSaver.
--HG--
branch : SDL-1.2
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/branches/SDL-1.2%402733
2008-02-29 13:55:44 +00:00
|
|
|
/* Allow environment override of screensaver disable. */
|
2007-04-06 20:30:41 +00:00
|
|
|
env = SDL_getenv("SDL_VIDEO_ALLOW_SCREENSAVER");
|
* Added configure option --enable-screensaver, to allow enabling the screensaver by default.
* Use XResetScreenSaver() instead of disabling screensaver entirely.
Full discussion summary from Erik on the SDL mailing list:
Current behaviour
=================
SDL changes the user's display power management settings without
permission from the user and without telling the user.
The interface that it uses to do so is DPMSDisable/DPMSEnable, which
should only ever be used by configuration utilities like KControl, never
by normal application programs, let alone by the libraries that they
use. Using an interface that is not at all intended for what SDL tries
to achieve means that it will not work as it should. Firstly, the power
management is completely disabled during the whole lifetime of the SDL
program, not only when it should be. Secondly, it makes SDL
non-reentrant, meaning that things will break when multiple SDL programs
are clients of the same X server simultaneously. Thirdly, no cleanup
mechanism ensures that the setting is restored if the client does not do
that (for example if it crashes).
In addition to that, this interface is broken on xorg,
[http://bugs.freedesktop.org/show_bug.cgi?id=13962], so what SDL tries
to do does not work at all on that implementation of the X Window
System. (The reason that the DPMSEnable works in KControl is that it
calls DPMSSetTimeout immediately after,
[http://websvn.kde.org/tags/KDE/3.5.9/kdebase/kcontrol/energy/energy.cpp?annotate=774532#l343]).
The problems that the current behaviour causes
==============================================
1. Information leak. When the user is away, someone might see what the
user has on the display when the user counts on the screensaver
preventing this. This does not even require physical access to the
workstation, it is enough to see it from a distance.
2. Draining battery. An SDL program that runs on a laptop will quickly
drain the battery while the user is away. The system will soon shut down
and require recharging before being usable again, while it should in
fact have consumed very little energy if the user's settings would have
been obeyed.
3. Wasting energy. Even if battery issues are not considered, energy as
such is wasted.
4. Display wear. The display may be worn out.
The problems that the current behaviour tries to solve
======================================================
1. Preventing screensaver while playing movies.
Many SDL applications are media players. They have reasons to prevent
screensavers from being activated while a movie is being played. When a
user clicks on the play button it can be interpreted as saying "play
this movie, but do not turn off the display while playing it, because I
will watch it even though I do not interact with the system".
2. Preventing screensaver when some input bypasses X.
Sometimes SDL uses input from another source than the X server, so
that the X server is bypassed. This obviously breaks the screensaver
handling. SDL tries to work around that.
3. Preventing screensaver when all input bypasses X.
There is something called Direct Graphics Access mode, where a
program takes control of both the display and the input devices from the
X server. This obviously means that the X server can not handle the
screensaver alone, since screensaver handling depends on input handling.
SDL does not do what it should to help the X server to handle the
screensaver. Nor does SDL take care of screeensaver handling itself. SDL
simply disables the screensaver completely.
How the problems should be solved
=================================
The correct way for an application program to prevent the screensaver
under X is to call XResetScreenSaver. This was recently discovered and
implemented by the mplayer developers,
[http://svn.mplayerhq.hu/mplayer?view=rev&revision=25637]. SDL needs to
wrap this in an API call (SDL_ResetScreenSaver) and implement it for the
other video targets (if they do not have a corresponding call, SDL
should do what it takes on that particular target, for example sending
fake key events).
1. When a movie is played, the player should reset the screensaver when
the animation is advanced to a new frame. The same applies to anything
similar, like slideshows.
2. When the X server is handling input, it must handle all input
(keyboards, mice, gamepads, ...). This is necessary, not only to be able
to handle the screensaver, but also so that it can send the events to
the correct (the currently active) client. If there is an input device
that the X server can not handle for some reason (such as lack of Plug
and Play capability), the program that handles the device as a
workaround must simulate what would happen if the X server would have
handled the device, by calling XResetScreenSaver when input is received
from the device.
3. When the X server is not handling the input, it depends on the
program that does to call XResetScreenSaver whenever an input event
occurs. Alternatively the program must handle the screensaver countdown
internally and call XActivateScreenSaver.
--HG--
branch : SDL-1.2
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/branches/SDL-1.2%402733
2008-02-29 13:55:44 +00:00
|
|
|
if ( env ) {
|
|
|
|
allow_screensaver = SDL_atoi(env);
|
|
|
|
} else {
|
|
|
|
#ifdef SDL_VIDEO_DISABLE_SCREENSAVER
|
|
|
|
allow_screensaver = 0;
|
|
|
|
#else
|
|
|
|
allow_screensaver = 1;
|
|
|
|
#endif
|
|
|
|
}
|
2007-04-06 20:30:41 +00:00
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
/* Gather some information that is useful to know about the display */
|
2011-08-21 23:38:35 -04:00
|
|
|
QZ_GetModeInfo(this, save_mode, &device_width, &device_height, &device_bpp);
|
|
|
|
if (device_bpp == 0) {
|
2011-08-23 06:04:54 -04:00
|
|
|
QZ_ReleaseDisplayMode(this, save_mode);
|
2011-08-21 23:38:35 -04:00
|
|
|
save_mode = NULL;
|
|
|
|
SDL_SetError("Unsupported display mode");
|
|
|
|
return -1;
|
|
|
|
}
|
2002-01-22 18:46:28 +00:00
|
|
|
|
2006-03-15 17:46:41 +00:00
|
|
|
/* Determine the current screen size */
|
|
|
|
this->info.current_w = device_width;
|
|
|
|
this->info.current_h = device_height;
|
|
|
|
|
|
|
|
/* Determine the default screen depth */
|
2002-01-22 18:46:28 +00:00
|
|
|
video_format->BitsPerPixel = device_bpp;
|
|
|
|
|
2002-10-05 05:07:57 +00:00
|
|
|
/* Set misc globals */
|
|
|
|
current_grab_mode = SDL_GRAB_OFF;
|
2004-01-04 14:55:35 +00:00
|
|
|
cursor_should_be_visible = YES;
|
2004-01-07 15:01:51 +00:00
|
|
|
cursor_visible = YES;
|
2004-02-15 03:42:56 +00:00
|
|
|
current_mods = 0;
|
2007-12-29 21:31:26 +00:00
|
|
|
field_edit = [[SDLTranslatorResponder alloc] initWithFrame:r];
|
2011-08-21 23:38:35 -04:00
|
|
|
|
2002-12-07 06:48:49 +00:00
|
|
|
/* register for sleep notifications so wake from sleep generates SDL_VIDEOEXPOSE */
|
|
|
|
QZ_RegisterForSleepNotifications (this);
|
|
|
|
|
2006-01-26 07:38:43 +00:00
|
|
|
/* Fill in some window manager capabilities */
|
|
|
|
this->info.wm_available = 1;
|
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
return 0;
|
2001-06-07 14:28:11 +00:00
|
|
|
}
|
|
|
|
|
2009-10-10 14:59:32 +00:00
|
|
|
static SDL_Rect** QZ_ListModes (_THIS, SDL_PixelFormat *format, Uint32 flags)
|
|
|
|
{
|
2011-08-21 23:38:35 -04:00
|
|
|
CFArrayRef mode_list = NULL; /* list of available fullscreen modes */
|
2002-01-22 18:46:28 +00:00
|
|
|
CFIndex num_modes;
|
2001-06-07 14:28:11 +00:00
|
|
|
CFIndex i;
|
|
|
|
|
|
|
|
int list_size = 0;
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2001-06-07 14:28:11 +00:00
|
|
|
/* Any windowed mode is acceptable */
|
|
|
|
if ( (flags & SDL_FULLSCREEN) == 0 )
|
|
|
|
return (SDL_Rect**)-1;
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2001-06-07 14:28:11 +00:00
|
|
|
/* Free memory from previous call, if any */
|
2002-10-05 05:07:57 +00:00
|
|
|
if ( client_mode_list != NULL ) {
|
2002-06-01 23:05:05 +00:00
|
|
|
int i;
|
2001-06-07 14:28:11 +00:00
|
|
|
|
2002-10-05 05:07:57 +00:00
|
|
|
for (i = 0; client_mode_list[i] != NULL; i++)
|
2006-05-01 11:07:04 +00:00
|
|
|
SDL_free (client_mode_list[i]);
|
2001-06-07 14:28:11 +00:00
|
|
|
|
2006-05-01 11:07:04 +00:00
|
|
|
SDL_free (client_mode_list);
|
2002-10-05 05:07:57 +00:00
|
|
|
client_mode_list = NULL;
|
2001-06-07 14:28:11 +00:00
|
|
|
}
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2011-08-25 03:04:24 -04:00
|
|
|
#if (MAC_OS_X_VERSION_MAX_ALLOWED >= 1060)
|
2011-09-16 01:37:44 -04:00
|
|
|
if (use_new_mode_apis) {
|
2011-08-21 23:38:35 -04:00
|
|
|
mode_list = CGDisplayCopyAllDisplayModes(display_id, NULL);
|
2011-08-23 06:04:54 -04:00
|
|
|
}
|
2011-08-21 23:38:35 -04:00
|
|
|
#endif
|
2011-08-23 06:04:54 -04:00
|
|
|
|
2011-08-25 03:04:24 -04:00
|
|
|
#if (MAC_OS_X_VERSION_MIN_REQUIRED < 1060)
|
2011-09-16 01:37:44 -04:00
|
|
|
if (!use_new_mode_apis) {
|
2011-08-21 23:38:35 -04:00
|
|
|
mode_list = CGDisplayAvailableModes(display_id);
|
|
|
|
}
|
2011-08-23 06:04:54 -04:00
|
|
|
#endif
|
2011-08-21 23:38:35 -04:00
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
num_modes = CFArrayGetCount (mode_list);
|
|
|
|
|
2001-06-07 14:28:11 +00:00
|
|
|
/* Build list of modes with the requested bpp */
|
2001-08-19 23:57:39 +00:00
|
|
|
for (i = 0; i < num_modes; i++) {
|
2011-08-21 23:38:35 -04:00
|
|
|
Uint32 width, height, bpp;
|
|
|
|
const void *onemode = CFArrayGetValueAtIndex(mode_list, i);
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2011-08-21 23:38:35 -04:00
|
|
|
QZ_GetModeInfo(this, onemode, &width, &height, &bpp);
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2011-08-21 23:38:35 -04:00
|
|
|
if (bpp && (bpp == format->BitsPerPixel)) {
|
|
|
|
int hasMode = SDL_FALSE;
|
|
|
|
int i;
|
2002-06-01 23:05:05 +00:00
|
|
|
|
|
|
|
/* Check if mode is already in the list */
|
2011-08-21 23:38:35 -04:00
|
|
|
for (i = 0; i < list_size; i++) {
|
|
|
|
if (client_mode_list[i]->w == width &&
|
|
|
|
client_mode_list[i]->h == height) {
|
2002-06-01 23:05:05 +00:00
|
|
|
hasMode = SDL_TRUE;
|
|
|
|
break;
|
2001-08-19 23:57:39 +00:00
|
|
|
}
|
|
|
|
}
|
2002-06-01 23:05:05 +00:00
|
|
|
|
|
|
|
/* Grow the list and add mode to the list */
|
|
|
|
if ( ! hasMode ) {
|
|
|
|
SDL_Rect *rect;
|
|
|
|
|
|
|
|
list_size++;
|
|
|
|
|
2002-10-05 05:07:57 +00:00
|
|
|
if (client_mode_list == NULL)
|
|
|
|
client_mode_list = (SDL_Rect**)
|
2006-05-01 11:07:04 +00:00
|
|
|
SDL_malloc (sizeof(*client_mode_list) * (list_size+1) );
|
2011-08-21 23:38:35 -04:00
|
|
|
else {
|
|
|
|
/* !!! FIXME: this leaks memory if SDL_realloc() fails! */
|
|
|
|
client_mode_list = (SDL_Rect**)
|
2006-05-01 11:07:04 +00:00
|
|
|
SDL_realloc (client_mode_list, sizeof(*client_mode_list) * (list_size+1));
|
2011-08-21 23:38:35 -04:00
|
|
|
}
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2006-05-01 11:07:04 +00:00
|
|
|
rect = (SDL_Rect*) SDL_malloc (sizeof(**client_mode_list));
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-10-05 05:07:57 +00:00
|
|
|
if (client_mode_list == NULL || rect == NULL) {
|
2011-08-23 06:04:54 -04:00
|
|
|
QZ_ReleaseDisplayModeList(this, mode_list);
|
2002-06-01 23:05:05 +00:00
|
|
|
SDL_OutOfMemory ();
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2006-01-02 10:49:37 +00:00
|
|
|
rect->x = rect->y = 0;
|
2002-06-01 23:05:05 +00:00
|
|
|
rect->w = width;
|
|
|
|
rect->h = height;
|
|
|
|
|
2002-10-05 05:07:57 +00:00
|
|
|
client_mode_list[list_size-1] = rect;
|
|
|
|
client_mode_list[list_size] = NULL;
|
2002-01-22 18:46:28 +00:00
|
|
|
}
|
2001-06-07 14:28:11 +00:00
|
|
|
}
|
|
|
|
}
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2011-08-23 06:04:54 -04:00
|
|
|
QZ_ReleaseDisplayModeList(this, mode_list);
|
2011-08-21 23:38:35 -04:00
|
|
|
|
2001-08-19 23:57:39 +00:00
|
|
|
/* Sort list largest to smallest (by area) */
|
|
|
|
{
|
|
|
|
int i, j;
|
|
|
|
for (i = 0; i < list_size; i++) {
|
|
|
|
for (j = 0; j < list_size-1; j++) {
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2001-08-19 23:57:39 +00:00
|
|
|
int area1, area2;
|
2002-10-05 05:07:57 +00:00
|
|
|
area1 = client_mode_list[j]->w * client_mode_list[j]->h;
|
|
|
|
area2 = client_mode_list[j+1]->w * client_mode_list[j+1]->h;
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2001-08-19 23:57:39 +00:00
|
|
|
if (area1 < area2) {
|
2002-10-05 05:07:57 +00:00
|
|
|
SDL_Rect *tmp = client_mode_list[j];
|
|
|
|
client_mode_list[j] = client_mode_list[j+1];
|
|
|
|
client_mode_list[j+1] = tmp;
|
2001-08-19 23:57:39 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2011-08-21 23:38:35 -04:00
|
|
|
|
2002-10-05 05:07:57 +00:00
|
|
|
return client_mode_list;
|
2001-06-07 14:28:11 +00:00
|
|
|
}
|
|
|
|
|
2003-07-23 04:39:44 +00:00
|
|
|
static SDL_bool QZ_WindowPosition(_THIS, int *x, int *y)
|
|
|
|
{
|
|
|
|
const char *window = getenv("SDL_VIDEO_WINDOW_POS");
|
|
|
|
if ( window ) {
|
|
|
|
if ( sscanf(window, "%d,%d", x, y) == 2 ) {
|
|
|
|
return SDL_TRUE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return SDL_FALSE;
|
|
|
|
}
|
|
|
|
|
2011-08-21 23:38:35 -04:00
|
|
|
static CGError QZ_SetDisplayMode(_THIS, const void *vidmode)
|
|
|
|
{
|
2011-08-25 03:04:24 -04:00
|
|
|
#if (MAC_OS_X_VERSION_MAX_ALLOWED >= 1060)
|
2011-09-16 01:37:44 -04:00
|
|
|
if (use_new_mode_apis) {
|
2011-08-21 23:38:35 -04:00
|
|
|
return CGDisplaySetDisplayMode(display_id, (CGDisplayModeRef) vidmode, NULL);
|
2011-08-23 06:04:54 -04:00
|
|
|
}
|
2011-08-21 23:38:35 -04:00
|
|
|
#endif
|
2011-08-23 06:04:54 -04:00
|
|
|
|
2011-08-25 03:04:24 -04:00
|
|
|
#if (MAC_OS_X_VERSION_MIN_REQUIRED < 1060)
|
2011-09-16 01:37:44 -04:00
|
|
|
if (!use_new_mode_apis) {
|
2011-08-21 23:38:35 -04:00
|
|
|
return CGDisplaySwitchToMode(display_id, (CFDictionaryRef) vidmode);
|
|
|
|
}
|
2011-08-23 06:04:54 -04:00
|
|
|
#endif
|
2011-08-21 23:38:35 -04:00
|
|
|
|
|
|
|
return kCGErrorFailure;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline CGError QZ_RestoreDisplayMode(_THIS)
|
|
|
|
{
|
|
|
|
return QZ_SetDisplayMode(this, save_mode);
|
|
|
|
}
|
|
|
|
|
2009-10-10 14:59:32 +00:00
|
|
|
static void QZ_UnsetVideoMode (_THIS, BOOL to_desktop)
|
|
|
|
{
|
2001-06-07 14:28:11 +00:00
|
|
|
/* Reset values that may change between switches */
|
2002-10-05 05:07:57 +00:00
|
|
|
this->info.blit_fill = 0;
|
2011-09-13 20:30:48 -04:00
|
|
|
this->FillHWRect = NULL;
|
|
|
|
this->UpdateRects = NULL;
|
|
|
|
this->LockHWSurface = NULL;
|
|
|
|
this->UnlockHWSurface = NULL;
|
2011-07-17 03:08:53 -07:00
|
|
|
|
2009-09-21 06:08:23 +00:00
|
|
|
if (cg_context) {
|
|
|
|
CGContextFlush (cg_context);
|
|
|
|
CGContextRelease (cg_context);
|
|
|
|
cg_context = nil;
|
|
|
|
}
|
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
/* Release fullscreen resources */
|
2001-06-07 14:28:11 +00:00
|
|
|
if ( mode_flags & SDL_FULLSCREEN ) {
|
2002-01-22 18:46:28 +00:00
|
|
|
|
2002-08-12 22:43:58 +00:00
|
|
|
NSRect screen_rect;
|
2011-07-17 03:08:53 -07:00
|
|
|
|
2011-09-13 20:30:48 -04:00
|
|
|
/* Release double buffer stuff */
|
|
|
|
#if (MAC_OS_X_VERSION_MIN_REQUIRED < 1070)
|
|
|
|
if ( !IS_LION_OR_LATER(this) && (mode_flags & SDL_DOUBLEBUF) ) {
|
|
|
|
quit_thread = YES;
|
|
|
|
SDL_SemPost (sem1);
|
|
|
|
SDL_WaitThread (thread, NULL);
|
|
|
|
SDL_DestroySemaphore (sem1);
|
|
|
|
SDL_DestroySemaphore (sem2);
|
|
|
|
SDL_free (sw_buffers[0]);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2007-07-14 08:00:50 +00:00
|
|
|
/* If we still have a valid window, close it. */
|
|
|
|
if ( qz_window ) {
|
2007-07-24 04:21:05 +00:00
|
|
|
NSCAssert([ qz_window delegate ] == nil, @"full screen window shouldn't have a delegate"); /* if that should ever change, we'd have to release it here */
|
|
|
|
[ qz_window close ]; /* includes release because [qz_window isReleasedWhenClosed] */
|
2007-07-14 08:00:50 +00:00
|
|
|
qz_window = nil;
|
|
|
|
window_view = nil;
|
|
|
|
}
|
2002-10-05 05:07:57 +00:00
|
|
|
/*
|
|
|
|
Release the OpenGL context
|
|
|
|
Do this first to avoid trash on the display before fade
|
|
|
|
*/
|
|
|
|
if ( mode_flags & SDL_OPENGL ) {
|
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
QZ_TearDownOpenGL (this);
|
2011-08-10 01:25:00 -04:00
|
|
|
#ifdef __powerpc__ /* we only use this for pre-10.3 compatibility. */
|
2002-10-05 05:07:57 +00:00
|
|
|
CGLSetFullScreen (NULL);
|
2011-08-10 01:25:00 -04:00
|
|
|
#endif
|
2002-10-05 05:07:57 +00:00
|
|
|
}
|
2006-02-07 11:18:21 +00:00
|
|
|
if (to_desktop) {
|
2011-10-13 14:50:47 -04:00
|
|
|
/* !!! FIXME: keep an eye on this.
|
|
|
|
* This API is officially unavailable for 64-bit binaries.
|
|
|
|
* It happens to work, as of 10.7, but we're going to see if
|
|
|
|
* we can just simply do without it on newer OSes...
|
|
|
|
*/
|
|
|
|
#if (MAC_OS_X_VERSION_MIN_REQUIRED < 1070) && !defined(__LP64__)
|
|
|
|
if ( !IS_LION_OR_LATER(this) ) {
|
|
|
|
ShowMenuBar ();
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2006-02-07 11:18:21 +00:00
|
|
|
/* Restore original screen resolution/bpp */
|
2011-08-21 23:38:35 -04:00
|
|
|
QZ_RestoreDisplayMode (this);
|
2006-02-07 11:18:21 +00:00
|
|
|
CGReleaseAllDisplays ();
|
|
|
|
/*
|
|
|
|
Reset the main screen's rectangle
|
|
|
|
See comment in QZ_SetVideoFullscreen for why we do this
|
|
|
|
*/
|
|
|
|
screen_rect = NSMakeRect(0,0,device_width,device_height);
|
2009-09-21 06:08:23 +00:00
|
|
|
QZ_SetFrame([ NSScreen mainScreen ], screen_rect);
|
2006-02-07 11:18:21 +00:00
|
|
|
}
|
2001-06-07 14:28:11 +00:00
|
|
|
}
|
2002-01-22 18:46:28 +00:00
|
|
|
/* Release window mode resources */
|
2002-06-01 23:05:05 +00:00
|
|
|
else {
|
2007-07-24 04:21:05 +00:00
|
|
|
id delegate = [ qz_window delegate ];
|
|
|
|
[ qz_window close ]; /* includes release because [qz_window isReleasedWhenClosed] */
|
|
|
|
if (delegate != nil) [ delegate release ];
|
2002-06-01 23:05:05 +00:00
|
|
|
qz_window = nil;
|
2002-10-05 05:07:57 +00:00
|
|
|
window_view = nil;
|
2005-10-13 09:47:06 +00:00
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
/* Release the OpenGL context */
|
|
|
|
if ( mode_flags & SDL_OPENGL )
|
|
|
|
QZ_TearDownOpenGL (this);
|
2001-06-07 14:28:11 +00:00
|
|
|
}
|
2002-01-22 18:46:28 +00:00
|
|
|
|
2001-08-19 23:57:39 +00:00
|
|
|
/* Signal successful teardown */
|
|
|
|
video_set = SDL_FALSE;
|
2001-06-07 14:28:11 +00:00
|
|
|
}
|
|
|
|
|
2011-08-21 23:38:35 -04:00
|
|
|
static const void *QZ_BestMode(_THIS, const int bpp, const int w, const int h)
|
|
|
|
{
|
|
|
|
const void *best = NULL;
|
|
|
|
|
|
|
|
if (bpp == 0) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2011-08-25 03:04:24 -04:00
|
|
|
#if (MAC_OS_X_VERSION_MAX_ALLOWED >= 1060)
|
2011-09-16 01:37:44 -04:00
|
|
|
if (use_new_mode_apis) {
|
2011-08-21 23:38:35 -04:00
|
|
|
/* apparently, we have to roll our own now. :/ */
|
|
|
|
CFArrayRef mode_list = CGDisplayCopyAllDisplayModes(display_id, NULL);
|
|
|
|
if (mode_list != NULL) {
|
|
|
|
const CFIndex num_modes = CFArrayGetCount(mode_list);
|
|
|
|
CFIndex i;
|
|
|
|
for (i = 0; i < num_modes; i++) {
|
|
|
|
const void *vidmode = CFArrayGetValueAtIndex(mode_list, i);
|
|
|
|
Uint32 thisw, thish, thisbpp;
|
|
|
|
QZ_GetModeInfo(this, vidmode, &thisw, &thish, &thisbpp);
|
|
|
|
|
|
|
|
/* We only care about exact matches, apparently. */
|
|
|
|
if ((thisbpp == bpp) && (thisw == w) && (thish == h)) {
|
|
|
|
best = vidmode;
|
|
|
|
break; /* got it! */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
CGDisplayModeRetain((CGDisplayModeRef) best); /* NULL is ok */
|
|
|
|
CFRelease(mode_list);
|
|
|
|
}
|
2011-08-23 06:04:54 -04:00
|
|
|
}
|
2011-08-21 23:38:35 -04:00
|
|
|
#endif
|
2011-08-23 06:04:54 -04:00
|
|
|
|
2011-08-25 03:04:24 -04:00
|
|
|
#if (MAC_OS_X_VERSION_MIN_REQUIRED < 1060)
|
2011-09-16 01:37:44 -04:00
|
|
|
if (!use_new_mode_apis) {
|
2011-08-21 23:38:35 -04:00
|
|
|
boolean_t exact = 0;
|
|
|
|
best = CGDisplayBestModeForParameters(display_id, bpp, w, h, &exact);
|
|
|
|
if (!exact) {
|
|
|
|
best = NULL;
|
|
|
|
}
|
|
|
|
}
|
2011-08-23 06:04:54 -04:00
|
|
|
#endif
|
|
|
|
|
2011-08-21 23:38:35 -04:00
|
|
|
return best;
|
|
|
|
}
|
|
|
|
|
2001-06-07 14:28:11 +00:00
|
|
|
static SDL_Surface* QZ_SetVideoFullScreen (_THIS, SDL_Surface *current, int width,
|
2009-10-10 14:59:32 +00:00
|
|
|
int height, int bpp, Uint32 flags)
|
|
|
|
{
|
2011-09-13 20:30:48 -04:00
|
|
|
const BOOL isLion = IS_LION_OR_LATER(this);
|
2002-08-12 22:43:58 +00:00
|
|
|
NSRect screen_rect;
|
2003-02-01 19:59:23 +00:00
|
|
|
CGError error;
|
2007-07-14 08:00:50 +00:00
|
|
|
NSRect contentRect;
|
2006-02-07 11:18:21 +00:00
|
|
|
CGDisplayFadeReservationToken fade_token = kCGDisplayFadeReservationInvalidToken;
|
2009-09-21 06:08:23 +00:00
|
|
|
|
2011-07-17 03:08:53 -07:00
|
|
|
current->flags = SDL_FULLSCREEN;
|
|
|
|
current->w = width;
|
|
|
|
current->h = height;
|
|
|
|
|
2010-04-25 20:16:38 -04:00
|
|
|
contentRect = NSMakeRect (0, 0, width, height);
|
|
|
|
|
2006-02-07 11:18:21 +00:00
|
|
|
/* Fade to black to hide resolution-switching flicker (and garbage
|
|
|
|
that is displayed by a destroyed OpenGL context, if applicable) */
|
|
|
|
if ( CGAcquireDisplayFadeReservation (5, &fade_token) == kCGErrorSuccess ) {
|
|
|
|
CGDisplayFade (fade_token, 0.3, kCGDisplayBlendNormal, kCGDisplayBlendSolidColor, 0.0, 0.0, 0.0, TRUE);
|
|
|
|
}
|
2002-08-12 22:43:58 +00:00
|
|
|
|
2002-10-05 05:07:57 +00:00
|
|
|
/* Destroy any previous mode */
|
|
|
|
if (video_set == SDL_TRUE)
|
2006-02-07 11:18:21 +00:00
|
|
|
QZ_UnsetVideoMode (this, FALSE);
|
2002-10-05 05:07:57 +00:00
|
|
|
|
2009-09-21 06:08:23 +00:00
|
|
|
/* Sorry, QuickDraw was ripped out. */
|
|
|
|
if (getenv("SDL_NSWindowPointer") || getenv("SDL_NSQuickDrawViewPointer")) {
|
|
|
|
SDL_SetError ("Embedded QuickDraw windows are no longer supported");
|
|
|
|
goto ERR_NO_MATCH;
|
|
|
|
}
|
|
|
|
|
2011-08-23 06:04:54 -04:00
|
|
|
QZ_ReleaseDisplayMode(this, mode); /* NULL is okay. */
|
2011-08-21 23:38:35 -04:00
|
|
|
|
2001-06-07 14:28:11 +00:00
|
|
|
/* See if requested mode exists */
|
2011-08-21 23:38:35 -04:00
|
|
|
mode = QZ_BestMode(this, bpp, width, height);
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2001-06-07 14:28:11 +00:00
|
|
|
/* Require an exact match to the requested mode */
|
2011-08-21 23:38:35 -04:00
|
|
|
if ( mode == NULL ) {
|
2002-10-05 05:07:57 +00:00
|
|
|
SDL_SetError ("Failed to find display resolution: %dx%dx%d", width, height, bpp);
|
2001-06-07 14:28:11 +00:00
|
|
|
goto ERR_NO_MATCH;
|
|
|
|
}
|
2001-08-19 23:57:39 +00:00
|
|
|
|
2001-06-07 14:28:11 +00:00
|
|
|
/* Put up the blanking window (a window above all other windows) */
|
2003-02-01 19:59:23 +00:00
|
|
|
if (getenv ("SDL_SINGLEDISPLAY"))
|
|
|
|
error = CGDisplayCapture (display_id);
|
|
|
|
else
|
|
|
|
error = CGCaptureAllDisplays ();
|
|
|
|
|
|
|
|
if ( CGDisplayNoErr != error ) {
|
2001-06-07 14:28:11 +00:00
|
|
|
SDL_SetError ("Failed capturing display");
|
|
|
|
goto ERR_NO_CAPTURE;
|
|
|
|
}
|
2002-01-22 18:46:28 +00:00
|
|
|
|
2001-06-07 14:28:11 +00:00
|
|
|
/* Do the physical switch */
|
2011-08-21 23:38:35 -04:00
|
|
|
if ( CGDisplayNoErr != QZ_SetDisplayMode(this, mode) ) {
|
2001-06-07 14:28:11 +00:00
|
|
|
SDL_SetError ("Failed switching display resolution");
|
|
|
|
goto ERR_NO_SWITCH;
|
|
|
|
}
|
2002-01-22 18:46:28 +00:00
|
|
|
|
2011-09-13 20:30:48 -04:00
|
|
|
#if (MAC_OS_X_VERSION_MIN_REQUIRED < 1070)
|
|
|
|
if ( !isLion ) {
|
|
|
|
current->pixels = (Uint32*) CGDisplayBaseAddress (display_id);
|
|
|
|
current->pitch = CGDisplayBytesPerRow (display_id);
|
|
|
|
|
|
|
|
current->flags |= SDL_HWSURFACE;
|
|
|
|
current->flags |= SDL_PREALLOC;
|
|
|
|
/* current->hwdata = (void *) CGDisplayGetDrawingContext (display_id); */
|
|
|
|
|
|
|
|
this->UpdateRects = QZ_DirectUpdate;
|
|
|
|
this->LockHWSurface = QZ_LockHWSurface;
|
|
|
|
this->UnlockHWSurface = QZ_UnlockHWSurface;
|
|
|
|
|
|
|
|
/* Setup double-buffer emulation */
|
|
|
|
if ( flags & SDL_DOUBLEBUF ) {
|
|
|
|
|
|
|
|
/*
|
|
|
|
Setup a software backing store for reasonable results when
|
|
|
|
double buffering is requested (since a single-buffered hardware
|
|
|
|
surface looks hideous).
|
|
|
|
|
|
|
|
The actual screen blit occurs in a separate thread to allow
|
|
|
|
other blitting while waiting on the VBL (and hence results in higher framerates).
|
|
|
|
*/
|
|
|
|
this->LockHWSurface = NULL;
|
|
|
|
this->UnlockHWSurface = NULL;
|
|
|
|
this->UpdateRects = NULL;
|
|
|
|
|
|
|
|
current->flags |= (SDL_HWSURFACE|SDL_DOUBLEBUF);
|
|
|
|
this->UpdateRects = QZ_DoubleBufferUpdate;
|
|
|
|
this->LockHWSurface = QZ_LockDoubleBuffer;
|
|
|
|
this->UnlockHWSurface = QZ_UnlockDoubleBuffer;
|
|
|
|
this->FlipHWSurface = QZ_FlipDoubleBuffer;
|
|
|
|
|
|
|
|
current->pixels = SDL_malloc (current->pitch * current->h * 2);
|
|
|
|
if (current->pixels == NULL) {
|
|
|
|
SDL_OutOfMemory ();
|
|
|
|
goto ERR_DOUBLEBUF;
|
|
|
|
}
|
|
|
|
|
|
|
|
sw_buffers[0] = current->pixels;
|
|
|
|
sw_buffers[1] = (Uint8*)current->pixels + current->pitch * current->h;
|
|
|
|
|
|
|
|
quit_thread = NO;
|
|
|
|
sem1 = SDL_CreateSemaphore (0);
|
|
|
|
sem2 = SDL_CreateSemaphore (1);
|
|
|
|
thread = SDL_CreateThread ((int (*)(void *))QZ_ThreadFlip, this);
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( CGDisplayCanSetPalette (display_id) )
|
|
|
|
current->flags |= SDL_HWPALETTE;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2007-07-14 08:00:50 +00:00
|
|
|
/* Check if we should recreate the window */
|
|
|
|
if (qz_window == nil) {
|
|
|
|
/* Manually create a window, avoids having a nib file resource */
|
|
|
|
qz_window = [ [ SDL_QuartzWindow alloc ]
|
|
|
|
initWithContentRect:contentRect
|
2011-09-13 20:30:48 -04:00
|
|
|
styleMask:(isLion ? NSBorderlessWindowMask : 0)
|
2007-07-14 08:00:50 +00:00
|
|
|
backing:NSBackingStoreBuffered
|
|
|
|
defer:NO ];
|
|
|
|
|
|
|
|
if (qz_window != nil) {
|
|
|
|
[ qz_window setAcceptsMouseMovedEvents:YES ];
|
|
|
|
[ qz_window setViewsNeedDisplay:NO ];
|
2011-09-13 20:30:48 -04:00
|
|
|
if (isLion) {
|
|
|
|
[ qz_window setContentView: [ [ [ SDL_QuartzView alloc ] init ] autorelease ] ];
|
|
|
|
}
|
2007-07-14 08:00:50 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
/* We already have a window, just change its size */
|
|
|
|
else {
|
2009-09-29 13:42:33 +00:00
|
|
|
[ qz_window setContentSize:contentRect.size ];
|
|
|
|
current->flags |= (SDL_NOFRAME|SDL_RESIZABLE) & mode_flags;
|
|
|
|
[ window_view setFrameSize:contentRect.size ];
|
2007-07-14 08:00:50 +00:00
|
|
|
}
|
|
|
|
|
2001-06-07 14:28:11 +00:00
|
|
|
/* Setup OpenGL for a fullscreen context */
|
|
|
|
if (flags & SDL_OPENGL) {
|
|
|
|
|
|
|
|
if ( ! QZ_SetupOpenGL (this, bpp, flags) ) {
|
2002-01-22 18:46:28 +00:00
|
|
|
goto ERR_NO_GL;
|
2001-06-07 14:28:11 +00:00
|
|
|
}
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2007-07-14 08:00:50 +00:00
|
|
|
/* Initialize the NSView and add it to our window. The presence of a valid window and
|
|
|
|
view allow the cursor to be changed whilst in fullscreen.*/
|
|
|
|
window_view = [ [ NSView alloc ] initWithFrame:contentRect ];
|
|
|
|
|
2011-09-13 20:30:48 -04:00
|
|
|
if ( isLion ) {
|
|
|
|
[ window_view setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable ];
|
|
|
|
}
|
|
|
|
|
|
|
|
[ [ qz_window contentView ] addSubview:window_view ];
|
2011-08-10 01:25:00 -04:00
|
|
|
|
2011-09-16 01:55:46 -04:00
|
|
|
/* Apparently Lion checks some version flag set by the linker
|
|
|
|
and changes API behavior. Annoying. */
|
|
|
|
#if (MAC_OS_X_VERSION_MAX_ALLOWED < 1070)
|
2011-11-03 23:58:24 -04:00
|
|
|
{
|
|
|
|
CGLError err;
|
|
|
|
CGLContextObj ctx;
|
|
|
|
|
|
|
|
[ qz_window setLevel:NSNormalWindowLevel ];
|
|
|
|
ctx = QZ_GetCGLContextObj (gl_context);
|
|
|
|
err = CGLSetFullScreen (ctx);
|
2011-09-13 20:30:48 -04:00
|
|
|
|
2011-11-03 23:58:24 -04:00
|
|
|
if (err) {
|
|
|
|
SDL_SetError ("Error setting OpenGL fullscreen: %s", CGLErrorString(err));
|
|
|
|
goto ERR_NO_GL;
|
|
|
|
}
|
2011-09-13 20:30:48 -04:00
|
|
|
}
|
2011-09-16 01:55:46 -04:00
|
|
|
#else
|
|
|
|
[ qz_window setLevel:CGShieldingWindowLevel() ];
|
|
|
|
[ gl_context setView: window_view ];
|
|
|
|
[ gl_context setFullScreen ];
|
|
|
|
[ gl_context update ];
|
2011-09-13 20:30:48 -04:00
|
|
|
#endif
|
|
|
|
|
|
|
|
[ window_view release ];
|
2001-06-07 14:28:11 +00:00
|
|
|
[ gl_context makeCurrentContext];
|
2002-01-22 18:46:28 +00:00
|
|
|
|
|
|
|
glClear (GL_COLOR_BUFFER_BIT);
|
|
|
|
|
|
|
|
[ gl_context flushBuffer ];
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2001-06-07 14:28:11 +00:00
|
|
|
current->flags |= SDL_OPENGL;
|
2011-09-13 20:30:48 -04:00
|
|
|
} else if (isLion) { /* For 2D, we build a CGBitmapContext */
|
2011-07-17 03:08:53 -07:00
|
|
|
CGColorSpaceRef cgColorspace;
|
|
|
|
|
|
|
|
/* Only recreate the view if it doesn't already exist */
|
|
|
|
if (window_view == nil) {
|
|
|
|
window_view = [ [ NSView alloc ] initWithFrame:contentRect ];
|
|
|
|
[ window_view setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable ];
|
|
|
|
[ [ qz_window contentView ] addSubview:window_view ];
|
|
|
|
[ window_view release ];
|
|
|
|
}
|
|
|
|
|
|
|
|
cgColorspace = CGColorSpaceCreateDeviceRGB();
|
|
|
|
current->pitch = 4 * current->w;
|
|
|
|
current->pixels = SDL_malloc (current->h * current->pitch);
|
|
|
|
|
|
|
|
cg_context = CGBitmapContextCreate (current->pixels, current->w, current->h,
|
|
|
|
8, current->pitch, cgColorspace,
|
|
|
|
kCGImageAlphaNoneSkipFirst);
|
|
|
|
CGColorSpaceRelease (cgColorspace);
|
|
|
|
|
|
|
|
current->flags |= SDL_SWSURFACE;
|
|
|
|
current->flags |= SDL_ASYNCBLIT;
|
|
|
|
current->hwdata = (void *) cg_context;
|
|
|
|
|
|
|
|
/* Force this window to draw above _everything_. */
|
|
|
|
[ qz_window setLevel:CGShieldingWindowLevel() ];
|
2011-09-13 20:30:48 -04:00
|
|
|
|
|
|
|
this->UpdateRects = QZ_UpdateRects;
|
|
|
|
this->LockHWSurface = QZ_LockHWSurface;
|
|
|
|
this->UnlockHWSurface = QZ_UnlockHWSurface;
|
2011-07-17 03:08:53 -07:00
|
|
|
}
|
|
|
|
|
2011-09-13 20:30:48 -04:00
|
|
|
if (isLion) {
|
|
|
|
[ qz_window setHasShadow:NO];
|
|
|
|
[ qz_window setOpaque:YES];
|
|
|
|
[ qz_window makeKeyAndOrderFront:nil ];
|
|
|
|
}
|
2001-06-07 14:28:11 +00:00
|
|
|
|
2011-10-13 14:50:47 -04:00
|
|
|
/* !!! FIXME: keep an eye on this.
|
|
|
|
* This API is officially unavailable for 64-bit binaries.
|
|
|
|
* It happens to work, as of 10.7, but we're going to see if
|
|
|
|
* we can just simply do without it on newer OSes...
|
|
|
|
*/
|
|
|
|
#if (MAC_OS_X_VERSION_MIN_REQUIRED < 1070) && !defined(__LP64__)
|
|
|
|
if ( !IS_LION_OR_LATER(this) ) {
|
|
|
|
/* If we don't hide menu bar, it will get events and interrupt the program */
|
|
|
|
HideMenuBar ();
|
|
|
|
}
|
|
|
|
#endif
|
2002-01-22 18:46:28 +00:00
|
|
|
|
2006-02-07 11:18:21 +00:00
|
|
|
/* Fade in again (asynchronously) */
|
|
|
|
if ( fade_token != kCGDisplayFadeReservationInvalidToken ) {
|
|
|
|
CGDisplayFade (fade_token, 0.5, kCGDisplayBlendSolidColor, kCGDisplayBlendNormal, 0.0, 0.0, 0.0, FALSE);
|
|
|
|
CGReleaseDisplayFadeReservation(fade_token);
|
|
|
|
}
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-08-12 22:43:58 +00:00
|
|
|
/*
|
2002-10-05 05:07:57 +00:00
|
|
|
There is a bug in Cocoa where NSScreen doesn't synchronize
|
|
|
|
with CGDirectDisplay, so the main screen's frame is wrong.
|
|
|
|
As a result, coordinate translation produces incorrect results.
|
|
|
|
We can hack around this bug by setting the screen rect
|
|
|
|
ourselves. This hack should be removed if/when the bug is fixed.
|
2002-08-12 22:43:58 +00:00
|
|
|
*/
|
|
|
|
screen_rect = NSMakeRect(0,0,width,height);
|
2009-09-21 06:08:23 +00:00
|
|
|
QZ_SetFrame([ NSScreen mainScreen ], screen_rect);
|
2002-08-12 22:43:58 +00:00
|
|
|
|
2001-06-07 14:28:11 +00:00
|
|
|
/* Save the flags to ensure correct tear-down */
|
|
|
|
mode_flags = current->flags;
|
2002-06-01 23:05:05 +00:00
|
|
|
|
Fixed bug #55
From Christian Walther:
When writing my patch for #12, I ended up doing all sorts of changes to the way
application/window activating/deactivating is handled in the Quartz backend,
resulting in the attached patch. It does make the code a bit cleaner IMHO, but
as it might be regarded as a case of "if it ain't broken, don't fix it" I'd
like to hear other people's opinion about it. Please shout if some change
strikes you as unnecessary or wrong, and I'll explain the reasons behind it. As
far as I tested it, it does not introduce any new bugs, but I may well have
missed some.
- The most fundamental change (that triggered most of the others) is irrelevant
for the usual single-window SDL applications, it only affects the people who
are crazy enough to display other Cocoa windows alongside the SDL window (I'm
actually doing this currently, although the additional window only displays
debugging info and won't be present in the final product): Before, some things
were done on the application becoming active, some on the window becoming key,
and some on the window becoming main. Conceptually, all these actions belong to
the window becoming key, so that's what I implemented. However, since in a
single-window application these three events always happen together, the
previous implementation "ain't broken".
- This slightly changed the meaning of the SDL_APPMOUSEFOCUS flag from
SDL_GetAppState(): Before, it meant "window is main and mouse is inside window
(or mode is fullscreen)". Now, it means "window is key and mouse is inside
window (or mode is fullscreen)". It makes more sense to me that way. (See
http://developer.apple.com/documentation/Cocoa/Conceptual/WinPanel/Concepts/ChangingMainKeyWindow.html
for a discussion of what key and main windows are.) The other two flags are
unchanged: SDL_APPACTIVE = application is not hidden and window is not
minimized, SDL_APPINPUTFOCUS = window is key (or mode is fullscreen).
- As a side effect, the reorganization fixes the following two issues (and
maybe others) (but they could also be fixed in less invasive ways):
* A regression that was introduced in revision 1.42 of SDL_QuartzVideo.m
(http://libsdl.org/cgi/cvsweb.cgi/SDL12/src/video/quartz/SDL_QuartzVideo.m.diff?r1=1.41&r2=1.42)
(from half-desirable to undesirable behavior):
Situation: While in windowed mode, hide the cursor using
SDL_ShowCursor(SDL_DISABLE), move the mouse outside of the window so that the
cursor becomes visible again, and SDL_SetVideoMode() to a fullscreen mode.
What happened before revision 1.42: The cursor is visible, but becomes
invisible as soon as the mouse is moved (half-desirable).
What happens in revision 1.42 and after (including current CVS): The cursor is
visible and stays visible (undesirable).
What happens after my patch: The cursor is invisible from the beginning
(desirable).
* When the cursor is hidden and grabbed, switch away from the application using
cmd-tab (which ungrabs and makes the cursor visible), move the cursor outside
of the SDL window, then cmd-tab back to the application. In 1.2.8 and in the
current CVS, the cursor is re-grabbed, but it stays visible (immovable in the
middle of the window). With my patch, the cursor is correctly re-grabbed and
hidden. (For some reason, it still doesn't work correctly if you switch back to
the application using the dock instead of cmd-tab. I haven't been able to
figure out why. I can step over [NSCursor hide] being called in the debugger,
but it seems to have no effect.)
- The patch includes my patch for #12 (it was easier to obtain using cvs diff
that way). If you apply both of them, you will end up with 6 duplicate lines in
SDL_QuartzEvents.m.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401636
2006-04-13 14:17:48 +00:00
|
|
|
/* Set app state, hide cursor if necessary, ... */
|
|
|
|
QZ_DoActivate(this);
|
2005-08-18 06:18:30 +00:00
|
|
|
|
2001-06-07 14:28:11 +00:00
|
|
|
return current;
|
|
|
|
|
2002-06-01 23:05:05 +00:00
|
|
|
/* Since the blanking window covers *all* windows (even force quit) correct recovery is crucial */
|
2011-09-13 20:30:48 -04:00
|
|
|
ERR_NO_GL:
|
|
|
|
ERR_DOUBLEBUF: QZ_RestoreDisplayMode(this);
|
2003-02-01 19:59:23 +00:00
|
|
|
ERR_NO_SWITCH: CGReleaseAllDisplays ();
|
2006-02-07 11:18:21 +00:00
|
|
|
ERR_NO_CAPTURE:
|
|
|
|
ERR_NO_MATCH: if ( fade_token != kCGDisplayFadeReservationInvalidToken ) {
|
|
|
|
CGDisplayFade (fade_token, 0.5, kCGDisplayBlendSolidColor, kCGDisplayBlendNormal, 0.0, 0.0, 0.0, FALSE);
|
|
|
|
CGReleaseDisplayFadeReservation (fade_token);
|
|
|
|
}
|
|
|
|
return NULL;
|
2001-06-07 14:28:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static SDL_Surface* QZ_SetVideoWindowed (_THIS, SDL_Surface *current, int width,
|
2009-10-10 14:59:32 +00:00
|
|
|
int height, int *bpp, Uint32 flags)
|
|
|
|
{
|
2001-06-11 06:44:43 +00:00
|
|
|
unsigned int style;
|
2002-10-05 05:07:57 +00:00
|
|
|
NSRect contentRect;
|
2003-07-23 04:39:44 +00:00
|
|
|
int center_window = 1;
|
|
|
|
int origin_x, origin_y;
|
2006-02-07 11:18:21 +00:00
|
|
|
CGDisplayFadeReservationToken fade_token = kCGDisplayFadeReservationInvalidToken;
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2001-06-11 06:44:43 +00:00
|
|
|
current->flags = 0;
|
|
|
|
current->w = width;
|
2001-06-07 14:28:11 +00:00
|
|
|
current->h = height;
|
2002-10-05 05:07:57 +00:00
|
|
|
|
|
|
|
contentRect = NSMakeRect (0, 0, width, height);
|
2009-09-29 13:07:36 +00:00
|
|
|
|
2002-10-05 05:07:57 +00:00
|
|
|
/*
|
|
|
|
Check if we should completely destroy the previous mode
|
|
|
|
- If it is fullscreen
|
|
|
|
- If it has different noframe or resizable attribute
|
|
|
|
- If it is OpenGL (since gl attributes could be different)
|
|
|
|
- If new mode is OpenGL, but previous mode wasn't
|
|
|
|
*/
|
2006-02-07 11:18:21 +00:00
|
|
|
if (video_set == SDL_TRUE) {
|
|
|
|
if (mode_flags & SDL_FULLSCREEN) {
|
|
|
|
/* Fade to black to hide resolution-switching flicker (and garbage
|
|
|
|
that is displayed by a destroyed OpenGL context, if applicable) */
|
|
|
|
if (CGAcquireDisplayFadeReservation (5, &fade_token) == kCGErrorSuccess) {
|
|
|
|
CGDisplayFade (fade_token, 0.3, kCGDisplayBlendNormal, kCGDisplayBlendSolidColor, 0.0, 0.0, 0.0, TRUE);
|
|
|
|
}
|
|
|
|
QZ_UnsetVideoMode (this, TRUE);
|
|
|
|
}
|
|
|
|
else if ( ((mode_flags ^ flags) & (SDL_NOFRAME|SDL_RESIZABLE)) ||
|
|
|
|
(mode_flags & SDL_OPENGL) ||
|
|
|
|
(flags & SDL_OPENGL) ) {
|
|
|
|
QZ_UnsetVideoMode (this, TRUE);
|
|
|
|
}
|
|
|
|
}
|
2003-08-10 07:21:43 +00:00
|
|
|
|
2009-09-21 06:08:23 +00:00
|
|
|
/* Sorry, QuickDraw was ripped out. */
|
|
|
|
if (getenv("SDL_NSWindowPointer") || getenv("SDL_NSQuickDrawViewPointer")) {
|
|
|
|
SDL_SetError ("Embedded QuickDraw windows are no longer supported");
|
|
|
|
if (fade_token != kCGDisplayFadeReservationInvalidToken) {
|
|
|
|
CGDisplayFade (fade_token, 0.5, kCGDisplayBlendSolidColor, kCGDisplayBlendNormal, 0.0, 0.0, 0.0, FALSE);
|
|
|
|
CGReleaseDisplayFadeReservation (fade_token);
|
2003-08-10 07:21:43 +00:00
|
|
|
}
|
2009-09-21 06:08:23 +00:00
|
|
|
return NULL;
|
2003-08-10 07:21:43 +00:00
|
|
|
}
|
2009-09-21 06:08:23 +00:00
|
|
|
|
2002-10-05 05:07:57 +00:00
|
|
|
/* Check if we should recreate the window */
|
|
|
|
if (qz_window == nil) {
|
|
|
|
|
|
|
|
/* Set the window style based on input flags */
|
|
|
|
if ( flags & SDL_NOFRAME ) {
|
|
|
|
style = NSBorderlessWindowMask;
|
|
|
|
current->flags |= SDL_NOFRAME;
|
|
|
|
} else {
|
|
|
|
style = NSTitledWindowMask;
|
|
|
|
style |= (NSMiniaturizableWindowMask | NSClosableWindowMask);
|
|
|
|
if ( flags & SDL_RESIZABLE ) {
|
|
|
|
style |= NSResizableWindowMask;
|
|
|
|
current->flags |= SDL_RESIZABLE;
|
|
|
|
}
|
|
|
|
}
|
2009-09-29 13:07:36 +00:00
|
|
|
|
2002-10-05 05:07:57 +00:00
|
|
|
/* Manually create a window, avoids having a nib file resource */
|
|
|
|
qz_window = [ [ SDL_QuartzWindow alloc ]
|
|
|
|
initWithContentRect:contentRect
|
|
|
|
styleMask:style
|
|
|
|
backing:NSBackingStoreBuffered
|
|
|
|
defer:NO ];
|
|
|
|
|
|
|
|
if (qz_window == nil) {
|
|
|
|
SDL_SetError ("Could not create the Cocoa window");
|
2006-02-07 11:18:21 +00:00
|
|
|
if (fade_token != kCGDisplayFadeReservationInvalidToken) {
|
|
|
|
CGDisplayFade (fade_token, 0.5, kCGDisplayBlendSolidColor, kCGDisplayBlendNormal, 0.0, 0.0, 0.0, FALSE);
|
|
|
|
CGReleaseDisplayFadeReservation (fade_token);
|
|
|
|
}
|
2002-10-05 05:07:57 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
2009-09-29 13:07:36 +00:00
|
|
|
|
2007-07-24 04:21:05 +00:00
|
|
|
/*[ qz_window setReleasedWhenClosed:YES ];*/ /* no need to set this as it's the default for NSWindows */
|
2002-10-05 05:07:57 +00:00
|
|
|
QZ_SetCaption(this, this->wm_title, this->wm_icon);
|
|
|
|
[ qz_window setAcceptsMouseMovedEvents:YES ];
|
|
|
|
[ qz_window setViewsNeedDisplay:NO ];
|
2009-09-29 13:07:36 +00:00
|
|
|
|
|
|
|
if ( QZ_WindowPosition(this, &origin_x, &origin_y) ) {
|
|
|
|
/* have to flip the Y value (NSPoint is lower left corner origin) */
|
|
|
|
[ qz_window setFrameTopLeftPoint:NSMakePoint((float) origin_x, (float) (this->info.current_h - origin_y))];
|
|
|
|
center_window = 0;
|
2009-09-29 13:42:33 +00:00
|
|
|
} else if ( center_window ) {
|
2003-07-23 04:39:44 +00:00
|
|
|
[ qz_window center ];
|
|
|
|
}
|
2009-09-29 13:07:36 +00:00
|
|
|
|
2002-10-05 05:07:57 +00:00
|
|
|
[ qz_window setDelegate:
|
2007-07-24 04:21:05 +00:00
|
|
|
[ [ SDL_QuartzWindowDelegate alloc ] init ] ];
|
2007-07-15 15:58:00 +00:00
|
|
|
[ qz_window setContentView: [ [ [ SDL_QuartzView alloc ] init ] autorelease ] ];
|
2002-10-05 05:07:57 +00:00
|
|
|
}
|
|
|
|
/* We already have a window, just change its size */
|
|
|
|
else {
|
2009-09-29 13:42:33 +00:00
|
|
|
[ qz_window setContentSize:contentRect.size ];
|
|
|
|
current->flags |= (SDL_NOFRAME|SDL_RESIZABLE) & mode_flags;
|
|
|
|
[ window_view setFrameSize:contentRect.size ];
|
2002-10-05 05:07:57 +00:00
|
|
|
}
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-10-05 05:07:57 +00:00
|
|
|
/* For OpenGL, we bind the context to a subview */
|
2001-06-07 14:28:11 +00:00
|
|
|
if ( flags & SDL_OPENGL ) {
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2005-11-22 09:59:42 +00:00
|
|
|
if ( ! QZ_SetupOpenGL (this, *bpp, flags) ) {
|
2006-02-07 11:18:21 +00:00
|
|
|
if (fade_token != kCGDisplayFadeReservationInvalidToken) {
|
|
|
|
CGDisplayFade (fade_token, 0.5, kCGDisplayBlendSolidColor, kCGDisplayBlendNormal, 0.0, 0.0, 0.0, FALSE);
|
|
|
|
CGReleaseDisplayFadeReservation (fade_token);
|
|
|
|
}
|
2001-06-07 14:28:11 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-10-05 05:07:57 +00:00
|
|
|
window_view = [ [ NSView alloc ] initWithFrame:contentRect ];
|
2004-02-16 21:06:10 +00:00
|
|
|
[ window_view setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable ];
|
2002-10-05 05:07:57 +00:00
|
|
|
[ [ qz_window contentView ] addSubview:window_view ];
|
|
|
|
[ gl_context setView: window_view ];
|
|
|
|
[ window_view release ];
|
2001-06-07 14:28:11 +00:00
|
|
|
[ gl_context makeCurrentContext];
|
2001-08-21 07:19:59 +00:00
|
|
|
[ qz_window makeKeyAndOrderFront:nil ];
|
2001-06-07 14:28:11 +00:00
|
|
|
current->flags |= SDL_OPENGL;
|
|
|
|
}
|
2009-09-21 06:08:23 +00:00
|
|
|
/* For 2D, we build a CGBitmapContext */
|
2001-06-07 14:28:11 +00:00
|
|
|
else {
|
2009-09-21 06:08:23 +00:00
|
|
|
CGColorSpaceRef cgColorspace;
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-10-05 05:07:57 +00:00
|
|
|
/* Only recreate the view if it doesn't already exist */
|
|
|
|
if (window_view == nil) {
|
|
|
|
|
2009-09-21 06:08:23 +00:00
|
|
|
window_view = [ [ NSView alloc ] initWithFrame:contentRect ];
|
2004-02-16 21:06:10 +00:00
|
|
|
[ window_view setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable ];
|
2002-10-05 05:07:57 +00:00
|
|
|
[ [ qz_window contentView ] addSubview:window_view ];
|
|
|
|
[ window_view release ];
|
|
|
|
[ qz_window makeKeyAndOrderFront:nil ];
|
|
|
|
}
|
|
|
|
|
2009-09-21 06:08:23 +00:00
|
|
|
cgColorspace = CGColorSpaceCreateDeviceRGB();
|
|
|
|
current->pitch = 4 * current->w;
|
|
|
|
current->pixels = SDL_malloc (current->h * current->pitch);
|
|
|
|
|
|
|
|
cg_context = CGBitmapContextCreate (current->pixels, current->w, current->h,
|
|
|
|
8, current->pitch, cgColorspace,
|
|
|
|
kCGImageAlphaNoneSkipFirst);
|
|
|
|
CGColorSpaceRelease (cgColorspace);
|
|
|
|
|
2001-06-07 14:28:11 +00:00
|
|
|
current->flags |= SDL_SWSURFACE;
|
2002-09-16 18:38:09 +00:00
|
|
|
current->flags |= SDL_ASYNCBLIT;
|
2009-09-21 06:08:23 +00:00
|
|
|
current->hwdata = (void *) cg_context;
|
2011-09-13 20:30:48 -04:00
|
|
|
|
|
|
|
this->UpdateRects = QZ_UpdateRects;
|
|
|
|
this->LockHWSurface = QZ_LockHWSurface;
|
|
|
|
this->UnlockHWSurface = QZ_UnlockHWSurface;
|
2001-06-07 14:28:11 +00:00
|
|
|
}
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
/* Save flags to ensure correct teardown */
|
|
|
|
mode_flags = current->flags;
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2006-02-07 11:18:21 +00:00
|
|
|
/* Fade in again (asynchronously) if we came from a fullscreen mode and faded to black */
|
|
|
|
if (fade_token != kCGDisplayFadeReservationInvalidToken) {
|
|
|
|
CGDisplayFade (fade_token, 0.5, kCGDisplayBlendSolidColor, kCGDisplayBlendNormal, 0.0, 0.0, 0.0, FALSE);
|
|
|
|
CGReleaseDisplayFadeReservation (fade_token);
|
|
|
|
}
|
|
|
|
|
2001-06-07 14:28:11 +00:00
|
|
|
return current;
|
|
|
|
}
|
|
|
|
|
2002-06-01 23:05:05 +00:00
|
|
|
static SDL_Surface* QZ_SetVideoMode (_THIS, SDL_Surface *current, int width,
|
2009-10-10 14:59:32 +00:00
|
|
|
int height, int bpp, Uint32 flags)
|
|
|
|
{
|
2011-09-13 20:30:48 -04:00
|
|
|
const BOOL isLion = IS_LION_OR_LATER(this);
|
2001-06-07 14:28:11 +00:00
|
|
|
current->flags = 0;
|
2004-02-24 06:53:22 +00:00
|
|
|
current->pixels = NULL;
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2001-06-07 14:28:11 +00:00
|
|
|
/* Setup full screen video */
|
|
|
|
if ( flags & SDL_FULLSCREEN ) {
|
2011-09-13 20:30:48 -04:00
|
|
|
if ( isLion ) {
|
|
|
|
bpp = 32;
|
|
|
|
}
|
2001-06-07 14:28:11 +00:00
|
|
|
current = QZ_SetVideoFullScreen (this, current, width, height, bpp, flags );
|
|
|
|
if (current == NULL)
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
/* Setup windowed video */
|
|
|
|
else {
|
2011-09-13 20:30:48 -04:00
|
|
|
/* Force bpp to 32 */
|
|
|
|
bpp = 32;
|
2005-11-22 09:59:42 +00:00
|
|
|
current = QZ_SetVideoWindowed (this, current, width, height, &bpp, flags);
|
2001-06-07 14:28:11 +00:00
|
|
|
if (current == NULL)
|
|
|
|
return NULL;
|
|
|
|
}
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2011-09-15 20:59:57 -04:00
|
|
|
if (qz_window != nil) {
|
|
|
|
NSGraphicsContext *ctx;
|
|
|
|
ctx = [NSGraphicsContext graphicsContextWithWindow:qz_window];
|
|
|
|
[NSGraphicsContext setCurrentContext:ctx];
|
|
|
|
}
|
|
|
|
|
2001-06-07 14:28:11 +00:00
|
|
|
/* Setup the new pixel format */
|
|
|
|
{
|
2002-06-01 23:05:05 +00:00
|
|
|
int amask = 0,
|
|
|
|
rmask = 0,
|
|
|
|
gmask = 0,
|
|
|
|
bmask = 0;
|
|
|
|
|
2001-06-07 14:28:11 +00:00
|
|
|
switch (bpp) {
|
|
|
|
case 16: /* (1)-5-5-5 RGB */
|
2002-06-01 23:05:05 +00:00
|
|
|
amask = 0;
|
2001-06-11 06:44:43 +00:00
|
|
|
rmask = 0x7C00;
|
|
|
|
gmask = 0x03E0;
|
|
|
|
bmask = 0x001F;
|
2001-06-07 14:28:11 +00:00
|
|
|
break;
|
|
|
|
case 24:
|
|
|
|
SDL_SetError ("24bpp is not available");
|
|
|
|
return NULL;
|
|
|
|
case 32: /* (8)-8-8-8 ARGB */
|
2001-08-19 23:57:39 +00:00
|
|
|
amask = 0x00000000;
|
2011-09-13 20:30:48 -04:00
|
|
|
if ( (!isLion) && (flags & SDL_FULLSCREEN) ) {
|
|
|
|
rmask = 0x00FF0000;
|
|
|
|
gmask = 0x0000FF00;
|
|
|
|
bmask = 0x000000FF;
|
|
|
|
} else {
|
2009-10-16 04:29:27 +00:00
|
|
|
#if SDL_BYTEORDER == SDL_LIL_ENDIAN
|
2011-09-13 20:30:48 -04:00
|
|
|
rmask = 0x0000FF00;
|
|
|
|
gmask = 0x00FF0000;
|
|
|
|
bmask = 0xFF000000;
|
2009-09-21 06:08:23 +00:00
|
|
|
#else
|
2011-09-13 20:30:48 -04:00
|
|
|
rmask = 0x00FF0000;
|
|
|
|
gmask = 0x0000FF00;
|
|
|
|
bmask = 0x000000FF;
|
2009-09-21 06:08:23 +00:00
|
|
|
#endif
|
2011-09-13 20:30:48 -04:00
|
|
|
break;
|
|
|
|
}
|
2001-06-07 14:28:11 +00:00
|
|
|
}
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2001-06-07 14:28:11 +00:00
|
|
|
if ( ! SDL_ReallocFormat (current, bpp,
|
|
|
|
rmask, gmask, bmask, amask ) ) {
|
2002-06-01 23:05:05 +00:00
|
|
|
SDL_SetError ("Couldn't reallocate pixel format");
|
|
|
|
return NULL;
|
2009-09-23 06:56:28 +00:00
|
|
|
}
|
2001-06-07 14:28:11 +00:00
|
|
|
}
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
/* Signal successful completion (used internally) */
|
2001-08-19 23:57:39 +00:00
|
|
|
video_set = SDL_TRUE;
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2001-06-07 14:28:11 +00:00
|
|
|
return current;
|
|
|
|
}
|
|
|
|
|
2009-10-10 14:59:32 +00:00
|
|
|
static int QZ_ToggleFullScreen (_THIS, int on)
|
|
|
|
{
|
2003-01-21 05:29:50 +00:00
|
|
|
return 0;
|
2001-06-07 14:28:11 +00:00
|
|
|
}
|
|
|
|
|
2002-06-01 23:05:05 +00:00
|
|
|
static int QZ_SetColors (_THIS, int first_color, int num_colors,
|
2009-10-10 14:59:32 +00:00
|
|
|
SDL_Color *colors)
|
|
|
|
{
|
2011-09-13 20:30:48 -04:00
|
|
|
#if (MAC_OS_X_VERSION_MIN_REQUIRED < 1070)
|
|
|
|
/* we shouldn't have an 8-bit mode on Lion! */
|
|
|
|
if (!IS_LION_OR_LATER(this)) {
|
|
|
|
CGTableCount index;
|
|
|
|
CGDeviceColor color;
|
|
|
|
|
|
|
|
for (index = first_color; index < first_color+num_colors; index++) {
|
|
|
|
|
|
|
|
/* Clamp colors between 0.0 and 1.0 */
|
|
|
|
color.red = colors->r / 255.0;
|
|
|
|
color.blue = colors->b / 255.0;
|
|
|
|
color.green = colors->g / 255.0;
|
|
|
|
|
|
|
|
colors++;
|
|
|
|
|
|
|
|
CGPaletteSetColorAtIndex (palette, color, index);
|
|
|
|
}
|
|
|
|
|
|
|
|
return ( CGDisplayNoErr == CGDisplaySetPalette (display_id, palette) );
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
return 0;
|
2001-06-07 14:28:11 +00:00
|
|
|
}
|
|
|
|
|
2011-09-13 20:30:48 -04:00
|
|
|
#if (MAC_OS_X_VERSION_MIN_REQUIRED < 1070)
|
|
|
|
static int QZ_LockDoubleBuffer (_THIS, SDL_Surface *surface)
|
|
|
|
{
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void QZ_UnlockDoubleBuffer (_THIS, SDL_Surface *surface)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
/* The VBL delay is based on code by Ian R Ollmann's RezLib <iano@cco.caltech.edu> */
|
|
|
|
static AbsoluteTime QZ_SecondsToAbsolute ( double seconds )
|
|
|
|
{
|
|
|
|
union
|
|
|
|
{
|
|
|
|
UInt64 i;
|
|
|
|
Nanoseconds ns;
|
|
|
|
} temp;
|
|
|
|
|
|
|
|
temp.i = seconds * 1000000000.0;
|
|
|
|
|
|
|
|
return NanosecondsToAbsolute ( temp.ns );
|
|
|
|
}
|
|
|
|
|
|
|
|
static int QZ_ThreadFlip (_THIS)
|
|
|
|
{
|
|
|
|
Uint8 *src, *dst;
|
|
|
|
int skip, len, h;
|
|
|
|
|
|
|
|
/*
|
|
|
|
Give this thread the highest scheduling priority possible,
|
|
|
|
in the hopes that it will immediately run after the VBL delay
|
|
|
|
*/
|
|
|
|
{
|
|
|
|
pthread_t current_thread;
|
|
|
|
int policy;
|
|
|
|
struct sched_param param;
|
|
|
|
|
|
|
|
current_thread = pthread_self ();
|
|
|
|
pthread_getschedparam (current_thread, &policy, ¶m);
|
|
|
|
policy = SCHED_RR;
|
|
|
|
param.sched_priority = sched_get_priority_max (policy);
|
|
|
|
pthread_setschedparam (current_thread, policy, ¶m);
|
|
|
|
}
|
|
|
|
|
|
|
|
while (1) {
|
|
|
|
|
|
|
|
SDL_SemWait (sem1);
|
|
|
|
if (quit_thread)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We have to add SDL_VideoSurface->offset here, since we might be a
|
|
|
|
* smaller surface in the center of the framebuffer (you asked for
|
|
|
|
* a fullscreen resolution smaller than the hardware could supply
|
|
|
|
* so SDL is centering it in a bigger resolution)...
|
|
|
|
*/
|
|
|
|
dst = ((Uint8 *)((size_t)CGDisplayBaseAddress (display_id))) + SDL_VideoSurface->offset;
|
|
|
|
src = current_buffer + SDL_VideoSurface->offset;
|
|
|
|
len = SDL_VideoSurface->w * SDL_VideoSurface->format->BytesPerPixel;
|
|
|
|
h = SDL_VideoSurface->h;
|
|
|
|
skip = SDL_VideoSurface->pitch;
|
|
|
|
|
|
|
|
/* Wait for the VBL to occur (estimated since we don't have a hardware interrupt) */
|
|
|
|
{
|
|
|
|
|
|
|
|
/* The VBL delay is based on Ian Ollmann's RezLib <iano@cco.caltech.edu> */
|
|
|
|
double refreshRate;
|
|
|
|
double linesPerSecond;
|
|
|
|
double target;
|
|
|
|
double position;
|
|
|
|
double adjustment;
|
|
|
|
AbsoluteTime nextTime;
|
|
|
|
CFNumberRef refreshRateCFNumber;
|
|
|
|
|
|
|
|
refreshRateCFNumber = CFDictionaryGetValue (mode, kCGDisplayRefreshRate);
|
|
|
|
if ( NULL == refreshRateCFNumber ) {
|
|
|
|
SDL_SetError ("Mode has no refresh rate");
|
|
|
|
goto ERROR;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( 0 == CFNumberGetValue (refreshRateCFNumber, kCFNumberDoubleType, &refreshRate) ) {
|
|
|
|
SDL_SetError ("Error getting refresh rate");
|
|
|
|
goto ERROR;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( 0 == refreshRate ) {
|
|
|
|
|
|
|
|
SDL_SetError ("Display has no refresh rate, using 60hz");
|
|
|
|
|
|
|
|
/* ok, for LCD's we'll emulate a 60hz refresh, which may or may not look right */
|
|
|
|
refreshRate = 60.0;
|
|
|
|
}
|
|
|
|
|
|
|
|
linesPerSecond = refreshRate * h;
|
|
|
|
target = h;
|
|
|
|
|
|
|
|
/* Figure out the first delay so we start off about right */
|
|
|
|
position = CGDisplayBeamPosition (display_id);
|
|
|
|
if (position > target)
|
|
|
|
position = 0;
|
|
|
|
|
|
|
|
adjustment = (target - position) / linesPerSecond;
|
|
|
|
|
|
|
|
nextTime = AddAbsoluteToAbsolute (UpTime (), QZ_SecondsToAbsolute (adjustment));
|
|
|
|
|
|
|
|
MPDelayUntil (&nextTime);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* On error, skip VBL delay */
|
|
|
|
ERROR:
|
|
|
|
|
|
|
|
/* TODO: use CGContextDrawImage here too! Create two CGContextRefs the same way we
|
|
|
|
create two buffers, replace current_buffer with current_context and set it
|
|
|
|
appropriately in QZ_FlipDoubleBuffer. */
|
|
|
|
while ( h-- ) {
|
|
|
|
|
|
|
|
SDL_memcpy (dst, src, len);
|
|
|
|
src += skip;
|
|
|
|
dst += skip;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* signal flip completion */
|
|
|
|
SDL_SemPost (sem2);
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int QZ_FlipDoubleBuffer (_THIS, SDL_Surface *surface)
|
|
|
|
{
|
|
|
|
/* wait for previous flip to complete */
|
|
|
|
SDL_SemWait (sem2);
|
|
|
|
|
|
|
|
current_buffer = surface->pixels;
|
|
|
|
|
|
|
|
if (surface->pixels == sw_buffers[0])
|
|
|
|
surface->pixels = sw_buffers[1];
|
|
|
|
else
|
|
|
|
surface->pixels = sw_buffers[0];
|
|
|
|
|
|
|
|
/* signal worker thread to do the flip */
|
|
|
|
SDL_SemPost (sem1);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void QZ_DoubleBufferUpdate (_THIS, int num_rects, SDL_Rect *rects)
|
|
|
|
{
|
|
|
|
/* perform a flip if someone calls updaterects on a doublebuferred surface */
|
|
|
|
this->FlipHWSurface (this, SDL_VideoSurface);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void QZ_DirectUpdate (_THIS, int num_rects, SDL_Rect *rects)
|
|
|
|
{
|
|
|
|
#pragma unused(this,num_rects,rects)
|
|
|
|
}
|
|
|
|
#endif
|
2002-09-16 18:38:09 +00:00
|
|
|
|
2004-01-04 14:55:35 +00:00
|
|
|
/* Resize icon, BMP format */
|
|
|
|
static const unsigned char QZ_ResizeIcon[] = {
|
|
|
|
0x42,0x4d,0x31,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x36,0x00,0x00,0x00,0x28,0x00,
|
|
|
|
0x00,0x00,0x0d,0x00,0x00,0x00,0x0d,0x00,0x00,0x00,0x01,0x00,0x18,0x00,0x00,0x00,
|
|
|
|
0x00,0x00,0xfb,0x01,0x00,0x00,0x13,0x0b,0x00,0x00,0x13,0x0b,0x00,0x00,0x00,0x00,
|
|
|
|
0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
|
|
|
|
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
|
|
|
|
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0b,0xff,0xff,
|
|
|
|
0xff,0xda,0xda,0xda,0x87,0x87,0x87,0xe8,0xe8,0xe8,0xff,0xff,0xff,0xda,0xda,0xda,
|
|
|
|
0x87,0x87,0x87,0xe8,0xe8,0xe8,0xff,0xff,0xff,0xda,0xda,0xda,0x87,0x87,0x87,0xe8,
|
|
|
|
0xe8,0xe8,0xff,0xff,0xff,0x0b,0xff,0xff,0xff,0xff,0xff,0xff,0xda,0xda,0xda,0x87,
|
|
|
|
0x87,0x87,0xe8,0xe8,0xe8,0xff,0xff,0xff,0xda,0xda,0xda,0x87,0x87,0x87,0xe8,0xe8,
|
|
|
|
0xe8,0xff,0xff,0xff,0xda,0xda,0xda,0x87,0x87,0x87,0xff,0xff,0xff,0x0b,0xff,0xff,
|
|
|
|
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xd5,0xd5,0xd5,0x87,0x87,0x87,0xe8,0xe8,0xe8,
|
|
|
|
0xff,0xff,0xff,0xda,0xda,0xda,0x87,0x87,0x87,0xe8,0xe8,0xe8,0xff,0xff,0xff,0xda,
|
|
|
|
0xda,0xda,0xff,0xff,0xff,0x0b,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
|
|
|
|
0xff,0xff,0xd7,0xd7,0xd7,0x87,0x87,0x87,0xe8,0xe8,0xe8,0xff,0xff,0xff,0xda,0xda,
|
|
|
|
0xda,0x87,0x87,0x87,0xe8,0xe8,0xe8,0xff,0xff,0xff,0xff,0xff,0xff,0x0b,0xff,0xff,
|
|
|
|
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xd7,0xd7,0xd7,
|
|
|
|
0x87,0x87,0x87,0xe8,0xe8,0xe8,0xff,0xff,0xff,0xda,0xda,0xda,0x87,0x87,0x87,0xe8,
|
|
|
|
0xe8,0xe8,0xff,0xff,0xff,0x0b,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
|
|
|
|
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xd7,0xd7,0xd7,0x87,0x87,0x87,0xe8,0xe8,
|
|
|
|
0xe8,0xff,0xff,0xff,0xdc,0xdc,0xdc,0x87,0x87,0x87,0xff,0xff,0xff,0x0b,0xff,0xff,
|
|
|
|
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
|
|
|
|
0xff,0xff,0xff,0xd9,0xd9,0xd9,0x87,0x87,0x87,0xe8,0xe8,0xe8,0xff,0xff,0xff,0xdc,
|
|
|
|
0xdc,0xdc,0xff,0xff,0xff,0x0b,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
|
|
|
|
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xdb,0xdb,
|
|
|
|
0xdb,0x87,0x87,0x87,0xe8,0xe8,0xe8,0xff,0xff,0xff,0xff,0xff,0xff,0x0b,0xff,0xff,
|
|
|
|
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
|
|
|
|
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xdb,0xdb,0xdb,0x87,0x87,0x87,0xe8,
|
|
|
|
0xe8,0xe8,0xff,0xff,0xff,0x0b,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
|
|
|
|
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
|
|
|
|
0xff,0xff,0xff,0xff,0xdc,0xdc,0xdc,0x87,0x87,0x87,0xff,0xff,0xff,0x0b,0xff,0xff,
|
|
|
|
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
|
|
|
|
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xdc,
|
|
|
|
0xdc,0xdc,0xff,0xff,0xff,0x0b,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
|
|
|
|
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
|
|
|
|
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0b
|
|
|
|
};
|
|
|
|
|
2009-10-10 14:59:32 +00:00
|
|
|
static void QZ_DrawResizeIcon (_THIS)
|
|
|
|
{
|
2004-01-04 14:55:35 +00:00
|
|
|
/* Check if we should draw the resize icon */
|
|
|
|
if (SDL_VideoSurface->flags & SDL_RESIZABLE) {
|
|
|
|
|
2009-09-21 06:08:23 +00:00
|
|
|
SDL_Rect icon_rect;
|
2004-01-04 14:55:35 +00:00
|
|
|
|
2009-09-21 06:08:23 +00:00
|
|
|
/* Create the icon image */
|
|
|
|
if (resize_icon == NULL) {
|
|
|
|
|
|
|
|
SDL_RWops *rw;
|
|
|
|
SDL_Surface *tmp;
|
2004-01-04 14:55:35 +00:00
|
|
|
|
2009-09-21 06:08:23 +00:00
|
|
|
rw = SDL_RWFromConstMem (QZ_ResizeIcon, sizeof(QZ_ResizeIcon));
|
|
|
|
tmp = SDL_LoadBMP_RW (rw, SDL_TRUE);
|
|
|
|
|
|
|
|
resize_icon = SDL_ConvertSurface (tmp, SDL_VideoSurface->format, SDL_SRCCOLORKEY);
|
|
|
|
SDL_SetColorKey (resize_icon, SDL_SRCCOLORKEY, 0xFFFFFF);
|
2004-01-04 14:55:35 +00:00
|
|
|
|
2009-09-21 06:08:23 +00:00
|
|
|
SDL_FreeSurface (tmp);
|
|
|
|
}
|
2004-01-04 14:55:35 +00:00
|
|
|
|
2009-09-21 06:08:23 +00:00
|
|
|
icon_rect.x = SDL_VideoSurface->w - 13;
|
|
|
|
icon_rect.y = SDL_VideoSurface->h - 13;
|
|
|
|
icon_rect.w = 13;
|
|
|
|
icon_rect.h = 13;
|
2004-01-04 14:55:35 +00:00
|
|
|
|
2009-09-21 06:08:23 +00:00
|
|
|
SDL_BlitSurface (resize_icon, NULL, SDL_VideoSurface, &icon_rect);
|
2004-01-04 14:55:35 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-10-10 14:59:32 +00:00
|
|
|
static void QZ_UpdateRects (_THIS, int numRects, SDL_Rect *rects)
|
|
|
|
{
|
2001-06-07 14:28:11 +00:00
|
|
|
if (SDL_VideoSurface->flags & SDL_OPENGLBLIT) {
|
|
|
|
QZ_GL_SwapBuffers (this);
|
|
|
|
}
|
2002-10-05 05:07:57 +00:00
|
|
|
else if ( [ qz_window isMiniaturized ] ) {
|
|
|
|
|
|
|
|
/* Do nothing if miniaturized */
|
2002-01-22 18:46:28 +00:00
|
|
|
}
|
2002-10-05 05:07:57 +00:00
|
|
|
|
2001-06-07 14:28:11 +00:00
|
|
|
else {
|
2009-09-21 06:08:23 +00:00
|
|
|
CGContextRef cgc = (CGContextRef)
|
2011-08-21 10:10:42 -04:00
|
|
|
[[NSGraphicsContext currentContext] graphicsPort];
|
2009-09-21 06:08:23 +00:00
|
|
|
QZ_DrawResizeIcon (this);
|
|
|
|
CGContextFlush (cg_context);
|
|
|
|
CGImageRef image = CGBitmapContextCreateImage (cg_context);
|
|
|
|
CGRect rectangle = CGRectMake (0,0,[window_view frame].size.width,[window_view frame].size.height);
|
2002-10-05 05:07:57 +00:00
|
|
|
|
2009-09-21 06:08:23 +00:00
|
|
|
CGContextDrawImage (cgc, rectangle, image);
|
|
|
|
CGImageRelease(image);
|
|
|
|
CGContextFlush (cgc);
|
2001-06-07 14:28:11 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-10-10 14:59:32 +00:00
|
|
|
static void QZ_VideoQuit (_THIS)
|
|
|
|
{
|
2006-02-07 11:18:21 +00:00
|
|
|
CGDisplayFadeReservationToken fade_token = kCGDisplayFadeReservationInvalidToken;
|
|
|
|
|
2002-12-13 21:09:52 +00:00
|
|
|
/* Restore gamma settings */
|
|
|
|
CGDisplayRestoreColorSyncSettings ();
|
|
|
|
|
|
|
|
/* Ensure the cursor will be visible and working when we quit */
|
|
|
|
CGDisplayShowCursor (display_id);
|
|
|
|
CGAssociateMouseAndMouseCursorPosition (1);
|
|
|
|
|
2006-02-07 11:18:21 +00:00
|
|
|
if (mode_flags & SDL_FULLSCREEN) {
|
|
|
|
/* Fade to black to hide resolution-switching flicker (and garbage
|
|
|
|
that is displayed by a destroyed OpenGL context, if applicable) */
|
|
|
|
if (CGAcquireDisplayFadeReservation (5, &fade_token) == kCGErrorSuccess) {
|
|
|
|
CGDisplayFade (fade_token, 0.3, kCGDisplayBlendNormal, kCGDisplayBlendSolidColor, 0.0, 0.0, 0.0, TRUE);
|
|
|
|
}
|
|
|
|
QZ_UnsetVideoMode (this, TRUE);
|
|
|
|
if (fade_token != kCGDisplayFadeReservationInvalidToken) {
|
|
|
|
CGDisplayFade (fade_token, 0.5, kCGDisplayBlendSolidColor, kCGDisplayBlendNormal, 0.0, 0.0, 0.0, FALSE);
|
|
|
|
CGReleaseDisplayFadeReservation (fade_token);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
QZ_UnsetVideoMode (this, TRUE);
|
2005-11-22 08:21:39 +00:00
|
|
|
|
2011-09-13 20:30:48 -04:00
|
|
|
#if (MAC_OS_X_VERSION_MIN_REQUIRED < 1070)
|
|
|
|
if (!IS_LION_OR_LATER(this)) {
|
|
|
|
CGPaletteRelease(palette);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2005-11-23 07:23:48 +00:00
|
|
|
if (opengl_library) {
|
|
|
|
SDL_UnloadObject(opengl_library);
|
|
|
|
opengl_library = NULL;
|
2005-11-22 08:21:39 +00:00
|
|
|
}
|
|
|
|
this->gl_config.driver_loaded = 0;
|
2007-07-11 07:53:12 +00:00
|
|
|
|
|
|
|
if (field_edit) {
|
|
|
|
[field_edit release];
|
|
|
|
field_edit = NULL;
|
|
|
|
}
|
2001-06-07 14:28:11 +00:00
|
|
|
}
|
|
|
|
|
2009-10-10 14:59:32 +00:00
|
|
|
static int QZ_LockHWSurface(_THIS, SDL_Surface *surface)
|
|
|
|
{
|
2001-06-07 14:28:11 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2009-10-10 14:59:32 +00:00
|
|
|
static void QZ_UnlockHWSurface(_THIS, SDL_Surface *surface)
|
|
|
|
{
|
2001-06-07 14:28:11 +00:00
|
|
|
}
|
|
|
|
|
2009-10-10 14:59:32 +00:00
|
|
|
static int QZ_AllocHWSurface(_THIS, SDL_Surface *surface)
|
|
|
|
{
|
Patch by me to fix crash described below.
--ryan.
To: sdl@libsdl.org
From: Rainer Deyke <rainerd@eldwood.com>
Date: Tue, 16 Aug 2005 01:08:18 -0600
Subject: [SDL] Bug report: SDL_CreateRGBSurface with SDL_HWSURFACE crashes
If SDL is in full-screen mode with a hardware video surface on OS X,
SDL_CreateRGBSurface with SDL_HWSURFACE crashes. The crash occurs on
line 109 of SDL_Surface.c. This was tested on OS X 10.3.9 with both SDL
1.2.8 and the latest CVS. Here is a small C++ program that demonstrates
the problem:
#include "SDL.h"
#include <stdio.h>
namespace {
void wait_for_key()
{
SDL_Event e;
printf("%d\n", SDL_GetAppState());
while (SDL_WaitEvent(&e)) {
if (e.type == SDL_KEYDOWN || e.type == SDL_QUIT) return;
}
}
}
int main(int, char *[])
{
SDL_Init(SDL_INIT_VIDEO);
SDL_Surface *screen
= SDL_SetVideoMode(640, 480, 32, SDL_FULLSCREEN | SDL_HWSURFACE);
SDL_Surface *s = SDL_CreateRGBSurface(SDL_HWSURFACE, 640, 480, 32,
screen->format->Rmask, screen->format->Gmask,
screen->format->Bmask, screen->format->Amask);
wait_for_key();
if (s) SDL_FreeSurface(s);
SDL_Quit();
printf("Success!\n");
return 0;
}
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401121
2005-08-18 06:46:32 +00:00
|
|
|
return(-1); /* unallowed (no HWSURFACE support here). */
|
|
|
|
}
|
|
|
|
|
2009-10-10 14:59:32 +00:00
|
|
|
static void QZ_FreeHWSurface (_THIS, SDL_Surface *surface)
|
|
|
|
{
|
2001-06-07 14:28:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Gamma functions */
|
2009-10-10 14:59:32 +00:00
|
|
|
int QZ_SetGamma (_THIS, float red, float green, float blue)
|
|
|
|
{
|
2001-06-07 14:28:11 +00:00
|
|
|
const CGGammaValue min = 0.0, max = 1.0;
|
2002-01-22 18:46:28 +00:00
|
|
|
|
|
|
|
if (red == 0.0)
|
|
|
|
red = FLT_MAX;
|
|
|
|
else
|
|
|
|
red = 1.0 / red;
|
|
|
|
|
|
|
|
if (green == 0.0)
|
|
|
|
green = FLT_MAX;
|
|
|
|
else
|
|
|
|
green = 1.0 / green;
|
|
|
|
|
|
|
|
if (blue == 0.0)
|
|
|
|
blue = FLT_MAX;
|
|
|
|
else
|
|
|
|
blue = 1.0 / blue;
|
2002-06-01 23:05:05 +00:00
|
|
|
|
|
|
|
if ( CGDisplayNoErr == CGSetDisplayTransferByFormula
|
|
|
|
(display_id, min, max, red, min, max, green, min, max, blue) ) {
|
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
else {
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
return -1;
|
|
|
|
}
|
2001-06-07 14:28:11 +00:00
|
|
|
}
|
|
|
|
|
2009-10-10 14:59:32 +00:00
|
|
|
int QZ_GetGamma (_THIS, float *red, float *green, float *blue)
|
|
|
|
{
|
2001-06-07 14:28:11 +00:00
|
|
|
CGGammaValue dummy;
|
2002-01-22 18:46:28 +00:00
|
|
|
if ( CGDisplayNoErr == CGGetDisplayTransferByFormula
|
2002-06-01 23:05:05 +00:00
|
|
|
(display_id, &dummy, &dummy, red,
|
|
|
|
&dummy, &dummy, green, &dummy, &dummy, blue) )
|
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
return 0;
|
|
|
|
else
|
2001-06-07 14:28:11 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2009-10-10 14:59:32 +00:00
|
|
|
int QZ_SetGammaRamp (_THIS, Uint16 *ramp)
|
|
|
|
{
|
2011-08-21 23:38:35 -04:00
|
|
|
const uint32_t tableSize = 255;
|
2002-06-01 23:05:05 +00:00
|
|
|
CGGammaValue redTable[tableSize];
|
|
|
|
CGGammaValue greenTable[tableSize];
|
|
|
|
CGGammaValue blueTable[tableSize];
|
|
|
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
/* Extract gamma values into separate tables, convert to floats between 0.0 and 1.0 */
|
|
|
|
for (i = 0; i < 256; i++)
|
|
|
|
redTable[i % 256] = ramp[i] / 65535.0;
|
|
|
|
|
|
|
|
for (i=256; i < 512; i++)
|
|
|
|
greenTable[i % 256] = ramp[i] / 65535.0;
|
|
|
|
|
|
|
|
for (i=512; i < 768; i++)
|
|
|
|
blueTable[i % 256] = ramp[i] / 65535.0;
|
|
|
|
|
|
|
|
if ( CGDisplayNoErr == CGSetDisplayTransferByTable
|
|
|
|
(display_id, tableSize, redTable, greenTable, blueTable) )
|
2002-01-22 18:46:28 +00:00
|
|
|
return 0;
|
|
|
|
else
|
2001-06-07 14:28:11 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2009-10-10 14:59:32 +00:00
|
|
|
int QZ_GetGammaRamp (_THIS, Uint16 *ramp)
|
|
|
|
{
|
2011-08-21 23:38:35 -04:00
|
|
|
const uint32_t tableSize = 255;
|
2001-06-07 14:28:11 +00:00
|
|
|
CGGammaValue redTable[tableSize];
|
|
|
|
CGGammaValue greenTable[tableSize];
|
|
|
|
CGGammaValue blueTable[tableSize];
|
2011-08-21 23:38:35 -04:00
|
|
|
uint32_t actual;
|
2001-06-07 14:28:11 +00:00
|
|
|
int i;
|
2002-06-01 23:05:05 +00:00
|
|
|
|
|
|
|
if ( CGDisplayNoErr != CGGetDisplayTransferByTable
|
|
|
|
(display_id, tableSize, redTable, greenTable, blueTable, &actual) ||
|
|
|
|
actual != tableSize)
|
|
|
|
|
2001-06-07 14:28:11 +00:00
|
|
|
return -1;
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2001-06-07 14:28:11 +00:00
|
|
|
/* Pack tables into one array, with values from 0 to 65535 */
|
|
|
|
for (i = 0; i < 256; i++)
|
|
|
|
ramp[i] = redTable[i % 256] * 65535.0;
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2001-06-07 14:28:11 +00:00
|
|
|
for (i=256; i < 512; i++)
|
|
|
|
ramp[i] = greenTable[i % 256] * 65535.0;
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2001-06-07 14:28:11 +00:00
|
|
|
for (i=512; i < 768; i++)
|
|
|
|
ramp[i] = blueTable[i % 256] * 65535.0;
|
2002-06-01 23:05:05 +00:00
|
|
|
|
|
|
|
return 0;
|
2001-06-07 14:28:11 +00:00
|
|
|
}
|
|
|
|
|