2001-06-07 14:28:11 +00:00
|
|
|
/*
|
|
|
|
SDL - Simple DirectMedia Layer
|
2004-01-04 14:55:35 +00:00
|
|
|
Copyright (C) 1997-2003 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
|
|
|
|
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
|
|
|
|
|
2007-12-29 21:31:26 +00:00
|
|
|
@interface SDLTranslatorResponder : NSTextView
|
|
|
|
{
|
|
|
|
}
|
|
|
|
- (void) doCommandBySelector:(SEL)myselector;
|
|
|
|
@end
|
|
|
|
|
|
|
|
@implementation SDLTranslatorResponder
|
|
|
|
- (void) doCommandBySelector:(SEL) myselector {}
|
|
|
|
@end
|
|
|
|
|
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);
|
|
|
|
|
|
|
|
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);
|
|
|
|
static int QZ_LockWindow (_THIS, SDL_Surface *surface);
|
|
|
|
static void QZ_UnlockWindow (_THIS, SDL_Surface *surface);
|
|
|
|
static void QZ_UpdateRects (_THIS, int num_rects, SDL_Rect *rects);
|
|
|
|
static void QZ_VideoQuit (_THIS);
|
|
|
|
|
|
|
|
/* Hardware surface functions (for fullscreen mode only) */
|
|
|
|
#if 0 /* Not used (apparently, it's really slow) */
|
|
|
|
static int QZ_FillHWRect (_THIS, SDL_Surface *dst, SDL_Rect *rect, Uint32 color);
|
|
|
|
#endif
|
|
|
|
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);
|
|
|
|
/* static int QZ_FlipHWSurface (_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
|
|
|
};
|
|
|
|
|
2003-02-01 19:59:23 +00:00
|
|
|
|
2001-06-07 14:28:11 +00:00
|
|
|
/* Bootstrap functions */
|
|
|
|
static int QZ_Available () {
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
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;
|
|
|
|
/* device->UpdateRects = QZ_UpdateRects; this is determined by SetVideoMode() */
|
|
|
|
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->FlipHWSurface = QZ_FlipHWSurface */;
|
|
|
|
|
|
|
|
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
|
|
|
|
2002-06-01 23:05:05 +00:00
|
|
|
device->CreateYUVOverlay = QZ_CreateYUVOverlay;
|
|
|
|
|
|
|
|
device->free = QZ_DeleteDevice;
|
2002-01-22 18:46:28 +00:00
|
|
|
|
2001-06-07 14:28:11 +00:00
|
|
|
return device;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void QZ_DeleteDevice (SDL_VideoDevice *device) {
|
|
|
|
|
2006-05-01 11:07:04 +00:00
|
|
|
SDL_free (device->hidden);
|
|
|
|
SDL_free (device);
|
2001-06-07 14:28:11 +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;
|
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
/* Initialize the video settings; this data persists between mode switches */
|
|
|
|
display_id = kCGDirectMainDisplay;
|
|
|
|
save_mode = CGDisplayCurrentMode (display_id);
|
|
|
|
mode_list = CGDisplayAvailableModes (display_id);
|
|
|
|
palette = CGPaletteCreateDefaultColorPalette ();
|
2001-06-07 14:28:11 +00:00
|
|
|
|
2007-04-06 20:30:41 +00:00
|
|
|
env = SDL_getenv("SDL_VIDEO_ALLOW_SCREENSAVER");
|
|
|
|
allow_screensaver = ( env && SDL_atoi(env) ) ? YES : NO;
|
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
/* Gather some information that is useful to know about the display */
|
|
|
|
CFNumberGetValue (CFDictionaryGetValue (save_mode, kCGDisplayBitsPerPixel),
|
|
|
|
kCFNumberSInt32Type, &device_bpp);
|
2001-06-07 14:28:11 +00:00
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
CFNumberGetValue (CFDictionaryGetValue (save_mode, kCGDisplayWidth),
|
|
|
|
kCFNumberSInt32Type, &device_width);
|
|
|
|
|
|
|
|
CFNumberGetValue (CFDictionaryGetValue (save_mode, kCGDisplayHeight),
|
|
|
|
kCFNumberSInt32Type, &device_height);
|
|
|
|
|
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];
|
2002-10-05 05:07:57 +00:00
|
|
|
|
(Said Max Horn on the SDL mailing list...)
Hi folks,
based on Eric Wing's patch, I created the attached patch which fixes
the OpenGL coordinate inversion bug in SDL. It works fine over here on
10.3 with Ryan's test program (which I also attached).
There is another change in it: I removed the "- 1" in the two lines
using CGDisplayPixelsHigh()... while I understand from a logical point
of view why they *should* be correct, I checked the actual values
computed that way, and they were off-by-one. After removing the " - 1",
the returned mouse coordinates are correct. I checked this by moving
the mouse to the screen top/bottom in fullscreen mode, BTW. With the
change, the proper values 0 and 479 are returned (in 640x480 mode).
Sam, you may still want to test on 10.1, it's very simple using Ryan's
minimal test code :-)
Cheers,
Max
(Here is the reproduction case for revision history's sake...)
/*
* To compile:
* gcc -o test test.c `sdl-config --cflags` `sdl-config --libs` -framework OpenGL
*
* --ryan.
*/
#include <stdio.h>
#include "SDL.h"
#include "SDL_opengl.h"
int main(int argc, char **argv)
{
Uint32 flags = SDL_OPENGL /* | SDL_FULLSCREEN */;
SDL_Surface *screen;
SDL_Event event;
int done = 0;
GLfloat ratio;
SDL_Init(SDL_INIT_VIDEO);
SDL_ShowCursor(0);
if ((argv[1]) && (strcmp(argv[1], "--grab") == 0))
SDL_WM_GrabInput(SDL_GRAB_ON);
screen = SDL_SetVideoMode(640, 480, 0, flags);
if (!screen)
return(42);
ratio = ((GLfloat) screen->w) / ((GLfloat) screen->h);
glClearColor( 0.0f, 0.0f, 0.0f, 0.0f );
glClearDepth( 1.0f );
glEnable( GL_DEPTH_TEST );
glDepthFunc( GL_LEQUAL );
glViewport( 0, 0, screen->w, screen->h);
glMatrixMode( GL_PROJECTION );
glLoadIdentity();
gluPerspective( 45.0f, ratio, 0.1f, 100.0f );
glMatrixMode( GL_MODELVIEW );
glLoadIdentity();
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
SDL_GL_SwapBuffers();
// eh, close enough.
#define MAX_X 6.12
#define MAX_Y 4.50
while (!done)
{
int x, y;
GLfloat glx, gly;
if (!SDL_WaitEvent(&event))
break;
switch (event.type)
{
case SDL_KEYUP:
if (event.key.keysym.sym == SDLK_ESCAPE)
done = 1;
break;
}
SDL_GetMouseState(&x, &y);
glx = ((((GLfloat) x) / ((GLfloat) screen->w)) - 0.5f) * MAX_X;
gly = ((((GLfloat) y) / ((GLfloat) screen->h)) - 0.5f) * MAX_Y;
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glLoadIdentity();
glTranslatef(glx,-gly,-6.0f);
glBegin(GL_TRIANGLES);
glColor3f(1,0,0); glVertex3f( 0.00f, 0.25f, 0.00f);
glColor3f(0,1,0); glVertex3f(-0.25f, -0.25f, 0.00f);
glColor3f(0,0,1); glVertex3f( 0.25f, -0.25f, 0.00f);
glEnd();
SDL_GL_SwapBuffers();
}
SDL_Quit();
return(0);
}
/* end of test.c ... */
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40877
2004-03-22 09:38:20 +00:00
|
|
|
if ( Gestalt(gestaltSystemVersion, &system_version) != noErr )
|
|
|
|
system_version = 0;
|
Date: Thu, 17 Jun 2004 11:38:51 -0700 (PDT)
From: Eric Wing <ewing2121@yahoo.com>
Subject: New OS X patch (was Re: [SDL] Bug with inverted mouse coordinates in
I have a new patch for OS X I would like to submit.
First, it appears no further action has been taken on
my fix from Apple on the OpenGL windowed mode mouse
inversion problem. The fix would reunify the code, and
no longer require case checking for which version of
the OS you are running. This is probably a good fix
because the behavior with the old code could change
again with future versions of the OS, so those fixes
are included in this new patch.
But in addition, when I was at Apple, I asked them
about the ability to distinguish between the modifier
keys on the left and right sides of the keyboard (e.g.
Left Shift, Right Shift, Left/Right Alt, L/R Cmd, L/R
Ctrl). They told me that starting with Panther, the OS
began supporting this feature. This has always been a
source of annoyance for me when bringing a program
that comes from Windows or Linux to OS X when the
keybindings happened to need distinguishable left-side
and right-side keys. So the rest of the patch I am
submitting contains new code to support this feature
on Panther (and presumably later versions of the OS).
So after removing the OS version checks for the mouse
inversion problem, I reused the OS version checks to
activate the Left/Right detection of modifier keys. If
you are running Panther (or above), the new code will
attempt to distinguish between sides. For the older
OS's, the code path reverts to the original code.
I've tested with Panther on a G4 Cube, G5 dual
processor, and Powerbook Rev C. The Cube and G5
keyboards demonstrated the ability to distinguish
between sides. The Powerbook seems to only have
left-side keys, but the patch was still able to handle
it by producing the same results as before the patch.
I also wanted to test a non-Apple keyboard.
Unfortunately, I don't have any PC USB keyboards.
However, I was able to borrow a Sun Microsystems USB
keyboard, so I tried that out on the G5, and I got the
correct behavior for left and right sides. I'm
expecting that if it worked with a Sun keyboard, most
other keyboards should work with no problems.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40935
2004-08-20 22:35:23 +00: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
|
|
|
}
|
|
|
|
|
|
|
|
static SDL_Rect** QZ_ListModes (_THIS, SDL_PixelFormat *format, Uint32 flags) {
|
2002-06-01 23:05:05 +00:00
|
|
|
|
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 ) {
|
2001-06-07 14:28:11 +00:00
|
|
|
|
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
|
|
|
|
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++) {
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2001-08-19 23:57:39 +00:00
|
|
|
CFDictionaryRef onemode;
|
|
|
|
CFNumberRef number;
|
2002-06-01 23:05:05 +00:00
|
|
|
int bpp;
|
|
|
|
|
|
|
|
onemode = CFArrayGetValueAtIndex (mode_list, i);
|
|
|
|
number = CFDictionaryGetValue (onemode, kCGDisplayBitsPerPixel);
|
|
|
|
CFNumberGetValue (number, kCFNumberSInt32Type, &bpp);
|
|
|
|
|
|
|
|
if (bpp == format->BitsPerPixel) {
|
|
|
|
|
|
|
|
int intvalue;
|
|
|
|
int hasMode;
|
|
|
|
int width, height;
|
|
|
|
|
|
|
|
number = CFDictionaryGetValue (onemode, kCGDisplayWidth);
|
|
|
|
CFNumberGetValue (number, kCFNumberSInt32Type, &intvalue);
|
|
|
|
width = (Uint16) intvalue;
|
|
|
|
|
|
|
|
number = CFDictionaryGetValue (onemode, kCGDisplayHeight);
|
|
|
|
CFNumberGetValue (number, kCFNumberSInt32Type, &intvalue);
|
|
|
|
height = (Uint16) intvalue;
|
|
|
|
|
|
|
|
/* Check if mode is already in the list */
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
hasMode = SDL_FALSE;
|
|
|
|
for (i = 0; i < list_size; i++) {
|
2002-10-05 05:07:57 +00:00
|
|
|
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) );
|
2002-06-01 23:05:05 +00:00
|
|
|
else
|
2002-10-05 05:07:57 +00:00
|
|
|
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));
|
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) {
|
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
|
|
|
|
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
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
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;
|
|
|
|
}
|
|
|
|
|
2006-02-07 11:18:21 +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;
|
|
|
|
this->FillHWRect = NULL;
|
|
|
|
this->UpdateRects = NULL;
|
|
|
|
this->LockHWSurface = NULL;
|
|
|
|
this->UnlockHWSurface = NULL;
|
|
|
|
|
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;
|
|
|
|
|
2003-02-01 19:59:23 +00:00
|
|
|
/* Release double buffer stuff */
|
2005-09-27 08:36:28 +00:00
|
|
|
if ( mode_flags & SDL_DOUBLEBUF) {
|
2003-02-01 19:59:23 +00:00
|
|
|
quit_thread = YES;
|
|
|
|
SDL_SemPost (sem1);
|
|
|
|
SDL_WaitThread (thread, NULL);
|
|
|
|
SDL_DestroySemaphore (sem1);
|
|
|
|
SDL_DestroySemaphore (sem2);
|
2006-05-01 11:07:04 +00:00
|
|
|
SDL_free (sw_buffers[0]);
|
2003-02-01 19:59:23 +00:00
|
|
|
}
|
|
|
|
|
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);
|
2002-10-05 05:07:57 +00:00
|
|
|
CGLSetFullScreen (NULL);
|
|
|
|
}
|
2006-02-07 11:18:21 +00:00
|
|
|
if (to_desktop) {
|
Fixed bug #281
------- Comment #2 From Christian Walther 2006-07-23 07:37 [reply] -------
Wow, that was an interesting bug to chase. It was a timing issue: it seems that
for some reason, a certain time must pass between ShowMenuBar() being called in
QZ_UnsetVideoMode() and the application quitting. Before rev. 1885, this delay
was provided by the slow hand-coded fade. With the asynchronous Core Graphics
fading introduced in rev. 1885, that delay was no longer present (most of the
time) and the bug became apparent. Adding an SDL_Delay(100) somewhere between
ShowMenuBar() and the end of QZ_VideoQuit() lowered the frequency of the bug
appearing from "almost every time" to "very rarely" here.
However, there is another solution: doing the ShowMenuBar() before releasing
the captured display instead of afterwards. Apparently, no delay is necessary
in that case, and it looks nicer to me anyway because it is the reverse order
of the way things are set up in the beginning: capture display - set video mode
- hide menu bar - ... - show menu bar - reset video mode - release captured
display. So, this is what the attached patch does.
In addition, I've taken the liberty of
- removing some unused code that I forgot to remove in rev. 1885,
- fixing two warnings about undeclared functions in SDL_QuartzVideo.m by
including OpenGL.h (whose name is a bit misleading - it only declares CGL
stuff, so there's no interference with SDL_opengl.h).
--HG--
branch : SDL-1.2
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/branches/SDL-1.2%402115
2006-09-24 01:27:40 +00:00
|
|
|
ShowMenuBar ();
|
2006-02-07 11:18:21 +00:00
|
|
|
/* Restore original screen resolution/bpp */
|
|
|
|
CGDisplaySwitchToMode (display_id, save_mode);
|
|
|
|
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);
|
|
|
|
[ [ NSScreen mainScreen ] setFrame:screen_rect ];
|
|
|
|
}
|
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
|
|
|
}
|
|
|
|
|
|
|
|
static SDL_Surface* QZ_SetVideoFullScreen (_THIS, SDL_Surface *current, int width,
|
|
|
|
int height, int bpp, Uint32 flags) {
|
2006-01-02 12:48:58 +00:00
|
|
|
boolean_t exact_match = 0;
|
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;
|
|
|
|
BOOL isCustom = NO;
|
2006-02-07 11:18:21 +00:00
|
|
|
CGDisplayFadeReservationToken fade_token = kCGDisplayFadeReservationInvalidToken;
|
|
|
|
|
|
|
|
/* 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
|
|
|
|
2001-06-07 14:28:11 +00:00
|
|
|
/* See if requested mode exists */
|
2002-06-01 23:05:05 +00:00
|
|
|
mode = CGDisplayBestModeForParameters (display_id, bpp, width,
|
|
|
|
height, &exact_match);
|
|
|
|
|
2001-06-07 14:28:11 +00:00
|
|
|
/* Require an exact match to the requested mode */
|
|
|
|
if ( ! exact_match ) {
|
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 */
|
|
|
|
if ( CGDisplayNoErr != CGDisplaySwitchToMode (display_id, mode) ) {
|
|
|
|
SDL_SetError ("Failed switching display resolution");
|
|
|
|
goto ERR_NO_SWITCH;
|
|
|
|
}
|
2002-01-22 18:46:28 +00:00
|
|
|
|
2001-06-07 14:28:11 +00:00
|
|
|
current->pixels = (Uint32*) CGDisplayBaseAddress (display_id);
|
|
|
|
current->pitch = CGDisplayBytesPerRow (display_id);
|
|
|
|
|
2001-06-11 06:44:43 +00:00
|
|
|
current->flags = 0;
|
2001-06-07 14:28:11 +00:00
|
|
|
current->w = width;
|
|
|
|
current->h = height;
|
2002-06-01 23:05:05 +00:00
|
|
|
current->flags |= SDL_FULLSCREEN;
|
2001-06-07 14:28:11 +00:00
|
|
|
current->flags |= SDL_HWSURFACE;
|
2002-10-05 05:07:57 +00:00
|
|
|
current->flags |= SDL_PREALLOC;
|
|
|
|
|
|
|
|
this->UpdateRects = QZ_DirectUpdate;
|
|
|
|
this->LockHWSurface = QZ_LockHWSurface;
|
|
|
|
this->UnlockHWSurface = QZ_UnlockHWSurface;
|
2003-02-01 19:59:23 +00:00
|
|
|
|
|
|
|
/* 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;
|
|
|
|
|
2006-05-01 11:07:04 +00:00
|
|
|
current->pixels = SDL_malloc (current->pitch * current->h * 2);
|
2003-02-01 19:59:23 +00:00
|
|
|
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);
|
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 ( CGDisplayCanSetPalette (display_id) )
|
|
|
|
current->flags |= SDL_HWPALETTE;
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2007-07-14 08:00:50 +00:00
|
|
|
/* The code below checks for any valid custom windows and views. If none are
|
|
|
|
available, then we create new ones. Window/View code was added in FULLSCREEN
|
|
|
|
so that special events like the changing of the cursor image would be handled
|
|
|
|
( only the front-most and active application can change the cursor appearance
|
|
|
|
and with no valid window/view in FULLSCREEN, SDL wouldn't update its cursor. )
|
|
|
|
*/
|
|
|
|
/* Check for user-specified window and view */
|
|
|
|
{
|
|
|
|
char *windowPtrString = getenv ("SDL_NSWindowPointer");
|
|
|
|
char *viewPtrString = getenv ("SDL_NSQuickDrawViewPointer");
|
|
|
|
|
|
|
|
contentRect = NSMakeRect (0, 0, width, height);
|
|
|
|
|
|
|
|
if (windowPtrString && viewPtrString) {
|
|
|
|
/* Release any previous window */
|
|
|
|
if ( qz_window ) {
|
|
|
|
[ qz_window release ];
|
|
|
|
qz_window = nil;
|
|
|
|
}
|
|
|
|
|
|
|
|
qz_window = (NSWindow*)atoi(windowPtrString);
|
|
|
|
window_view = (NSQuickDrawView*)atoi(viewPtrString);
|
|
|
|
isCustom = YES;
|
|
|
|
/*
|
|
|
|
Retain reference to window because we
|
|
|
|
might release it in QZ_UnsetVideoMode
|
|
|
|
*/
|
|
|
|
[ qz_window retain ];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* 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
|
|
|
|
styleMask:nil
|
|
|
|
backing:NSBackingStoreBuffered
|
|
|
|
defer:NO ];
|
|
|
|
|
|
|
|
if (qz_window != nil) {
|
|
|
|
[ qz_window setAcceptsMouseMovedEvents:YES ];
|
|
|
|
[ qz_window setViewsNeedDisplay:NO ];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* We already have a window, just change its size */
|
|
|
|
else {
|
|
|
|
if (!isCustom) {
|
|
|
|
[ qz_window setContentSize:contentRect.size ];
|
|
|
|
current->flags |= (SDL_NOFRAME|SDL_RESIZABLE) & mode_flags;
|
|
|
|
[ window_view setFrameSize:contentRect.size ];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-06-07 14:28:11 +00:00
|
|
|
/* Setup OpenGL for a fullscreen context */
|
|
|
|
if (flags & SDL_OPENGL) {
|
|
|
|
|
|
|
|
CGLError err;
|
|
|
|
CGLContextObj ctx;
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2001-06-07 14:28:11 +00:00
|
|
|
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 ];
|
|
|
|
[ [ qz_window contentView ] addSubview:window_view ];
|
|
|
|
[ window_view release ];
|
|
|
|
|
2001-06-07 14:28:11 +00:00
|
|
|
ctx = [ gl_context cglContext ];
|
|
|
|
err = CGLSetFullScreen (ctx);
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2001-06-07 14:28:11 +00:00
|
|
|
if (err) {
|
2002-10-05 05:07:57 +00:00
|
|
|
SDL_SetError ("Error setting OpenGL fullscreen: %s", CGLErrorString(err));
|
2001-06-07 14:28:11 +00:00
|
|
|
goto ERR_NO_GL;
|
|
|
|
}
|
2002-06-01 23:05:05 +00:00
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If we don't hide menu bar, it will get events and interrupt the program */
|
|
|
|
HideMenuBar ();
|
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);
|
|
|
|
[ [ NSScreen mainScreen ] setFrame:screen_rect ];
|
|
|
|
|
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 */
|
2003-02-01 19:59:23 +00:00
|
|
|
ERR_NO_GL:
|
|
|
|
ERR_DOUBLEBUF: CGDisplaySwitchToMode (display_id, save_mode);
|
|
|
|
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,
|
2005-11-22 09:59:42 +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-08-10 07:21:43 +00:00
|
|
|
BOOL isCustom = NO;
|
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);
|
|
|
|
|
|
|
|
/*
|
|
|
|
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
|
|
|
|
|
|
|
/* Check for user-specified window and view */
|
|
|
|
{
|
|
|
|
char *windowPtrString = getenv ("SDL_NSWindowPointer");
|
|
|
|
char *viewPtrString = getenv ("SDL_NSQuickDrawViewPointer");
|
|
|
|
|
|
|
|
if (windowPtrString && viewPtrString) {
|
|
|
|
|
|
|
|
/* Release any previous window */
|
|
|
|
if ( qz_window ) {
|
|
|
|
[ qz_window release ];
|
|
|
|
qz_window = nil;
|
|
|
|
}
|
|
|
|
|
|
|
|
qz_window = (NSWindow*)atoi(windowPtrString);
|
|
|
|
window_view = (NSQuickDrawView*)atoi(viewPtrString);
|
|
|
|
isCustom = YES;
|
|
|
|
|
|
|
|
/*
|
|
|
|
Retain reference to window because we
|
|
|
|
might release it in QZ_UnsetVideoMode
|
|
|
|
*/
|
|
|
|
[ qz_window retain ];
|
|
|
|
|
|
|
|
style = [ qz_window styleMask ];
|
|
|
|
/* Check resizability */
|
|
|
|
if ( style & NSResizableWindowMask )
|
|
|
|
current->flags |= SDL_RESIZABLE;
|
|
|
|
|
|
|
|
/* Check frame */
|
|
|
|
if ( style & NSBorderlessWindowMask )
|
|
|
|
current->flags |= SDL_NOFRAME;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-07-23 04:39:44 +00:00
|
|
|
if ( QZ_WindowPosition(this, &origin_x, &origin_y) ) {
|
|
|
|
center_window = 0;
|
|
|
|
contentRect.origin.x = (float)origin_x;
|
|
|
|
contentRect.origin.y = (float)origin_y;
|
|
|
|
}
|
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
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 ];
|
2003-07-23 04:39:44 +00:00
|
|
|
if ( center_window ) {
|
|
|
|
[ qz_window center ];
|
|
|
|
}
|
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 {
|
|
|
|
|
2003-08-10 07:21:43 +00:00
|
|
|
if (!isCustom) {
|
|
|
|
[ qz_window setContentSize:contentRect.size ];
|
|
|
|
current->flags |= (SDL_NOFRAME|SDL_RESIZABLE) & mode_flags;
|
2004-02-16 21:06:10 +00:00
|
|
|
[ window_view setFrameSize:contentRect.size ];
|
2003-08-10 07:21:43 +00:00
|
|
|
}
|
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;
|
|
|
|
}
|
2002-10-05 05:07:57 +00:00
|
|
|
/* For 2D, we set the subview to an NSQuickDrawView */
|
2001-06-07 14:28:11 +00:00
|
|
|
else {
|
2005-11-22 09:59:42 +00:00
|
|
|
short qdbpp = 0;
|
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) {
|
|
|
|
|
2004-01-04 14:55:35 +00:00
|
|
|
window_view = [ [ NSQuickDrawView 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 ];
|
|
|
|
}
|
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
LockPortBits ( [ window_view qdPort ] );
|
|
|
|
current->pixels = GetPixBaseAddr ( GetPortPixMap ( [ window_view qdPort ] ) );
|
|
|
|
current->pitch = GetPixRowBytes ( GetPortPixMap ( [ window_view qdPort ] ) );
|
2005-11-22 09:59:42 +00:00
|
|
|
qdbpp = GetPixDepth ( GetPortPixMap ( [ window_view qdPort ] ) );
|
2002-09-16 18:38:09 +00:00
|
|
|
UnlockPortBits ( [ window_view qdPort ] );
|
2002-10-05 05:07:57 +00:00
|
|
|
|
2005-11-22 09:59:42 +00:00
|
|
|
/* QuickDraw may give a 16-bit shadow surface on 8-bit displays! */
|
|
|
|
*bpp = qdbpp;
|
|
|
|
|
2001-06-07 14:28:11 +00:00
|
|
|
current->flags |= SDL_SWSURFACE;
|
|
|
|
current->flags |= SDL_PREALLOC;
|
2002-09-16 18:38:09 +00:00
|
|
|
current->flags |= SDL_ASYNCBLIT;
|
|
|
|
|
2003-08-10 07:21:43 +00:00
|
|
|
/*
|
|
|
|
current->pixels now points to the window's pixels
|
|
|
|
We want it to point to the *view's* pixels
|
|
|
|
*/
|
|
|
|
{
|
|
|
|
int vOffset = [ qz_window frame ].size.height -
|
|
|
|
[ window_view frame ].size.height - [ window_view frame ].origin.y;
|
|
|
|
|
|
|
|
int hOffset = [ window_view frame ].origin.x;
|
|
|
|
|
2006-03-09 06:33:21 +00:00
|
|
|
current->pixels = (Uint8 *)current->pixels + (vOffset * current->pitch) + hOffset * (qdbpp/8);
|
2003-08-10 07:21:43 +00:00
|
|
|
}
|
2002-09-16 18:38:09 +00:00
|
|
|
this->UpdateRects = QZ_UpdateRects;
|
|
|
|
this->LockHWSurface = QZ_LockWindow;
|
|
|
|
this->UnlockHWSurface = QZ_UnlockWindow;
|
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,
|
|
|
|
int height, int bpp, Uint32 flags) {
|
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 ) {
|
|
|
|
current = QZ_SetVideoFullScreen (this, current, width, height, bpp, flags );
|
|
|
|
if (current == NULL)
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
/* Setup windowed video */
|
|
|
|
else {
|
|
|
|
/* Force bpp to the device's bpp */
|
2002-01-22 18:46:28 +00:00
|
|
|
bpp = device_bpp;
|
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
|
|
|
|
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;
|
2001-06-07 14:28:11 +00:00
|
|
|
rmask = 0x00FF0000;
|
|
|
|
gmask = 0x0000FF00;
|
|
|
|
bmask = 0x000000FF;
|
|
|
|
break;
|
|
|
|
}
|
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;
|
|
|
|
}
|
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;
|
|
|
|
}
|
|
|
|
|
2002-06-01 23:05:05 +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,
|
|
|
|
SDL_Color *colors) {
|
2001-06-07 14:28:11 +00:00
|
|
|
|
|
|
|
CGTableCount index;
|
|
|
|
CGDeviceColor color;
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2001-06-07 14:28:11 +00:00
|
|
|
for (index = first_color; index < first_color+num_colors; index++) {
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2001-06-07 14:28:11 +00:00
|
|
|
/* 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;
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2001-06-07 14:28:11 +00:00
|
|
|
colors++;
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2001-06-07 14:28:11 +00:00
|
|
|
CGPaletteSetColorAtIndex (palette, color, index);
|
|
|
|
}
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2001-06-07 14:28:11 +00:00
|
|
|
if ( CGDisplayNoErr != CGDisplaySetPalette (display_id, palette) )
|
|
|
|
return 0;
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2001-06-07 14:28:11 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2003-02-01 19:59:23 +00:00
|
|
|
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
|
|
|
|
{
|
2004-01-04 14:55:35 +00:00
|
|
|
UInt64 i;
|
2003-02-01 19:59:23 +00:00
|
|
|
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;
|
|
|
|
|
2006-01-02 12:37:40 +00:00
|
|
|
/*
|
|
|
|
* 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)...
|
|
|
|
*/
|
2006-03-09 06:33:21 +00:00
|
|
|
dst = (Uint8 *)CGDisplayBaseAddress (display_id) + SDL_VideoSurface->offset;
|
2006-01-02 12:37:40 +00:00
|
|
|
src = current_buffer + SDL_VideoSurface->offset;
|
2003-02-01 19:59:23 +00:00
|
|
|
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:
|
|
|
|
|
|
|
|
while ( h-- ) {
|
|
|
|
|
2006-05-01 11:07:04 +00:00
|
|
|
SDL_memcpy (dst, src, len);
|
2003-02-01 19:59:23 +00:00
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
2001-06-07 14:28:11 +00:00
|
|
|
static void QZ_DirectUpdate (_THIS, int num_rects, SDL_Rect *rects) {
|
2002-06-01 23:05:05 +00:00
|
|
|
#pragma unused(this,num_rects,rects)
|
2001-06-07 14:28:11 +00:00
|
|
|
}
|
|
|
|
|
2002-10-05 05:07:57 +00:00
|
|
|
/*
|
|
|
|
The obscured code is based on work by Matt Slot fprefect@ambrosiasw.com,
|
|
|
|
who supplied sample code for Carbon.
|
|
|
|
*/
|
2004-01-04 14:55:35 +00:00
|
|
|
|
2006-03-09 06:33:21 +00:00
|
|
|
/*#define TEST_OBSCURED 1*/
|
2004-01-04 14:55:35 +00:00
|
|
|
|
|
|
|
#if TEST_OBSCURED
|
|
|
|
#include "CGS.h"
|
|
|
|
#endif
|
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
static int QZ_IsWindowObscured (NSWindow *window) {
|
|
|
|
|
|
|
|
|
|
|
|
#if TEST_OBSCURED
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-10-05 05:07:57 +00:00
|
|
|
/*
|
|
|
|
In order to determine if a direct copy to the screen is possible,
|
2002-06-01 23:05:05 +00:00
|
|
|
we must figure out if there are any windows covering ours (including shadows).
|
|
|
|
This can be done by querying the window server about the on screen
|
|
|
|
windows for their screen rectangle and window level.
|
|
|
|
The procedure used below is puts accuracy before speed; however, it aims to call
|
|
|
|
the window server the fewest number of times possible to keep things reasonable.
|
|
|
|
In my testing on a 300mhz G3, this routine typically takes < 2 ms. -DW
|
2002-01-22 18:46:28 +00:00
|
|
|
|
2002-06-01 23:05:05 +00:00
|
|
|
Notes:
|
|
|
|
-Calls into the Window Server involve IPC which is slow.
|
|
|
|
-Getting a rectangle seems slower than getting the window level
|
|
|
|
-The window list we get back is in sorted order, top to bottom
|
|
|
|
-On average, I suspect, most windows above ours are dock icon windows (hence optimization)
|
|
|
|
-Some windows above ours are always there, and cannot move or obscure us (menu bar)
|
2002-01-22 18:46:28 +00:00
|
|
|
|
2002-06-01 23:05:05 +00:00
|
|
|
Bugs:
|
|
|
|
-no way (yet) to deactivate direct drawing when a window is dragged,
|
|
|
|
or suddenly obscured, so drawing continues and can produce garbage
|
|
|
|
We need some kind of locking mechanism on window movement to prevent this
|
2002-01-22 18:46:28 +00:00
|
|
|
|
2002-06-01 23:05:05 +00:00
|
|
|
-deactivated normal windows use activated normal
|
|
|
|
window shadows (slight inaccuraccy)
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* Cache the connection to the window server */
|
|
|
|
static CGSConnectionID cgsConnection = (CGSConnectionID) -1;
|
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
/* Cache the dock icon windows */
|
|
|
|
static CGSWindowID dockIcons[kMaxWindows];
|
|
|
|
static int numCachedDockIcons = 0;
|
2002-06-01 23:05:05 +00:00
|
|
|
|
|
|
|
CGSWindowID windows[kMaxWindows];
|
|
|
|
CGSWindowCount i, count;
|
|
|
|
CGSWindowLevel winLevel;
|
|
|
|
CGSRect winRect;
|
2002-01-22 18:46:28 +00:00
|
|
|
|
|
|
|
CGSRect contentRect;
|
|
|
|
int windowNumber;
|
2002-06-01 23:05:05 +00:00
|
|
|
int firstDockIcon;
|
2002-01-22 18:46:28 +00:00
|
|
|
int dockIconCacheMiss;
|
|
|
|
int windowContentOffset;
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
int obscured = SDL_TRUE;
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
if ( [ window isVisible ] ) {
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-10-05 05:07:57 +00:00
|
|
|
/*
|
|
|
|
walk the window list looking for windows over top of
|
|
|
|
(or casting a shadow on) ours
|
|
|
|
*/
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-10-05 05:07:57 +00:00
|
|
|
/*
|
|
|
|
Get a connection to the window server
|
|
|
|
Should probably be moved out into SetVideoMode() or InitVideo()
|
|
|
|
*/
|
2002-01-22 18:46:28 +00:00
|
|
|
if (cgsConnection == (CGSConnectionID) -1) {
|
|
|
|
cgsConnection = (CGSConnectionID) 0;
|
|
|
|
cgsConnection = _CGSDefaultConnection ();
|
|
|
|
}
|
2002-06-01 23:05:05 +00:00
|
|
|
|
|
|
|
if (cgsConnection) {
|
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
if ( ! [ window styleMask ] & NSBorderlessWindowMask )
|
|
|
|
windowContentOffset = 22;
|
|
|
|
else
|
|
|
|
windowContentOffset = 0;
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
windowNumber = [ window windowNumber ];
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
/* The window list is sorted according to order on the screen */
|
|
|
|
count = 0;
|
|
|
|
CGSGetOnScreenWindowList (cgsConnection, 0, kMaxWindows, windows, &count);
|
|
|
|
CGSGetScreenRectForWindow (cgsConnection, windowNumber, &contentRect);
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
/* adjust rect for window title bar (if present) */
|
|
|
|
contentRect.origin.y += windowContentOffset;
|
|
|
|
contentRect.size.height -= windowContentOffset;
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
firstDockIcon = -1;
|
|
|
|
dockIconCacheMiss = SDL_FALSE;
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-10-05 05:07:57 +00:00
|
|
|
/*
|
|
|
|
The first window is always an empty window with level kCGSWindowLevelTop
|
|
|
|
so start at index 1
|
|
|
|
*/
|
2002-01-22 18:46:28 +00:00
|
|
|
for (i = 1; i < count; i++) {
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
/* If we reach our window in the list, it cannot be obscured */
|
|
|
|
if (windows[i] == windowNumber) {
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
obscured = SDL_FALSE;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
else {
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
float shadowSide;
|
|
|
|
float shadowTop;
|
|
|
|
float shadowBottom;
|
|
|
|
|
|
|
|
CGSGetWindowLevel (cgsConnection, windows[i], &winLevel);
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
if (winLevel == kCGSWindowLevelDockIcon) {
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
int j;
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
if (firstDockIcon < 0) {
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
firstDockIcon = i;
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
if (numCachedDockIcons > 0) {
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
for (j = 0; j < numCachedDockIcons; j++) {
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
if (windows[i] == dockIcons[j])
|
|
|
|
i++;
|
|
|
|
else
|
|
|
|
break;
|
|
|
|
}
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
if (j != 0) {
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
i--;
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
if (j < numCachedDockIcons) {
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
dockIconCacheMiss = SDL_TRUE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
else if (winLevel == kCGSWindowLevelMenuIgnore
|
|
|
|
/* winLevel == kCGSWindowLevelTop */) {
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
continue; /* cannot obscure window */
|
|
|
|
}
|
|
|
|
else if (winLevel == kCGSWindowLevelDockMenu ||
|
|
|
|
winLevel == kCGSWindowLevelMenu) {
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
shadowSide = 18;
|
|
|
|
shadowTop = 4;
|
2002-06-01 23:05:05 +00:00
|
|
|
shadowBottom = 22;
|
2002-01-22 18:46:28 +00:00
|
|
|
}
|
|
|
|
else if (winLevel == kCGSWindowLevelUtility) {
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
shadowSide = 8;
|
|
|
|
shadowTop = 4;
|
|
|
|
shadowBottom = 12;
|
|
|
|
}
|
|
|
|
else if (winLevel == kCGSWindowLevelNormal) {
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-10-05 05:07:57 +00:00
|
|
|
/*
|
|
|
|
These numbers are for foreground windows,
|
|
|
|
they are too big (but will work) for background windows
|
|
|
|
*/
|
2002-01-22 18:46:28 +00:00
|
|
|
shadowSide = 20;
|
|
|
|
shadowTop = 10;
|
|
|
|
shadowBottom = 24;
|
|
|
|
}
|
|
|
|
else if (winLevel == kCGSWindowLevelDock) {
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
/* Create dock icon cache */
|
|
|
|
if (numCachedDockIcons != (i-firstDockIcon) ||
|
|
|
|
dockIconCacheMiss) {
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
numCachedDockIcons = i - firstDockIcon;
|
2006-05-01 11:07:04 +00:00
|
|
|
SDL_memcpy (dockIcons, &(windows[firstDockIcon]),
|
2002-01-22 18:46:28 +00:00
|
|
|
numCachedDockIcons * sizeof(*windows));
|
|
|
|
}
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
/* no shadow */
|
|
|
|
shadowSide = 0;
|
|
|
|
shadowTop = 0;
|
|
|
|
shadowBottom = 0;
|
|
|
|
}
|
|
|
|
else {
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-10-05 05:07:57 +00:00
|
|
|
/*
|
|
|
|
kCGSWindowLevelDockLabel,
|
|
|
|
kCGSWindowLevelDock,
|
|
|
|
kOther???
|
|
|
|
*/
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
/* no shadow */
|
|
|
|
shadowSide = 0;
|
|
|
|
shadowTop = 0;
|
|
|
|
shadowBottom = 0;
|
|
|
|
}
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
CGSGetScreenRectForWindow (cgsConnection, windows[i], &winRect);
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
winRect.origin.x -= shadowSide;
|
|
|
|
winRect.origin.y -= shadowTop;
|
|
|
|
winRect.size.width += shadowSide;
|
|
|
|
winRect.size.height += shadowBottom;
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
if (NSIntersectsRect (contentRect, winRect)) {
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
obscured = SDL_TRUE;
|
|
|
|
break;
|
|
|
|
}
|
2002-06-01 23:05:05 +00:00
|
|
|
|
|
|
|
} /* window was not our window */
|
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
} /* iterate over windows */
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
} /* get cgsConnection */
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
} /* window is visible */
|
|
|
|
|
|
|
|
return obscured;
|
|
|
|
#else
|
|
|
|
return SDL_TRUE;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2002-10-05 05:07:57 +00:00
|
|
|
|
2002-09-16 18:38:09 +00:00
|
|
|
/* Locking functions for the software window buffer */
|
|
|
|
static int QZ_LockWindow (_THIS, SDL_Surface *surface) {
|
|
|
|
|
|
|
|
return LockPortBits ( [ window_view qdPort ] );
|
|
|
|
}
|
|
|
|
|
|
|
|
static void QZ_UnlockWindow (_THIS, SDL_Surface *surface) {
|
|
|
|
|
|
|
|
UnlockPortBits ( [ window_view qdPort ] );
|
|
|
|
}
|
|
|
|
|
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
|
|
|
|
};
|
|
|
|
|
|
|
|
static void QZ_DrawResizeIcon (_THIS, RgnHandle dirtyRegion) {
|
|
|
|
|
|
|
|
/* Check if we should draw the resize icon */
|
|
|
|
if (SDL_VideoSurface->flags & SDL_RESIZABLE) {
|
|
|
|
|
|
|
|
Rect icon;
|
|
|
|
SetRect (&icon, SDL_VideoSurface->w - 13, SDL_VideoSurface->h - 13,
|
|
|
|
SDL_VideoSurface->w, SDL_VideoSurface->h);
|
|
|
|
|
|
|
|
if (RectInRgn (&icon, dirtyRegion)) {
|
|
|
|
|
|
|
|
SDL_Rect icon_rect;
|
|
|
|
|
|
|
|
/* Create the icon image */
|
|
|
|
if (resize_icon == NULL) {
|
|
|
|
|
|
|
|
SDL_RWops *rw;
|
|
|
|
SDL_Surface *tmp;
|
|
|
|
|
2004-01-04 16:20:28 +00:00
|
|
|
rw = SDL_RWFromConstMem (QZ_ResizeIcon, sizeof(QZ_ResizeIcon));
|
2004-01-04 14:55:35 +00:00
|
|
|
tmp = SDL_LoadBMP_RW (rw, SDL_TRUE);
|
|
|
|
|
|
|
|
resize_icon = SDL_ConvertSurface (tmp, SDL_VideoSurface->format, SDL_SRCCOLORKEY);
|
|
|
|
SDL_SetColorKey (resize_icon, SDL_SRCCOLORKEY, 0xFFFFFF);
|
|
|
|
|
|
|
|
SDL_FreeSurface (tmp);
|
|
|
|
}
|
|
|
|
|
|
|
|
icon_rect.x = SDL_VideoSurface->w - 13;
|
|
|
|
icon_rect.y = SDL_VideoSurface->h - 13;
|
|
|
|
icon_rect.w = 13;
|
|
|
|
icon_rect.h = 13;
|
|
|
|
|
|
|
|
SDL_BlitSurface (resize_icon, NULL, SDL_VideoSurface, &icon_rect);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2002-06-01 23:05:05 +00:00
|
|
|
static void QZ_UpdateRects (_THIS, int numRects, SDL_Rect *rects) {
|
2002-01-22 18:46:28 +00:00
|
|
|
|
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
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
else if ( ! QZ_IsWindowObscured (qz_window) ) {
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
/* Use direct copy to flush contents to the display */
|
|
|
|
CGrafPtr savePort;
|
|
|
|
CGrafPtr dstPort, srcPort;
|
|
|
|
const BitMap *dstBits, *srcBits;
|
2002-06-01 23:05:05 +00:00
|
|
|
Rect dstRect, srcRect;
|
2002-01-22 18:46:28 +00:00
|
|
|
Point offset;
|
|
|
|
int i;
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
GetPort (&savePort);
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
dstPort = CreateNewPortForCGDisplayID ((UInt32)display_id);
|
|
|
|
srcPort = [ window_view qdPort ];
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
offset.h = 0;
|
|
|
|
offset.v = 0;
|
|
|
|
SetPort (srcPort);
|
|
|
|
LocalToGlobal (&offset);
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
SetPort (dstPort);
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
LockPortBits (dstPort);
|
|
|
|
LockPortBits (srcPort);
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
dstBits = GetPortBitMapForCopyBits (dstPort);
|
|
|
|
srcBits = GetPortBitMapForCopyBits (srcPort);
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
for (i = 0; i < numRects; i++) {
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
SetRect (&srcRect, rects[i].x, rects[i].y,
|
|
|
|
rects[i].x + rects[i].w,
|
|
|
|
rects[i].y + rects[i].h);
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
SetRect (&dstRect,
|
2002-06-01 23:05:05 +00:00
|
|
|
rects[i].x + offset.h,
|
2002-01-22 18:46:28 +00:00
|
|
|
rects[i].y + offset.v,
|
|
|
|
rects[i].x + rects[i].w + offset.h,
|
|
|
|
rects[i].y + rects[i].h + offset.v);
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
CopyBits (srcBits, dstBits,
|
|
|
|
&srcRect, &dstRect, srcCopy, NULL);
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
}
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
SetPort (savePort);
|
|
|
|
}
|
2001-06-07 14:28:11 +00:00
|
|
|
else {
|
2002-01-22 18:46:28 +00:00
|
|
|
/* Use QDFlushPortBuffer() to flush content to display */
|
2001-06-07 14:28:11 +00:00
|
|
|
int i;
|
|
|
|
RgnHandle dirty = NewRgn ();
|
|
|
|
RgnHandle temp = NewRgn ();
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2001-06-07 14:28:11 +00:00
|
|
|
SetEmptyRgn (dirty);
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2001-06-07 14:28:11 +00:00
|
|
|
/* Build the region of dirty rectangles */
|
|
|
|
for (i = 0; i < numRects; i++) {
|
2002-06-01 23:05:05 +00:00
|
|
|
|
|
|
|
MacSetRectRgn (temp, rects[i].x, rects[i].y,
|
2002-10-05 05:07:57 +00:00
|
|
|
rects[i].x + rects[i].w, rects[i].y + rects[i].h);
|
2001-06-07 14:28:11 +00:00
|
|
|
MacUnionRgn (dirty, temp, dirty);
|
|
|
|
}
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2002-10-05 05:07:57 +00:00
|
|
|
QZ_DrawResizeIcon (this, dirty);
|
|
|
|
|
2001-06-07 14:28:11 +00:00
|
|
|
/* Flush the dirty region */
|
2002-01-22 18:46:28 +00:00
|
|
|
QDFlushPortBuffer ( [ window_view qdPort ], dirty );
|
2001-06-07 14:28:11 +00:00
|
|
|
DisposeRgn (dirty);
|
|
|
|
DisposeRgn (temp);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
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);
|
|
|
|
|
2001-06-07 14:28:11 +00:00
|
|
|
CGPaletteRelease (palette);
|
2005-11-22 08:21:39 +00:00
|
|
|
|
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
|
|
|
}
|
|
|
|
|
2003-08-09 18:12:11 +00:00
|
|
|
#if 0 /* Not used (apparently, it's really slow) */
|
2001-06-07 14:28:11 +00:00
|
|
|
static int QZ_FillHWRect (_THIS, SDL_Surface *dst, SDL_Rect *rect, Uint32 color) {
|
|
|
|
|
|
|
|
CGSDisplayHWFill (display_id, rect->x, rect->y, rect->w, rect->h, color);
|
2002-01-22 18:46:28 +00:00
|
|
|
|
2001-06-07 14:28:11 +00:00
|
|
|
return 0;
|
|
|
|
}
|
2003-08-09 18:12:11 +00:00
|
|
|
#endif
|
2001-06-07 14:28:11 +00:00
|
|
|
|
2002-06-01 23:05:05 +00:00
|
|
|
static int QZ_LockHWSurface(_THIS, SDL_Surface *surface) {
|
2001-06-07 14:28:11 +00:00
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2002-01-22 18:46:28 +00:00
|
|
|
static void QZ_UnlockHWSurface(_THIS, SDL_Surface *surface) {
|
|
|
|
|
2001-06-07 14:28:11 +00:00
|
|
|
}
|
|
|
|
|
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) {
|
|
|
|
return(-1); /* unallowed (no HWSURFACE support here). */
|
|
|
|
}
|
|
|
|
|
2001-06-07 14:28:11 +00:00
|
|
|
static void QZ_FreeHWSurface (_THIS, SDL_Surface *surface) {
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2002-06-01 23:05:05 +00:00
|
|
|
int QZ_FlipHWSurface (_THIS, SDL_Surface *surface) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
*/
|
2001-06-07 14:28:11 +00:00
|
|
|
|
|
|
|
/* Gamma functions */
|
2004-01-04 14:55:35 +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
|
|
|
}
|
|
|
|
|
2004-01-04 14:55:35 +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;
|
|
|
|
}
|
|
|
|
|
2004-01-04 14:55:35 +00:00
|
|
|
int QZ_SetGammaRamp (_THIS, Uint16 *ramp) {
|
2002-06-01 23:05:05 +00:00
|
|
|
|
|
|
|
const CGTableCount tableSize = 255;
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2004-01-04 14:55:35 +00:00
|
|
|
int QZ_GetGammaRamp (_THIS, Uint16 *ramp) {
|
2002-06-01 23:05:05 +00:00
|
|
|
|
2001-06-07 14:28:11 +00:00
|
|
|
const CGTableCount tableSize = 255;
|
|
|
|
CGGammaValue redTable[tableSize];
|
|
|
|
CGGammaValue greenTable[tableSize];
|
|
|
|
CGGammaValue blueTable[tableSize];
|
|
|
|
CGTableCount actual;
|
|
|
|
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
|
|
|
}
|
|
|
|
|