sdl-ios-xcode: src/video/quartz/SDL

annotate src/video/quartz/SDL_QuartzVideo.m @ 3922:4e02435ad2be SDL-1.2

Removed some debug printf() calls I accidentally added to Subversion.

author	Ryan C. Gordon <icculus@icculus.org>
date	Fri, 23 Feb 2007 00:37:07 +0000
parents	81f66f258d77
children	c5c3c772f5aa

rev	line source
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1 /*
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	2 SDL - Simple DirectMedia Layer
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	3 Copyright (C) 1997-2003 Sam Lantinga
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	4
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	5 This library is free software; you can redistribute it and/or
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	6 modify it under the terms of the GNU Library General Public
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	7 License as published by the Free Software Foundation; either
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	8 version 2 of the License, or (at your option) any later version.
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	9
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	10 This library is distributed in the hope that it will be useful,
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	11 but WITHOUT ANY WARRANTY; without even the implied warranty of
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	13 Library General Public License for more details.
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	14
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	15 You should have received a copy of the GNU Library General Public
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	16 License along with this library; if not, write to the Free
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	17 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	18
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	19 Sam Lantinga
252 e8157fcb3114 Updated the source with the correct e-mail address Sam Lantinga <slouken@libsdl.org> parents: 197 diff changeset	20 slouken@libsdl.org
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	21 */
1403 376665398b25 Catch the C++ and Objective C sources too... Sam Lantinga <slouken@libsdl.org> parents: 1340 diff changeset	22 #include "SDL_config.h"
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	23
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	24 #include "SDL_QuartzVideo.h"
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	25 #include "SDL_QuartzWindow.h"
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	26
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	27 /*
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	28 Add methods to get at private members of NSScreen.
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	29 Since there is a bug in Apple's screen switching code
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	30 that does not update this variable when switching
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	31 to fullscreen, we'll set it manually (but only for the
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	32 main screen).
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	33 */
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	34 @interface NSScreen (NSScreenAccess)
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	35 - (void) setFrame:(NSRect)frame;
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	36 @end
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	37
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	38 @implementation NSScreen (NSScreenAccess)
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	39 - (void) setFrame:(NSRect)frame;
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	40 {
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	41 _frame = frame;
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	42 }
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	43 @end
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	44
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	45
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	46 /* Bootstrap functions */
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	47 static int QZ_Available ();
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	48 static SDL_VideoDevice* QZ_CreateDevice (int device_index);
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	49 static void QZ_DeleteDevice (SDL_VideoDevice *device);
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	50
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	51 /* Initialization, Query, Setup, and Redrawing functions */
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	52 static int QZ_VideoInit (_THIS, SDL_PixelFormat *video_format);
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	53
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	54 static SDL_Rect** QZ_ListModes (_THIS, SDL_PixelFormat *format,
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	55 Uint32 flags);
1340 58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	56 static void QZ_UnsetVideoMode (_THIS, BOOL to_desktop);
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	57
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	58 static SDL_Surface* QZ_SetVideoMode (_THIS, SDL_Surface *current,
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	59 int width, int height, int bpp,
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	60 Uint32 flags);
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	61 static int QZ_ToggleFullScreen (_THIS, int on);
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	62 static int QZ_SetColors (_THIS, int first_color,
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	63 int num_colors, SDL_Color *colors);
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	64
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	65 static int QZ_LockDoubleBuffer (_THIS, SDL_Surface *surface);
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	66 static void QZ_UnlockDoubleBuffer (_THIS, SDL_Surface *surface);
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	67 static int QZ_ThreadFlip (_THIS);
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	68 static int QZ_FlipDoubleBuffer (_THIS, SDL_Surface *surface);
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	69 static void QZ_DoubleBufferUpdate (_THIS, int num_rects, SDL_Rect *rects);
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	70
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	71 static void QZ_DirectUpdate (_THIS, int num_rects, SDL_Rect *rects);
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	72 static int QZ_LockWindow (_THIS, SDL_Surface *surface);
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	73 static void QZ_UnlockWindow (_THIS, SDL_Surface *surface);
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	74 static void QZ_UpdateRects (_THIS, int num_rects, SDL_Rect *rects);
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	75 static void QZ_VideoQuit (_THIS);
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	76
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	77 /* Hardware surface functions (for fullscreen mode only) */
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	78 #if 0 /* Not used (apparently, it's really slow) */
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	79 static int QZ_FillHWRect (_THIS, SDL_Surface dst, SDL_Rect rect, Uint32 color);
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	80 #endif
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	81 static int QZ_LockHWSurface(_THIS, SDL_Surface *surface);
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	82 static void QZ_UnlockHWSurface(_THIS, SDL_Surface *surface);
1120 8e1fde455471 Patch by me to fix crash described below. Ryan C. Gordon <icculus@icculus.org> parents: 1119 diff changeset	83 static int QZ_AllocHWSurface(_THIS, SDL_Surface *surface);
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	84 static void QZ_FreeHWSurface (_THIS, SDL_Surface *surface);
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	85 /* static int QZ_FlipHWSurface (_THIS, SDL_Surface surface); /
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	86
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	87 /* Bootstrap binding, enables entry point into the driver */
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	88 VideoBootStrap QZ_bootstrap = {
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	89 "Quartz", "Mac OS X CoreGraphics", QZ_Available, QZ_CreateDevice
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	90 };
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	91
588 2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	92
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	93 /* Bootstrap functions */
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	94 static int QZ_Available () {
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	95 return 1;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	96 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	97
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	98 static SDL_VideoDevice* QZ_CreateDevice (int device_index) {
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	99
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	100 #pragma unused (device_index)
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	101
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	102 SDL_VideoDevice *device;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	103 SDL_PrivateVideoData *hidden;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	104
1756 eed7a3f396ce Using the SDL C runtime functions Sam Lantinga <slouken@libsdl.org> parents: 1629 diff changeset	105 device = (SDL_VideoDevice) SDL_malloc (sizeof (device) );
eed7a3f396ce Using the SDL C runtime functions Sam Lantinga <slouken@libsdl.org> parents: 1629 diff changeset	106 hidden = (SDL_PrivateVideoData) SDL_malloc (sizeof (hidden) );
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	107
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	108 if (device == NULL \|\| hidden == NULL)
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	109 SDL_OutOfMemory ();
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	110
1756 eed7a3f396ce Using the SDL C runtime functions Sam Lantinga <slouken@libsdl.org> parents: 1629 diff changeset	111 SDL_memset (device, 0, sizeof (*device) );
eed7a3f396ce Using the SDL C runtime functions Sam Lantinga <slouken@libsdl.org> parents: 1629 diff changeset	112 SDL_memset (hidden, 0, sizeof (*hidden) );
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	113
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	114 device->hidden = hidden;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	115
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	116 device->VideoInit = QZ_VideoInit;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	117 device->ListModes = QZ_ListModes;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	118 device->SetVideoMode = QZ_SetVideoMode;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	119 device->ToggleFullScreen = QZ_ToggleFullScreen;
1212 7663bb0f52c7 To: sdl@libsdl.org Ryan C. Gordon <icculus@icculus.org> parents: 1189 diff changeset	120 device->UpdateMouse = QZ_UpdateMouse;
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	121 device->SetColors = QZ_SetColors;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	122 /* device->UpdateRects = QZ_UpdateRects; this is determined by SetVideoMode() */
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	123 device->VideoQuit = QZ_VideoQuit;
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	124
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	125 device->LockHWSurface = QZ_LockHWSurface;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	126 device->UnlockHWSurface = QZ_UnlockHWSurface;
1120 8e1fde455471 Patch by me to fix crash described below. Ryan C. Gordon <icculus@icculus.org> parents: 1119 diff changeset	127 device->AllocHWSurface = QZ_AllocHWSurface;
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	128 device->FreeHWSurface = QZ_FreeHWSurface;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	129 /* device->FlipHWSurface = QZ_FlipHWSurface */;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	130
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	131 device->SetGamma = QZ_SetGamma;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	132 device->GetGamma = QZ_GetGamma;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	133 device->SetGammaRamp = QZ_SetGammaRamp;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	134 device->GetGammaRamp = QZ_GetGammaRamp;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	135
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	136 device->GL_GetProcAddress = QZ_GL_GetProcAddress;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	137 device->GL_GetAttribute = QZ_GL_GetAttribute;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	138 device->GL_MakeCurrent = QZ_GL_MakeCurrent;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	139 device->GL_SwapBuffers = QZ_GL_SwapBuffers;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	140 device->GL_LoadLibrary = QZ_GL_LoadLibrary;
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	141
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	142 device->FreeWMCursor = QZ_FreeWMCursor;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	143 device->CreateWMCursor = QZ_CreateWMCursor;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	144 device->ShowWMCursor = QZ_ShowWMCursor;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	145 device->WarpWMCursor = QZ_WarpWMCursor;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	146 device->MoveWMCursor = QZ_MoveWMCursor;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	147 device->CheckMouseMode = QZ_CheckMouseMode;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	148 device->InitOSKeymap = QZ_InitOSKeymap;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	149 device->PumpEvents = QZ_PumpEvents;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	150
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	151 device->SetCaption = QZ_SetCaption;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	152 device->SetIcon = QZ_SetIcon;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	153 device->IconifyWindow = QZ_IconifyWindow;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	154 /device->GetWMInfo = QZ_GetWMInfo;/
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	155 device->GrabInput = QZ_GrabInput;
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	156
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	157 device->CreateYUVOverlay = QZ_CreateYUVOverlay;
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	158
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	159 device->free = QZ_DeleteDevice;
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	160
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	161 return device;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	162 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	163
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	164 static void QZ_DeleteDevice (SDL_VideoDevice *device) {
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	165
1756 eed7a3f396ce Using the SDL C runtime functions Sam Lantinga <slouken@libsdl.org> parents: 1629 diff changeset	166 SDL_free (device->hidden);
eed7a3f396ce Using the SDL C runtime functions Sam Lantinga <slouken@libsdl.org> parents: 1629 diff changeset	167 SDL_free (device);
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	168 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	169
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	170 static int QZ_VideoInit (_THIS, SDL_PixelFormat *video_format) {
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	171
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	172 /* Initialize the video settings; this data persists between mode switches */
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	173 display_id = kCGDirectMainDisplay;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	174 save_mode = CGDisplayCurrentMode (display_id);
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	175 mode_list = CGDisplayAvailableModes (display_id);
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	176 palette = CGPaletteCreateDefaultColorPalette ();
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	177
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	178 /* Gather some information that is useful to know about the display */
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	179 CFNumberGetValue (CFDictionaryGetValue (save_mode, kCGDisplayBitsPerPixel),
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	180 kCFNumberSInt32Type, &device_bpp);
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	181
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	182 CFNumberGetValue (CFDictionaryGetValue (save_mode, kCGDisplayWidth),
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	183 kCFNumberSInt32Type, &device_width);
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	184
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	185 CFNumberGetValue (CFDictionaryGetValue (save_mode, kCGDisplayHeight),
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	186 kCFNumberSInt32Type, &device_height);
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	187
1545 8d9bb0cf2c2a Added current_w and current_h to the SDL_VideoInfo structure, which is set to the desktop resolution during video intialization, and then set to the current resolution when a video mode is set. Sam Lantinga <slouken@libsdl.org> parents: 1487 diff changeset	188 /* Determine the current screen size */
8d9bb0cf2c2a Added current_w and current_h to the SDL_VideoInfo structure, which is set to the desktop resolution during video intialization, and then set to the current resolution when a video mode is set. Sam Lantinga <slouken@libsdl.org> parents: 1487 diff changeset	189 this->info.current_w = device_width;
8d9bb0cf2c2a Added current_w and current_h to the SDL_VideoInfo structure, which is set to the desktop resolution during video intialization, and then set to the current resolution when a video mode is set. Sam Lantinga <slouken@libsdl.org> parents: 1487 diff changeset	190 this->info.current_h = device_height;
8d9bb0cf2c2a Added current_w and current_h to the SDL_VideoInfo structure, which is set to the desktop resolution during video intialization, and then set to the current resolution when a video mode is set. Sam Lantinga <slouken@libsdl.org> parents: 1487 diff changeset	191
8d9bb0cf2c2a Added current_w and current_h to the SDL_VideoInfo structure, which is set to the desktop resolution during video intialization, and then set to the current resolution when a video mode is set. Sam Lantinga <slouken@libsdl.org> parents: 1487 diff changeset	192 /* Determine the default screen depth */
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	193 video_format->BitsPerPixel = device_bpp;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	194
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	195 /* Set misc globals */
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	196 current_grab_mode = SDL_GRAB_OFF;
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	197 cursor_should_be_visible = YES;
779 68c8da837fc0 Date: Tue, 6 Jan 2004 21:54:02 +0100 Sam Lantinga <slouken@libsdl.org> parents: 768 diff changeset	198 cursor_visible = YES;
823 d67e76f25874 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 816 diff changeset	199 current_mods = 0;
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	200
876 9e84d106ec19 (Said Max Horn on the SDL mailing list...) Ryan C. Gordon <icculus@icculus.org> parents: 852 diff changeset	201 if ( Gestalt(gestaltSystemVersion, &system_version) != noErr )
9e84d106ec19 (Said Max Horn on the SDL mailing list...) Ryan C. Gordon <icculus@icculus.org> parents: 852 diff changeset	202 system_version = 0;
934 af585d6efec8 Date: Thu, 17 Jun 2004 11:38:51 -0700 (PDT) Sam Lantinga <slouken@libsdl.org> parents: 876 diff changeset	203
555 2536446a92de From: Darrell Walisser Sam Lantinga <slouken@libsdl.org> parents: 501 diff changeset	204 /* register for sleep notifications so wake from sleep generates SDL_VIDEOEXPOSE */
2536446a92de From: Darrell Walisser Sam Lantinga <slouken@libsdl.org> parents: 501 diff changeset	205 QZ_RegisterForSleepNotifications (this);
2536446a92de From: Darrell Walisser Sam Lantinga <slouken@libsdl.org> parents: 501 diff changeset	206
1271 092722dbc766 Whoops! (hope this compiles...) Sam Lantinga <slouken@libsdl.org> parents: 1220 diff changeset	207 /* Fill in some window manager capabilities */
092722dbc766 Whoops! (hope this compiles...) Sam Lantinga <slouken@libsdl.org> parents: 1220 diff changeset	208 this->info.wm_available = 1;
092722dbc766 Whoops! (hope this compiles...) Sam Lantinga <slouken@libsdl.org> parents: 1220 diff changeset	209
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	210 return 0;
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	211 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	212
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	213 static SDL_Rect** QZ_ListModes (_THIS, SDL_PixelFormat *format, Uint32 flags) {
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	214
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	215 CFIndex num_modes;
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	216 CFIndex i;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	217
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	218 int list_size = 0;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	219
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	220 /* Any windowed mode is acceptable */
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	221 if ( (flags & SDL_FULLSCREEN) == 0 )
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	222 return (SDL_Rect**)-1;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	223
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	224 /* Free memory from previous call, if any */
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	225 if ( client_mode_list != NULL ) {
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	226
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	227 int i;
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	228
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	229 for (i = 0; client_mode_list[i] != NULL; i++)
1756 eed7a3f396ce Using the SDL C runtime functions Sam Lantinga <slouken@libsdl.org> parents: 1629 diff changeset	230 SDL_free (client_mode_list[i]);
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	231
1756 eed7a3f396ce Using the SDL C runtime functions Sam Lantinga <slouken@libsdl.org> parents: 1629 diff changeset	232 SDL_free (client_mode_list);
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	233 client_mode_list = NULL;
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	234 }
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	235
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	236 num_modes = CFArrayGetCount (mode_list);
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	237
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	238 /* Build list of modes with the requested bpp */
155 2d162219f433 Date: Thu, 16 Aug 2001 21:50:51 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 117 diff changeset	239 for (i = 0; i < num_modes; i++) {
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	240
155 2d162219f433 Date: Thu, 16 Aug 2001 21:50:51 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 117 diff changeset	241 CFDictionaryRef onemode;
2d162219f433 Date: Thu, 16 Aug 2001 21:50:51 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 117 diff changeset	242 CFNumberRef number;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	243 int bpp;
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	244
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	245 onemode = CFArrayGetValueAtIndex (mode_list, i);
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	246 number = CFDictionaryGetValue (onemode, kCGDisplayBitsPerPixel);
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	247 CFNumberGetValue (number, kCFNumberSInt32Type, &bpp);
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	248
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	249 if (bpp == format->BitsPerPixel) {
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	250
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	251 int intvalue;
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	252 int hasMode;
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	253 int width, height;
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	254
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	255 number = CFDictionaryGetValue (onemode, kCGDisplayWidth);
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	256 CFNumberGetValue (number, kCFNumberSInt32Type, &intvalue);
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	257 width = (Uint16) intvalue;
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	258
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	259 number = CFDictionaryGetValue (onemode, kCGDisplayHeight);
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	260 CFNumberGetValue (number, kCFNumberSInt32Type, &intvalue);
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	261 height = (Uint16) intvalue;
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	262
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	263 /* Check if mode is already in the list */
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	264 {
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	265 int i;
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	266 hasMode = SDL_FALSE;
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	267 for (i = 0; i < list_size; i++) {
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	268 if (client_mode_list[i]->w == width &&
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	269 client_mode_list[i]->h == height) {
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	270 hasMode = SDL_TRUE;
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	271 break;
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	272 }
155 2d162219f433 Date: Thu, 16 Aug 2001 21:50:51 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 117 diff changeset	273 }
2d162219f433 Date: Thu, 16 Aug 2001 21:50:51 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 117 diff changeset	274 }
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	275
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	276 /* Grow the list and add mode to the list */
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	277 if ( ! hasMode ) {
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	278
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	279 SDL_Rect *rect;
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	280
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	281 list_size++;
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	282
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	283 if (client_mode_list == NULL)
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	284 client_mode_list = (SDL_Rect**)
1756 eed7a3f396ce Using the SDL C runtime functions Sam Lantinga <slouken@libsdl.org> parents: 1629 diff changeset	285 SDL_malloc (sizeof(client_mode_list) (list_size+1) );
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	286 else
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	287 client_mode_list = (SDL_Rect**)
1756 eed7a3f396ce Using the SDL C runtime functions Sam Lantinga <slouken@libsdl.org> parents: 1629 diff changeset	288 SDL_realloc (client_mode_list, sizeof(client_mode_list) (list_size+1));
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	289
1756 eed7a3f396ce Using the SDL C runtime functions Sam Lantinga <slouken@libsdl.org> parents: 1629 diff changeset	290 rect = (SDL_Rect) SDL_malloc (sizeof(*client_mode_list));
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	291
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	292 if (client_mode_list == NULL \|\| rect == NULL) {
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	293 SDL_OutOfMemory ();
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	294 return NULL;
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	295 }
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	296
1218 057d313e36a2 Quartz target: set x and y field of mode list to 0 in SDL_ListMode call. Ryan C. Gordon <icculus@icculus.org> parents: 1212 diff changeset	297 rect->x = rect->y = 0;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	298 rect->w = width;
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	299 rect->h = height;
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	300
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	301 client_mode_list[list_size-1] = rect;
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	302 client_mode_list[list_size] = NULL;
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	303 }
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	304 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	305 }
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	306
155 2d162219f433 Date: Thu, 16 Aug 2001 21:50:51 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 117 diff changeset	307 /* Sort list largest to smallest (by area) */
2d162219f433 Date: Thu, 16 Aug 2001 21:50:51 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 117 diff changeset	308 {
2d162219f433 Date: Thu, 16 Aug 2001 21:50:51 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 117 diff changeset	309 int i, j;
2d162219f433 Date: Thu, 16 Aug 2001 21:50:51 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 117 diff changeset	310 for (i = 0; i < list_size; i++) {
2d162219f433 Date: Thu, 16 Aug 2001 21:50:51 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 117 diff changeset	311 for (j = 0; j < list_size-1; j++) {
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	312
155 2d162219f433 Date: Thu, 16 Aug 2001 21:50:51 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 117 diff changeset	313 int area1, area2;
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	314 area1 = client_mode_list[j]->w * client_mode_list[j]->h;
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	315 area2 = client_mode_list[j+1]->w * client_mode_list[j+1]->h;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	316
155 2d162219f433 Date: Thu, 16 Aug 2001 21:50:51 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 117 diff changeset	317 if (area1 < area2) {
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	318 SDL_Rect *tmp = client_mode_list[j];
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	319 client_mode_list[j] = client_mode_list[j+1];
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	320 client_mode_list[j+1] = tmp;
155 2d162219f433 Date: Thu, 16 Aug 2001 21:50:51 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 117 diff changeset	321 }
2d162219f433 Date: Thu, 16 Aug 2001 21:50:51 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 117 diff changeset	322 }
2d162219f433 Date: Thu, 16 Aug 2001 21:50:51 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 117 diff changeset	323 }
2d162219f433 Date: Thu, 16 Aug 2001 21:50:51 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 117 diff changeset	324 }
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	325 return client_mode_list;
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	326 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	327
657 714053f573e7 Date: Thu, 24 Jul 2003 01:40:17 +0200 Sam Lantinga <slouken@libsdl.org> parents: 656 diff changeset	328 static SDL_bool QZ_WindowPosition(_THIS, int x, int y)
714053f573e7 Date: Thu, 24 Jul 2003 01:40:17 +0200 Sam Lantinga <slouken@libsdl.org> parents: 656 diff changeset	329 {
714053f573e7 Date: Thu, 24 Jul 2003 01:40:17 +0200 Sam Lantinga <slouken@libsdl.org> parents: 656 diff changeset	330 const char *window = getenv("SDL_VIDEO_WINDOW_POS");
714053f573e7 Date: Thu, 24 Jul 2003 01:40:17 +0200 Sam Lantinga <slouken@libsdl.org> parents: 656 diff changeset	331 if ( window ) {
714053f573e7 Date: Thu, 24 Jul 2003 01:40:17 +0200 Sam Lantinga <slouken@libsdl.org> parents: 656 diff changeset	332 if ( sscanf(window, "%d,%d", x, y) == 2 ) {
714053f573e7 Date: Thu, 24 Jul 2003 01:40:17 +0200 Sam Lantinga <slouken@libsdl.org> parents: 656 diff changeset	333 return SDL_TRUE;
714053f573e7 Date: Thu, 24 Jul 2003 01:40:17 +0200 Sam Lantinga <slouken@libsdl.org> parents: 656 diff changeset	334 }
714053f573e7 Date: Thu, 24 Jul 2003 01:40:17 +0200 Sam Lantinga <slouken@libsdl.org> parents: 656 diff changeset	335 }
714053f573e7 Date: Thu, 24 Jul 2003 01:40:17 +0200 Sam Lantinga <slouken@libsdl.org> parents: 656 diff changeset	336 return SDL_FALSE;
714053f573e7 Date: Thu, 24 Jul 2003 01:40:17 +0200 Sam Lantinga <slouken@libsdl.org> parents: 656 diff changeset	337 }
714053f573e7 Date: Thu, 24 Jul 2003 01:40:17 +0200 Sam Lantinga <slouken@libsdl.org> parents: 656 diff changeset	338
1340 58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	339 static void QZ_UnsetVideoMode (_THIS, BOOL to_desktop) {
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	340
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	341 /* Reset values that may change between switches */
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	342 this->info.blit_fill = 0;
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	343 this->FillHWRect = NULL;
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	344 this->UpdateRects = NULL;
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	345 this->LockHWSurface = NULL;
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	346 this->UnlockHWSurface = NULL;
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	347
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	348 /* Release fullscreen resources */
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	349 if ( mode_flags & SDL_FULLSCREEN ) {
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	350
435 140798e1e7a6 Darrell's fix for Quartz mouse motion Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	351 NSRect screen_rect;
140798e1e7a6 Darrell's fix for Quartz mouse motion Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	352
588 2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	353 /* Release double buffer stuff */
1144 509295d5a023 Date: Sun, 11 Sep 2005 14:41:07 +0300 (EEST) Ryan C. Gordon <icculus@icculus.org> parents: 1120 diff changeset	354 if ( mode_flags & SDL_DOUBLEBUF) {
588 2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	355 quit_thread = YES;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	356 SDL_SemPost (sem1);
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	357 SDL_WaitThread (thread, NULL);
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	358 SDL_DestroySemaphore (sem1);
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	359 SDL_DestroySemaphore (sem2);
1756 eed7a3f396ce Using the SDL C runtime functions Sam Lantinga <slouken@libsdl.org> parents: 1629 diff changeset	360 SDL_free (sw_buffers[0]);
588 2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	361 }
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	362
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	363 /*
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	364 Release the OpenGL context
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	365 Do this first to avoid trash on the display before fade
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	366 */
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	367 if ( mode_flags & SDL_OPENGL ) {
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	368
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	369 QZ_TearDownOpenGL (this);
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	370 CGLSetFullScreen (NULL);
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	371 }
1340 58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	372 if (to_desktop) {
3877 81f66f258d77 Fixed bug #281 Sam Lantinga <slouken@libsdl.org> parents: 1756 diff changeset	373 ShowMenuBar ();
1340 58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	374 /* Restore original screen resolution/bpp */
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	375 CGDisplaySwitchToMode (display_id, save_mode);
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	376 CGReleaseAllDisplays ();
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	377 /*
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	378 Reset the main screen's rectangle
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	379 See comment in QZ_SetVideoFullscreen for why we do this
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	380 */
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	381 screen_rect = NSMakeRect(0,0,device_width,device_height);
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	382 [ [ NSScreen mainScreen ] setFrame:screen_rect ];
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	383 }
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	384 }
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	385 /* Release window mode resources */
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	386 else {
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	387
158 4382c38dfbee Date: Tue, 21 Aug 2001 03:50:01 +0200 Sam Lantinga <slouken@libsdl.org> parents: 155 diff changeset	388 [ qz_window close ];
1160 72c6c3e5bb85 Closed a memory leak caused when quitting video subsystem on Quartz target. Ryan C. Gordon <icculus@icculus.org> parents: 1144 diff changeset	389 [ qz_window release ];
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	390 qz_window = nil;
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	391 window_view = nil;
1160 72c6c3e5bb85 Closed a memory leak caused when quitting video subsystem on Quartz target. Ryan C. Gordon <icculus@icculus.org> parents: 1144 diff changeset	392
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	393 /* Release the OpenGL context */
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	394 if ( mode_flags & SDL_OPENGL )
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	395 QZ_TearDownOpenGL (this);
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	396 }
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	397
155 2d162219f433 Date: Thu, 16 Aug 2001 21:50:51 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 117 diff changeset	398 /* Signal successful teardown */
2d162219f433 Date: Thu, 16 Aug 2001 21:50:51 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 117 diff changeset	399 video_set = SDL_FALSE;
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	400 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	401
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	402 static SDL_Surface* QZ_SetVideoFullScreen (_THIS, SDL_Surface *current, int width,
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	403 int height, int bpp, Uint32 flags) {
1220 ca2f0da7b708 Quartz driver: Make sure we pass a pointer to the right type. Ryan C. Gordon <icculus@icculus.org> parents: 1219 diff changeset	404 boolean_t exact_match = 0;
435 140798e1e7a6 Darrell's fix for Quartz mouse motion Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	405 NSRect screen_rect;
588 2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	406 CGError error;
1340 58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	407 CGDisplayFadeReservationToken fade_token = kCGDisplayFadeReservationInvalidToken;
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	408
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	409 /* Fade to black to hide resolution-switching flicker (and garbage
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	410 that is displayed by a destroyed OpenGL context, if applicable) */
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	411 if ( CGAcquireDisplayFadeReservation (5, &fade_token) == kCGErrorSuccess ) {
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	412 CGDisplayFade (fade_token, 0.3, kCGDisplayBlendNormal, kCGDisplayBlendSolidColor, 0.0, 0.0, 0.0, TRUE);
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	413 }
435 140798e1e7a6 Darrell's fix for Quartz mouse motion Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	414
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	415 /* Destroy any previous mode */
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	416 if (video_set == SDL_TRUE)
1340 58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	417 QZ_UnsetVideoMode (this, FALSE);
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	418
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	419 /* See if requested mode exists */
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	420 mode = CGDisplayBestModeForParameters (display_id, bpp, width,
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	421 height, &exact_match);
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	422
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	423 /* Require an exact match to the requested mode */
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	424 if ( ! exact_match ) {
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	425 SDL_SetError ("Failed to find display resolution: %dx%dx%d", width, height, bpp);
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	426 goto ERR_NO_MATCH;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	427 }
155 2d162219f433 Date: Thu, 16 Aug 2001 21:50:51 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 117 diff changeset	428
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	429 /* Put up the blanking window (a window above all other windows) */
588 2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	430 if (getenv ("SDL_SINGLEDISPLAY"))
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	431 error = CGDisplayCapture (display_id);
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	432 else
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	433 error = CGCaptureAllDisplays ();
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	434
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	435 if ( CGDisplayNoErr != error ) {
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	436 SDL_SetError ("Failed capturing display");
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	437 goto ERR_NO_CAPTURE;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	438 }
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	439
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	440 /* Do the physical switch */
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	441 if ( CGDisplayNoErr != CGDisplaySwitchToMode (display_id, mode) ) {
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	442 SDL_SetError ("Failed switching display resolution");
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	443 goto ERR_NO_SWITCH;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	444 }
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	445
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	446 current->pixels = (Uint32*) CGDisplayBaseAddress (display_id);
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	447 current->pitch = CGDisplayBytesPerRow (display_id);
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	448
58 bd6b0a910a65 * Removed fullscreen menu option from the "Window" menu Sam Lantinga <slouken@lokigames.com> parents: 56 diff changeset	449 current->flags = 0;
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	450 current->w = width;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	451 current->h = height;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	452 current->flags \|= SDL_FULLSCREEN;
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	453 current->flags \|= SDL_HWSURFACE;
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	454 current->flags \|= SDL_PREALLOC;
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	455
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	456 this->UpdateRects = QZ_DirectUpdate;
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	457 this->LockHWSurface = QZ_LockHWSurface;
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	458 this->UnlockHWSurface = QZ_UnlockHWSurface;
588 2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	459
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	460 /* Setup double-buffer emulation */
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	461 if ( flags & SDL_DOUBLEBUF ) {
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	462
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	463 /*
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	464 Setup a software backing store for reasonable results when
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	465 double buffering is requested (since a single-buffered hardware
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	466 surface looks hideous).
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	467
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	468 The actual screen blit occurs in a separate thread to allow
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	469 other blitting while waiting on the VBL (and hence results in higher framerates).
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	470 */
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	471 this->LockHWSurface = NULL;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	472 this->UnlockHWSurface = NULL;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	473 this->UpdateRects = NULL;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	474
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	475 current->flags \|= (SDL_HWSURFACE\|SDL_DOUBLEBUF);
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	476 this->UpdateRects = QZ_DoubleBufferUpdate;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	477 this->LockHWSurface = QZ_LockDoubleBuffer;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	478 this->UnlockHWSurface = QZ_UnlockDoubleBuffer;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	479 this->FlipHWSurface = QZ_FlipDoubleBuffer;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	480
1756 eed7a3f396ce Using the SDL C runtime functions Sam Lantinga <slouken@libsdl.org> parents: 1629 diff changeset	481 current->pixels = SDL_malloc (current->pitch * current->h * 2);
588 2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	482 if (current->pixels == NULL) {
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	483 SDL_OutOfMemory ();
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	484 goto ERR_DOUBLEBUF;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	485 }
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	486
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	487 sw_buffers[0] = current->pixels;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	488 sw_buffers[1] = (Uint8)current->pixels + current->pitch current->h;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	489
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	490 quit_thread = NO;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	491 sem1 = SDL_CreateSemaphore (0);
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	492 sem2 = SDL_CreateSemaphore (1);
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	493 thread = SDL_CreateThread ((int ()(void ))QZ_ThreadFlip, this);
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	494 }
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	495
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	496 if ( CGDisplayCanSetPalette (display_id) )
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	497 current->flags \|= SDL_HWPALETTE;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	498
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	499 /* Setup OpenGL for a fullscreen context */
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	500 if (flags & SDL_OPENGL) {
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	501
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	502 CGLError err;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	503 CGLContextObj ctx;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	504
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	505 if ( ! QZ_SetupOpenGL (this, bpp, flags) ) {
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	506 goto ERR_NO_GL;
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	507 }
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	508
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	509 ctx = [ gl_context cglContext ];
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	510 err = CGLSetFullScreen (ctx);
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	511
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	512 if (err) {
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	513 SDL_SetError ("Error setting OpenGL fullscreen: %s", CGLErrorString(err));
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	514 goto ERR_NO_GL;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	515 }
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	516
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	517 [ gl_context makeCurrentContext];
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	518
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	519 glClear (GL_COLOR_BUFFER_BIT);
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	520
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	521 [ gl_context flushBuffer ];
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	522
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	523 current->flags \|= SDL_OPENGL;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	524 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	525
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	526 /* If we don't hide menu bar, it will get events and interrupt the program */
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	527 HideMenuBar ();
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	528
1340 58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	529 /* Fade in again (asynchronously) */
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	530 if ( fade_token != kCGDisplayFadeReservationInvalidToken ) {
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	531 CGDisplayFade (fade_token, 0.5, kCGDisplayBlendSolidColor, kCGDisplayBlendNormal, 0.0, 0.0, 0.0, FALSE);
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	532 CGReleaseDisplayFadeReservation(fade_token);
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	533 }
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	534
435 140798e1e7a6 Darrell's fix for Quartz mouse motion Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	535 /*
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	536 There is a bug in Cocoa where NSScreen doesn't synchronize
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	537 with CGDirectDisplay, so the main screen's frame is wrong.
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	538 As a result, coordinate translation produces incorrect results.
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	539 We can hack around this bug by setting the screen rect
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	540 ourselves. This hack should be removed if/when the bug is fixed.
435 140798e1e7a6 Darrell's fix for Quartz mouse motion Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	541 */
140798e1e7a6 Darrell's fix for Quartz mouse motion Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	542 screen_rect = NSMakeRect(0,0,width,height);
140798e1e7a6 Darrell's fix for Quartz mouse motion Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	543 [ [ NSScreen mainScreen ] setFrame:screen_rect ];
140798e1e7a6 Darrell's fix for Quartz mouse motion Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	544
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	545 /* Save the flags to ensure correct tear-down */
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	546 mode_flags = current->flags;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	547
1629 ef4a796e7f24 Fixed bug #55 Sam Lantinga <slouken@libsdl.org> parents: 1545 diff changeset	548 /* Set app state, hide cursor if necessary, ... */
ef4a796e7f24 Fixed bug #55 Sam Lantinga <slouken@libsdl.org> parents: 1545 diff changeset	549 QZ_DoActivate(this);
1119 430d8d701f69 SDL_GetAppState() correction when toggling fullscreen on OSX. Ryan C. Gordon <icculus@icculus.org> parents: 967 diff changeset	550
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	551 return current;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	552
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	553 /* Since the blanking window covers all windows (even force quit) correct recovery is crucial */
588 2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	554 ERR_NO_GL:
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	555 ERR_DOUBLEBUF: CGDisplaySwitchToMode (display_id, save_mode);
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	556 ERR_NO_SWITCH: CGReleaseAllDisplays ();
1340 58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	557 ERR_NO_CAPTURE:
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	558 ERR_NO_MATCH: if ( fade_token != kCGDisplayFadeReservationInvalidToken ) {
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	559 CGDisplayFade (fade_token, 0.5, kCGDisplayBlendSolidColor, kCGDisplayBlendNormal, 0.0, 0.0, 0.0, FALSE);
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	560 CGReleaseDisplayFadeReservation (fade_token);
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	561 }
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	562 return NULL;
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	563 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	564
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	565 static SDL_Surface* QZ_SetVideoWindowed (_THIS, SDL_Surface *current, int width,
1183 634d85aefc8c Fixed bug reported here: Ryan C. Gordon <icculus@icculus.org> parents: 1181 diff changeset	566 int height, int *bpp, Uint32 flags) {
58 bd6b0a910a65 * Removed fullscreen menu option from the "Window" menu Sam Lantinga <slouken@lokigames.com> parents: 56 diff changeset	567 unsigned int style;
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	568 NSRect contentRect;
683 5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	569 BOOL isCustom = NO;
657 714053f573e7 Date: Thu, 24 Jul 2003 01:40:17 +0200 Sam Lantinga <slouken@libsdl.org> parents: 656 diff changeset	570 int center_window = 1;
714053f573e7 Date: Thu, 24 Jul 2003 01:40:17 +0200 Sam Lantinga <slouken@libsdl.org> parents: 656 diff changeset	571 int origin_x, origin_y;
1340 58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	572 CGDisplayFadeReservationToken fade_token = kCGDisplayFadeReservationInvalidToken;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	573
58 bd6b0a910a65 * Removed fullscreen menu option from the "Window" menu Sam Lantinga <slouken@lokigames.com> parents: 56 diff changeset	574 current->flags = 0;
bd6b0a910a65 * Removed fullscreen menu option from the "Window" menu Sam Lantinga <slouken@lokigames.com> parents: 56 diff changeset	575 current->w = width;
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	576 current->h = height;
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	577
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	578 contentRect = NSMakeRect (0, 0, width, height);
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	579
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	580 /*
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	581 Check if we should completely destroy the previous mode
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	582 - If it is fullscreen
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	583 - If it has different noframe or resizable attribute
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	584 - If it is OpenGL (since gl attributes could be different)
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	585 - If new mode is OpenGL, but previous mode wasn't
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	586 */
1340 58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	587 if (video_set == SDL_TRUE) {
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	588 if (mode_flags & SDL_FULLSCREEN) {
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	589 /* Fade to black to hide resolution-switching flicker (and garbage
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	590 that is displayed by a destroyed OpenGL context, if applicable) */
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	591 if (CGAcquireDisplayFadeReservation (5, &fade_token) == kCGErrorSuccess) {
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	592 CGDisplayFade (fade_token, 0.3, kCGDisplayBlendNormal, kCGDisplayBlendSolidColor, 0.0, 0.0, 0.0, TRUE);
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	593 }
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	594 QZ_UnsetVideoMode (this, TRUE);
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	595 }
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	596 else if ( ((mode_flags ^ flags) & (SDL_NOFRAME\|SDL_RESIZABLE)) \|\|
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	597 (mode_flags & SDL_OPENGL) \|\|
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	598 (flags & SDL_OPENGL) ) {
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	599 QZ_UnsetVideoMode (this, TRUE);
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	600 }
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	601 }
683 5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	602
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	603 /* Check for user-specified window and view */
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	604 {
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	605 char *windowPtrString = getenv ("SDL_NSWindowPointer");
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	606 char *viewPtrString = getenv ("SDL_NSQuickDrawViewPointer");
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	607
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	608 if (windowPtrString && viewPtrString) {
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	609
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	610 /* Release any previous window */
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	611 if ( qz_window ) {
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	612 [ qz_window release ];
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	613 qz_window = nil;
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	614 }
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	615
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	616 qz_window = (NSWindow*)atoi(windowPtrString);
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	617 window_view = (NSQuickDrawView*)atoi(viewPtrString);
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	618 isCustom = YES;
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	619
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	620 /*
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	621 Retain reference to window because we
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	622 might release it in QZ_UnsetVideoMode
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	623 */
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	624 [ qz_window retain ];
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	625
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	626 style = [ qz_window styleMask ];
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	627 /* Check resizability */
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	628 if ( style & NSResizableWindowMask )
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	629 current->flags \|= SDL_RESIZABLE;
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	630
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	631 /* Check frame */
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	632 if ( style & NSBorderlessWindowMask )
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	633 current->flags \|= SDL_NOFRAME;
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	634 }
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	635 }
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	636
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	637 /* Check if we should recreate the window */
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	638 if (qz_window == nil) {
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	639
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	640 /* Set the window style based on input flags */
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	641 if ( flags & SDL_NOFRAME ) {
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	642 style = NSBorderlessWindowMask;
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	643 current->flags \|= SDL_NOFRAME;
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	644 } else {
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	645 style = NSTitledWindowMask;
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	646 style \|= (NSMiniaturizableWindowMask \| NSClosableWindowMask);
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	647 if ( flags & SDL_RESIZABLE ) {
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	648 style \|= NSResizableWindowMask;
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	649 current->flags \|= SDL_RESIZABLE;
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	650 }
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	651 }
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	652
657 714053f573e7 Date: Thu, 24 Jul 2003 01:40:17 +0200 Sam Lantinga <slouken@libsdl.org> parents: 656 diff changeset	653 if ( QZ_WindowPosition(this, &origin_x, &origin_y) ) {
714053f573e7 Date: Thu, 24 Jul 2003 01:40:17 +0200 Sam Lantinga <slouken@libsdl.org> parents: 656 diff changeset	654 center_window = 0;
714053f573e7 Date: Thu, 24 Jul 2003 01:40:17 +0200 Sam Lantinga <slouken@libsdl.org> parents: 656 diff changeset	655 contentRect.origin.x = (float)origin_x;
714053f573e7 Date: Thu, 24 Jul 2003 01:40:17 +0200 Sam Lantinga <slouken@libsdl.org> parents: 656 diff changeset	656 contentRect.origin.y = (float)origin_y;
714053f573e7 Date: Thu, 24 Jul 2003 01:40:17 +0200 Sam Lantinga <slouken@libsdl.org> parents: 656 diff changeset	657 }
714053f573e7 Date: Thu, 24 Jul 2003 01:40:17 +0200 Sam Lantinga <slouken@libsdl.org> parents: 656 diff changeset	658
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	659 /* Manually create a window, avoids having a nib file resource */
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	660 qz_window = [ [ SDL_QuartzWindow alloc ]
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	661 initWithContentRect:contentRect
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	662 styleMask:style
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	663 backing:NSBackingStoreBuffered
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	664 defer:NO ];
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	665
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	666 if (qz_window == nil) {
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	667 SDL_SetError ("Could not create the Cocoa window");
1340 58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	668 if (fade_token != kCGDisplayFadeReservationInvalidToken) {
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	669 CGDisplayFade (fade_token, 0.5, kCGDisplayBlendSolidColor, kCGDisplayBlendNormal, 0.0, 0.0, 0.0, FALSE);
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	670 CGReleaseDisplayFadeReservation (fade_token);
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	671 }
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	672 return NULL;
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	673 }
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	674
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1403 diff changeset	675 /[ qz_window setReleasedWhenClosed:YES ];/
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	676 QZ_SetCaption(this, this->wm_title, this->wm_icon);
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	677 [ qz_window setAcceptsMouseMovedEvents:YES ];
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	678 [ qz_window setViewsNeedDisplay:NO ];
657 714053f573e7 Date: Thu, 24 Jul 2003 01:40:17 +0200 Sam Lantinga <slouken@libsdl.org> parents: 656 diff changeset	679 if ( center_window ) {
714053f573e7 Date: Thu, 24 Jul 2003 01:40:17 +0200 Sam Lantinga <slouken@libsdl.org> parents: 656 diff changeset	680 [ qz_window center ];
714053f573e7 Date: Thu, 24 Jul 2003 01:40:17 +0200 Sam Lantinga <slouken@libsdl.org> parents: 656 diff changeset	681 }
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	682 [ qz_window setDelegate:
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	683 [ [ [ SDL_QuartzWindowDelegate alloc ] init ] autorelease ] ];
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	684 }
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	685 /* We already have a window, just change its size */
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	686 else {
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	687
683 5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	688 if (!isCustom) {
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	689 [ qz_window setContentSize:contentRect.size ];
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	690 current->flags \|= (SDL_NOFRAME\|SDL_RESIZABLE) & mode_flags;
832 f003714db2f4 Date: Mon, 16 Feb 2004 19:21:51 +0100 Sam Lantinga <slouken@libsdl.org> parents: 823 diff changeset	691 [ window_view setFrameSize:contentRect.size ];
683 5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	692 }
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	693 }
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	694
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	695 /* For OpenGL, we bind the context to a subview */
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	696 if ( flags & SDL_OPENGL ) {
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	697
1183 634d85aefc8c Fixed bug reported here: Ryan C. Gordon <icculus@icculus.org> parents: 1181 diff changeset	698 if ( ! QZ_SetupOpenGL (this, *bpp, flags) ) {
1340 58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	699 if (fade_token != kCGDisplayFadeReservationInvalidToken) {
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	700 CGDisplayFade (fade_token, 0.5, kCGDisplayBlendSolidColor, kCGDisplayBlendNormal, 0.0, 0.0, 0.0, FALSE);
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	701 CGReleaseDisplayFadeReservation (fade_token);
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	702 }
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	703 return NULL;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	704 }
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	705
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	706 window_view = [ [ NSView alloc ] initWithFrame:contentRect ];
832 f003714db2f4 Date: Mon, 16 Feb 2004 19:21:51 +0100 Sam Lantinga <slouken@libsdl.org> parents: 823 diff changeset	707 [ window_view setAutoresizingMask: NSViewWidthSizable \| NSViewHeightSizable ];
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	708 [ [ qz_window contentView ] addSubview:window_view ];
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	709 [ gl_context setView: window_view ];
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	710 [ window_view release ];
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	711 [ gl_context makeCurrentContext];
158 4382c38dfbee Date: Tue, 21 Aug 2001 03:50:01 +0200 Sam Lantinga <slouken@libsdl.org> parents: 155 diff changeset	712 [ qz_window makeKeyAndOrderFront:nil ];
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	713 current->flags \|= SDL_OPENGL;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	714 }
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	715 /* For 2D, we set the subview to an NSQuickDrawView */
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	716 else {
1183 634d85aefc8c Fixed bug reported here: Ryan C. Gordon <icculus@icculus.org> parents: 1181 diff changeset	717 short qdbpp = 0;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	718
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	719 /* Only recreate the view if it doesn't already exist */
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	720 if (window_view == nil) {
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	721
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	722 window_view = [ [ NSQuickDrawView alloc ] initWithFrame:contentRect ];
832 f003714db2f4 Date: Mon, 16 Feb 2004 19:21:51 +0100 Sam Lantinga <slouken@libsdl.org> parents: 823 diff changeset	723 [ window_view setAutoresizingMask: NSViewWidthSizable \| NSViewHeightSizable ];
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	724 [ [ qz_window contentView ] addSubview:window_view ];
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	725 [ window_view release ];
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	726 [ qz_window makeKeyAndOrderFront:nil ];
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	727 }
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	728
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	729 LockPortBits ( [ window_view qdPort ] );
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	730 current->pixels = GetPixBaseAddr ( GetPortPixMap ( [ window_view qdPort ] ) );
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	731 current->pitch = GetPixRowBytes ( GetPortPixMap ( [ window_view qdPort ] ) );
1183 634d85aefc8c Fixed bug reported here: Ryan C. Gordon <icculus@icculus.org> parents: 1181 diff changeset	732 qdbpp = GetPixDepth ( GetPortPixMap ( [ window_view qdPort ] ) );
498 4b8ff8ac2c07 Fixed window update problems on MacOS X 10.2 (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 450 diff changeset	733 UnlockPortBits ( [ window_view qdPort ] );
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	734
1183 634d85aefc8c Fixed bug reported here: Ryan C. Gordon <icculus@icculus.org> parents: 1181 diff changeset	735 /* QuickDraw may give a 16-bit shadow surface on 8-bit displays! */
634d85aefc8c Fixed bug reported here: Ryan C. Gordon <icculus@icculus.org> parents: 1181 diff changeset	736 *bpp = qdbpp;
634d85aefc8c Fixed bug reported here: Ryan C. Gordon <icculus@icculus.org> parents: 1181 diff changeset	737
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	738 current->flags \|= SDL_SWSURFACE;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	739 current->flags \|= SDL_PREALLOC;
498 4b8ff8ac2c07 Fixed window update problems on MacOS X 10.2 (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 450 diff changeset	740 current->flags \|= SDL_ASYNCBLIT;
4b8ff8ac2c07 Fixed window update problems on MacOS X 10.2 (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 450 diff changeset	741
683 5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	742 /*
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	743 current->pixels now points to the window's pixels
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	744 We want it to point to the view's pixels
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	745 */
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	746 {
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	747 int vOffset = [ qz_window frame ].size.height -
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	748 [ window_view frame ].size.height - [ window_view frame ].origin.y;
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	749
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	750 int hOffset = [ window_view frame ].origin.x;
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	751
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1403 diff changeset	752 current->pixels = (Uint8 )current->pixels + (vOffset current->pitch) + hOffset * (qdbpp/8);
683 5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	753 }
498 4b8ff8ac2c07 Fixed window update problems on MacOS X 10.2 (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 450 diff changeset	754 this->UpdateRects = QZ_UpdateRects;
4b8ff8ac2c07 Fixed window update problems on MacOS X 10.2 (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 450 diff changeset	755 this->LockHWSurface = QZ_LockWindow;
4b8ff8ac2c07 Fixed window update problems on MacOS X 10.2 (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 450 diff changeset	756 this->UnlockHWSurface = QZ_UnlockWindow;
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	757 }
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	758
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	759 /* Save flags to ensure correct teardown */
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	760 mode_flags = current->flags;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	761
1340 58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	762 /* Fade in again (asynchronously) if we came from a fullscreen mode and faded to black */
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	763 if (fade_token != kCGDisplayFadeReservationInvalidToken) {
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	764 CGDisplayFade (fade_token, 0.5, kCGDisplayBlendSolidColor, kCGDisplayBlendNormal, 0.0, 0.0, 0.0, FALSE);
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	765 CGReleaseDisplayFadeReservation (fade_token);
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	766 }
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	767
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	768 return current;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	769 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	770
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	771 static SDL_Surface* QZ_SetVideoMode (_THIS, SDL_Surface *current, int width,
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	772 int height, int bpp, Uint32 flags) {
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	773
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	774 current->flags = 0;
852 2651b6b43840 Quartz fix: Ryan C. Gordon <icculus@icculus.org> parents: 832 diff changeset	775 current->pixels = NULL;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	776
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	777 /* Setup full screen video */
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	778 if ( flags & SDL_FULLSCREEN ) {
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	779 current = QZ_SetVideoFullScreen (this, current, width, height, bpp, flags );
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	780 if (current == NULL)
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	781 return NULL;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	782 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	783 /* Setup windowed video */
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	784 else {
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	785 /* Force bpp to the device's bpp */
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	786 bpp = device_bpp;
1183 634d85aefc8c Fixed bug reported here: Ryan C. Gordon <icculus@icculus.org> parents: 1181 diff changeset	787 current = QZ_SetVideoWindowed (this, current, width, height, &bpp, flags);
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	788 if (current == NULL)
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	789 return NULL;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	790 }
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	791
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	792 /* Setup the new pixel format */
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	793 {
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	794 int amask = 0,
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	795 rmask = 0,
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	796 gmask = 0,
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	797 bmask = 0;
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	798
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	799 switch (bpp) {
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	800 case 16: /* (1)-5-5-5 RGB */
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	801 amask = 0;
58 bd6b0a910a65 * Removed fullscreen menu option from the "Window" menu Sam Lantinga <slouken@lokigames.com> parents: 56 diff changeset	802 rmask = 0x7C00;
bd6b0a910a65 * Removed fullscreen menu option from the "Window" menu Sam Lantinga <slouken@lokigames.com> parents: 56 diff changeset	803 gmask = 0x03E0;
bd6b0a910a65 * Removed fullscreen menu option from the "Window" menu Sam Lantinga <slouken@lokigames.com> parents: 56 diff changeset	804 bmask = 0x001F;
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	805 break;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	806 case 24:
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	807 SDL_SetError ("24bpp is not available");
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	808 return NULL;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	809 case 32: /* (8)-8-8-8 ARGB */
155 2d162219f433 Date: Thu, 16 Aug 2001 21:50:51 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 117 diff changeset	810 amask = 0x00000000;
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	811 rmask = 0x00FF0000;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	812 gmask = 0x0000FF00;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	813 bmask = 0x000000FF;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	814 break;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	815 }
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	816
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	817 if ( ! SDL_ReallocFormat (current, bpp,
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	818 rmask, gmask, bmask, amask ) ) {
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	819 SDL_SetError ("Couldn't reallocate pixel format");
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	820 return NULL;
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	821 }
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	822 }
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	823
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	824 /* Signal successful completion (used internally) */
155 2d162219f433 Date: Thu, 16 Aug 2001 21:50:51 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 117 diff changeset	825 video_set = SDL_TRUE;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	826
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	827 return current;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	828 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	829
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	830 static int QZ_ToggleFullScreen (_THIS, int on) {
576 cd41dca47fff Fixed QZ_ToggleFullScreen() return value (thanks Max!) Sam Lantinga <slouken@libsdl.org> parents: 563 diff changeset	831 return 0;
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	832 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	833
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	834 static int QZ_SetColors (_THIS, int first_color, int num_colors,
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	835 SDL_Color *colors) {
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	836
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	837 CGTableCount index;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	838 CGDeviceColor color;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	839
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	840 for (index = first_color; index < first_color+num_colors; index++) {
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	841
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	842 /* Clamp colors between 0.0 and 1.0 */
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	843 color.red = colors->r / 255.0;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	844 color.blue = colors->b / 255.0;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	845 color.green = colors->g / 255.0;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	846
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	847 colors++;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	848
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	849 CGPaletteSetColorAtIndex (palette, color, index);
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	850 }
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	851
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	852 if ( CGDisplayNoErr != CGDisplaySetPalette (display_id, palette) )
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	853 return 0;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	854
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	855 return 1;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	856 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	857
588 2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	858 static int QZ_LockDoubleBuffer (_THIS, SDL_Surface *surface) {
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	859
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	860 return 1;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	861 }
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	862
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	863 static void QZ_UnlockDoubleBuffer (_THIS, SDL_Surface *surface) {
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	864
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	865 }
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	866
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	867 /* The VBL delay is based on code by Ian R Ollmann's RezLib <iano@cco.caltech.edu> */
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	868 static AbsoluteTime QZ_SecondsToAbsolute ( double seconds ) {
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	869
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	870 union
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	871 {
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	872 UInt64 i;
588 2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	873 Nanoseconds ns;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	874 } temp;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	875
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	876 temp.i = seconds * 1000000000.0;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	877
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	878 return NanosecondsToAbsolute ( temp.ns );
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	879 }
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	880
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	881 static int QZ_ThreadFlip (_THIS) {
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	882
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	883 Uint8 src, dst;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	884 int skip, len, h;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	885
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	886 /*
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	887 Give this thread the highest scheduling priority possible,
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	888 in the hopes that it will immediately run after the VBL delay
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	889 */
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	890 {
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	891 pthread_t current_thread;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	892 int policy;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	893 struct sched_param param;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	894
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	895 current_thread = pthread_self ();
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	896 pthread_getschedparam (current_thread, &policy, &param);
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	897 policy = SCHED_RR;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	898 param.sched_priority = sched_get_priority_max (policy);
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	899 pthread_setschedparam (current_thread, policy, &param);
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	900 }
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	901
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	902 while (1) {
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	903
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	904 SDL_SemWait (sem1);
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	905 if (quit_thread)
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	906 return 0;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	907
1219 9a7a016d5a71 Quartz driver: Correctly handle SDL_DOUBLEBUF\|SDL_FULLSCREEN when the Ryan C. Gordon <icculus@icculus.org> parents: 1218 diff changeset	908 /*
9a7a016d5a71 Quartz driver: Correctly handle SDL_DOUBLEBUF\|SDL_FULLSCREEN when the Ryan C. Gordon <icculus@icculus.org> parents: 1218 diff changeset	909 * We have to add SDL_VideoSurface->offset here, since we might be a
9a7a016d5a71 Quartz driver: Correctly handle SDL_DOUBLEBUF\|SDL_FULLSCREEN when the Ryan C. Gordon <icculus@icculus.org> parents: 1218 diff changeset	910 * smaller surface in the center of the framebuffer (you asked for
9a7a016d5a71 Quartz driver: Correctly handle SDL_DOUBLEBUF\|SDL_FULLSCREEN when the Ryan C. Gordon <icculus@icculus.org> parents: 1218 diff changeset	911 * a fullscreen resolution smaller than the hardware could supply
9a7a016d5a71 Quartz driver: Correctly handle SDL_DOUBLEBUF\|SDL_FULLSCREEN when the Ryan C. Gordon <icculus@icculus.org> parents: 1218 diff changeset	912 * so SDL is centering it in a bigger resolution)...
9a7a016d5a71 Quartz driver: Correctly handle SDL_DOUBLEBUF\|SDL_FULLSCREEN when the Ryan C. Gordon <icculus@icculus.org> parents: 1218 diff changeset	913 */
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1403 diff changeset	914 dst = (Uint8 *)CGDisplayBaseAddress (display_id) + SDL_VideoSurface->offset;
1219 9a7a016d5a71 Quartz driver: Correctly handle SDL_DOUBLEBUF\|SDL_FULLSCREEN when the Ryan C. Gordon <icculus@icculus.org> parents: 1218 diff changeset	915 src = current_buffer + SDL_VideoSurface->offset;
588 2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	916 len = SDL_VideoSurface->w * SDL_VideoSurface->format->BytesPerPixel;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	917 h = SDL_VideoSurface->h;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	918 skip = SDL_VideoSurface->pitch;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	919
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	920 /* Wait for the VBL to occur (estimated since we don't have a hardware interrupt) */
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	921 {
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	922
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	923 /* The VBL delay is based on Ian Ollmann's RezLib <iano@cco.caltech.edu> */
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	924 double refreshRate;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	925 double linesPerSecond;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	926 double target;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	927 double position;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	928 double adjustment;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	929 AbsoluteTime nextTime;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	930 CFNumberRef refreshRateCFNumber;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	931
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	932 refreshRateCFNumber = CFDictionaryGetValue (mode, kCGDisplayRefreshRate);
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	933 if ( NULL == refreshRateCFNumber ) {
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	934 SDL_SetError ("Mode has no refresh rate");
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	935 goto ERROR;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	936 }
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	937
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	938 if ( 0 == CFNumberGetValue (refreshRateCFNumber, kCFNumberDoubleType, &refreshRate) ) {
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	939 SDL_SetError ("Error getting refresh rate");
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	940 goto ERROR;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	941 }
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	942
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	943 if ( 0 == refreshRate ) {
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	944
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	945 SDL_SetError ("Display has no refresh rate, using 60hz");
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	946
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	947 /* ok, for LCD's we'll emulate a 60hz refresh, which may or may not look right */
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	948 refreshRate = 60.0;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	949 }
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	950
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	951 linesPerSecond = refreshRate * h;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	952 target = h;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	953
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	954 /* Figure out the first delay so we start off about right */
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	955 position = CGDisplayBeamPosition (display_id);
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	956 if (position > target)
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	957 position = 0;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	958
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	959 adjustment = (target - position) / linesPerSecond;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	960
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	961 nextTime = AddAbsoluteToAbsolute (UpTime (), QZ_SecondsToAbsolute (adjustment));
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	962
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	963 MPDelayUntil (&nextTime);
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	964 }
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	965
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	966
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	967 /* On error, skip VBL delay */
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	968 ERROR:
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	969
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	970 while ( h-- ) {
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	971
1756 eed7a3f396ce Using the SDL C runtime functions Sam Lantinga <slouken@libsdl.org> parents: 1629 diff changeset	972 SDL_memcpy (dst, src, len);
588 2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	973 src += skip;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	974 dst += skip;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	975 }
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	976
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	977 /* signal flip completion */
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	978 SDL_SemPost (sem2);
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	979 }
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	980
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	981 return 0;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	982 }
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	983
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	984 static int QZ_FlipDoubleBuffer (_THIS, SDL_Surface *surface) {
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	985
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	986 /* wait for previous flip to complete */
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	987 SDL_SemWait (sem2);
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	988
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	989 current_buffer = surface->pixels;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	990
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	991 if (surface->pixels == sw_buffers[0])
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	992 surface->pixels = sw_buffers[1];
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	993 else
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	994 surface->pixels = sw_buffers[0];
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	995
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	996 /* signal worker thread to do the flip */
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	997 SDL_SemPost (sem1);
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	998
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	999 return 0;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	1000 }
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	1001
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	1002
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	1003 static void QZ_DoubleBufferUpdate (_THIS, int num_rects, SDL_Rect *rects) {
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	1004
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	1005 /* perform a flip if someone calls updaterects on a doublebuferred surface */
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	1006 this->FlipHWSurface (this, SDL_VideoSurface);
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	1007 }
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	1008
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1009 static void QZ_DirectUpdate (_THIS, int num_rects, SDL_Rect *rects) {
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1010 #pragma unused(this,num_rects,rects)
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1011 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1012
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	1013 /*
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	1014 The obscured code is based on work by Matt Slot fprefect@ambrosiasw.com,
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	1015 who supplied sample code for Carbon.
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	1016 */
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1017
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1403 diff changeset	1018 /#define TEST_OBSCURED 1/
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1019
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1020 #if TEST_OBSCURED
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1021 #include "CGS.h"
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1022 #endif
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1023
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1024 static int QZ_IsWindowObscured (NSWindow *window) {
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1025
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1026
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1027 #if TEST_OBSCURED
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1028
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	1029 /*
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	1030 In order to determine if a direct copy to the screen is possible,
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1031 we must figure out if there are any windows covering ours (including shadows).
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1032 This can be done by querying the window server about the on screen
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1033 windows for their screen rectangle and window level.
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1034 The procedure used below is puts accuracy before speed; however, it aims to call
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1035 the window server the fewest number of times possible to keep things reasonable.
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1036 In my testing on a 300mhz G3, this routine typically takes < 2 ms. -DW
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1037
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1038 Notes:
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1039 -Calls into the Window Server involve IPC which is slow.
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1040 -Getting a rectangle seems slower than getting the window level
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1041 -The window list we get back is in sorted order, top to bottom
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1042 -On average, I suspect, most windows above ours are dock icon windows (hence optimization)
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1043 -Some windows above ours are always there, and cannot move or obscure us (menu bar)
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1044
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1045 Bugs:
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1046 -no way (yet) to deactivate direct drawing when a window is dragged,
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1047 or suddenly obscured, so drawing continues and can produce garbage
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1048 We need some kind of locking mechanism on window movement to prevent this
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1049
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1050 -deactivated normal windows use activated normal
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1051 window shadows (slight inaccuraccy)
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1052 */
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1053
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1054 /* Cache the connection to the window server */
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1055 static CGSConnectionID cgsConnection = (CGSConnectionID) -1;
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1056
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1057 /* Cache the dock icon windows */
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1058 static CGSWindowID dockIcons[kMaxWindows];
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1059 static int numCachedDockIcons = 0;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1060
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1061 CGSWindowID windows[kMaxWindows];
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1062 CGSWindowCount i, count;
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1063 CGSWindowLevel winLevel;
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1064 CGSRect winRect;
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1065
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1066 CGSRect contentRect;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1067 int windowNumber;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1068 int firstDockIcon;
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1069 int dockIconCacheMiss;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1070 int windowContentOffset;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1071
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1072 int obscured = SDL_TRUE;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1073
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1074 if ( [ window isVisible ] ) {
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1075
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	1076 /*
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	1077 walk the window list looking for windows over top of
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	1078 (or casting a shadow on) ours
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	1079 */
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1080
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	1081 /*
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	1082 Get a connection to the window server
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	1083 Should probably be moved out into SetVideoMode() or InitVideo()
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	1084 */
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1085 if (cgsConnection == (CGSConnectionID) -1) {
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1086 cgsConnection = (CGSConnectionID) 0;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1087 cgsConnection = _CGSDefaultConnection ();
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1088 }
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1089
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1090 if (cgsConnection) {
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1091
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1092 if ( ! [ window styleMask ] & NSBorderlessWindowMask )
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1093 windowContentOffset = 22;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1094 else
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1095 windowContentOffset = 0;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1096
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1097 windowNumber = [ window windowNumber ];
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1098
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1099 /* The window list is sorted according to order on the screen */
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1100 count = 0;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1101 CGSGetOnScreenWindowList (cgsConnection, 0, kMaxWindows, windows, &count);
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1102 CGSGetScreenRectForWindow (cgsConnection, windowNumber, &contentRect);
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1103
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1104 /* adjust rect for window title bar (if present) */
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1105 contentRect.origin.y += windowContentOffset;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1106 contentRect.size.height -= windowContentOffset;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1107
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1108 firstDockIcon = -1;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1109 dockIconCacheMiss = SDL_FALSE;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1110
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	1111 /*
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	1112 The first window is always an empty window with level kCGSWindowLevelTop
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	1113 so start at index 1
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	1114 */
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1115 for (i = 1; i < count; i++) {
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1116
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1117 /* If we reach our window in the list, it cannot be obscured */
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1118 if (windows[i] == windowNumber) {
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1119
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1120 obscured = SDL_FALSE;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1121 break;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1122 }
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1123 else {
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1124
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1125 float shadowSide;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1126 float shadowTop;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1127 float shadowBottom;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1128
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1129 CGSGetWindowLevel (cgsConnection, windows[i], &winLevel);
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1130
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1131 if (winLevel == kCGSWindowLevelDockIcon) {
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1132
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1133 int j;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1134
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1135 if (firstDockIcon < 0) {
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1136
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1137 firstDockIcon = i;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1138
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1139 if (numCachedDockIcons > 0) {
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1140
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1141 for (j = 0; j < numCachedDockIcons; j++) {
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1142
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1143 if (windows[i] == dockIcons[j])
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1144 i++;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1145 else
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1146 break;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1147 }
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1148
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1149 if (j != 0) {
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1150
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1151 i--;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1152
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1153 if (j < numCachedDockIcons) {
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1154
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1155 dockIconCacheMiss = SDL_TRUE;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1156 }
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1157 }
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1158
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1159 }
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1160 }
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1161
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1162 continue;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1163 }
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1164 else if (winLevel == kCGSWindowLevelMenuIgnore
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1165 /* winLevel == kCGSWindowLevelTop */) {
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1166
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1167 continue; /* cannot obscure window */
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1168 }
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1169 else if (winLevel == kCGSWindowLevelDockMenu \|\|
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1170 winLevel == kCGSWindowLevelMenu) {
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1171
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1172 shadowSide = 18;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1173 shadowTop = 4;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1174 shadowBottom = 22;
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1175 }
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1176 else if (winLevel == kCGSWindowLevelUtility) {
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1177
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1178 shadowSide = 8;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1179 shadowTop = 4;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1180 shadowBottom = 12;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1181 }
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1182 else if (winLevel == kCGSWindowLevelNormal) {
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1183
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	1184 /*
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	1185 These numbers are for foreground windows,
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	1186 they are too big (but will work) for background windows
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	1187 */
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1188 shadowSide = 20;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1189 shadowTop = 10;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1190 shadowBottom = 24;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1191 }
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1192 else if (winLevel == kCGSWindowLevelDock) {
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1193
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1194 /* Create dock icon cache */
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1195 if (numCachedDockIcons != (i-firstDockIcon) \|\|
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1196 dockIconCacheMiss) {
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1197
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1198 numCachedDockIcons = i - firstDockIcon;
1756 eed7a3f396ce Using the SDL C runtime functions Sam Lantinga <slouken@libsdl.org> parents: 1629 diff changeset	1199 SDL_memcpy (dockIcons, &(windows[firstDockIcon]),
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1200 numCachedDockIcons * sizeof(*windows));
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1201 }
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1202
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1203 /* no shadow */
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1204 shadowSide = 0;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1205 shadowTop = 0;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1206 shadowBottom = 0;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1207 }
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1208 else {
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1209
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	1210 /*
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	1211 kCGSWindowLevelDockLabel,
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	1212 kCGSWindowLevelDock,
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	1213 kOther???
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	1214 */
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1215
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1216 /* no shadow */
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1217 shadowSide = 0;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1218 shadowTop = 0;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1219 shadowBottom = 0;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1220 }
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1221
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1222 CGSGetScreenRectForWindow (cgsConnection, windows[i], &winRect);
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1223
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1224 winRect.origin.x -= shadowSide;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1225 winRect.origin.y -= shadowTop;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1226 winRect.size.width += shadowSide;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1227 winRect.size.height += shadowBottom;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1228
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1229 if (NSIntersectsRect (contentRect, winRect)) {
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1230
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1231 obscured = SDL_TRUE;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1232 break;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1233 }
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1234
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1235 } /* window was not our window */
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1236
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1237 } /* iterate over windows */
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1238
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1239 } /* get cgsConnection */
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1240
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1241 } /* window is visible */
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1242
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1243 return obscured;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1244 #else
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1245 return SDL_TRUE;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1246 #endif
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1247 }
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1248
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	1249
498 4b8ff8ac2c07 Fixed window update problems on MacOS X 10.2 (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 450 diff changeset	1250 /* Locking functions for the software window buffer */
4b8ff8ac2c07 Fixed window update problems on MacOS X 10.2 (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 450 diff changeset	1251 static int QZ_LockWindow (_THIS, SDL_Surface *surface) {
4b8ff8ac2c07 Fixed window update problems on MacOS X 10.2 (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 450 diff changeset	1252
4b8ff8ac2c07 Fixed window update problems on MacOS X 10.2 (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 450 diff changeset	1253 return LockPortBits ( [ window_view qdPort ] );
4b8ff8ac2c07 Fixed window update problems on MacOS X 10.2 (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 450 diff changeset	1254 }
4b8ff8ac2c07 Fixed window update problems on MacOS X 10.2 (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 450 diff changeset	1255
4b8ff8ac2c07 Fixed window update problems on MacOS X 10.2 (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 450 diff changeset	1256 static void QZ_UnlockWindow (_THIS, SDL_Surface *surface) {
4b8ff8ac2c07 Fixed window update problems on MacOS X 10.2 (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 450 diff changeset	1257
4b8ff8ac2c07 Fixed window update problems on MacOS X 10.2 (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 450 diff changeset	1258 UnlockPortBits ( [ window_view qdPort ] );
4b8ff8ac2c07 Fixed window update problems on MacOS X 10.2 (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 450 diff changeset	1259 }
4b8ff8ac2c07 Fixed window update problems on MacOS X 10.2 (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 450 diff changeset	1260
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1261 /* Resize icon, BMP format */
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1262 static const unsigned char QZ_ResizeIcon[] = {
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1263 0x42,0x4d,0x31,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x36,0x00,0x00,0x00,0x28,0x00,
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1264 0x00,0x00,0x0d,0x00,0x00,0x00,0x0d,0x00,0x00,0x00,0x01,0x00,0x18,0x00,0x00,0x00,
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1265 0x00,0x00,0xfb,0x01,0x00,0x00,0x13,0x0b,0x00,0x00,0x13,0x0b,0x00,0x00,0x00,0x00,
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1266 0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1267 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1268 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0b,0xff,0xff,
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1269 0xff,0xda,0xda,0xda,0x87,0x87,0x87,0xe8,0xe8,0xe8,0xff,0xff,0xff,0xda,0xda,0xda,
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1270 0x87,0x87,0x87,0xe8,0xe8,0xe8,0xff,0xff,0xff,0xda,0xda,0xda,0x87,0x87,0x87,0xe8,
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1271 0xe8,0xe8,0xff,0xff,0xff,0x0b,0xff,0xff,0xff,0xff,0xff,0xff,0xda,0xda,0xda,0x87,
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1272 0x87,0x87,0xe8,0xe8,0xe8,0xff,0xff,0xff,0xda,0xda,0xda,0x87,0x87,0x87,0xe8,0xe8,
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1273 0xe8,0xff,0xff,0xff,0xda,0xda,0xda,0x87,0x87,0x87,0xff,0xff,0xff,0x0b,0xff,0xff,
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1274 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xd5,0xd5,0xd5,0x87,0x87,0x87,0xe8,0xe8,0xe8,
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1275 0xff,0xff,0xff,0xda,0xda,0xda,0x87,0x87,0x87,0xe8,0xe8,0xe8,0xff,0xff,0xff,0xda,
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1276 0xda,0xda,0xff,0xff,0xff,0x0b,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1277 0xff,0xff,0xd7,0xd7,0xd7,0x87,0x87,0x87,0xe8,0xe8,0xe8,0xff,0xff,0xff,0xda,0xda,
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1278 0xda,0x87,0x87,0x87,0xe8,0xe8,0xe8,0xff,0xff,0xff,0xff,0xff,0xff,0x0b,0xff,0xff,
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1279 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xd7,0xd7,0xd7,
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1280 0x87,0x87,0x87,0xe8,0xe8,0xe8,0xff,0xff,0xff,0xda,0xda,0xda,0x87,0x87,0x87,0xe8,
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1281 0xe8,0xe8,0xff,0xff,0xff,0x0b,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1282 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xd7,0xd7,0xd7,0x87,0x87,0x87,0xe8,0xe8,
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1283 0xe8,0xff,0xff,0xff,0xdc,0xdc,0xdc,0x87,0x87,0x87,0xff,0xff,0xff,0x0b,0xff,0xff,
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1284 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1285 0xff,0xff,0xff,0xd9,0xd9,0xd9,0x87,0x87,0x87,0xe8,0xe8,0xe8,0xff,0xff,0xff,0xdc,
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1286 0xdc,0xdc,0xff,0xff,0xff,0x0b,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1287 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xdb,0xdb,
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1288 0xdb,0x87,0x87,0x87,0xe8,0xe8,0xe8,0xff,0xff,0xff,0xff,0xff,0xff,0x0b,0xff,0xff,
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1289 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1290 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xdb,0xdb,0xdb,0x87,0x87,0x87,0xe8,
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1291 0xe8,0xe8,0xff,0xff,0xff,0x0b,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1292 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1293 0xff,0xff,0xff,0xff,0xdc,0xdc,0xdc,0x87,0x87,0x87,0xff,0xff,0xff,0x0b,0xff,0xff,
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1294 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1295 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xdc,
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1296 0xdc,0xdc,0xff,0xff,0xff,0x0b,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1297 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1298 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0b
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1299 };
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1300
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1301 static void QZ_DrawResizeIcon (_THIS, RgnHandle dirtyRegion) {
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1302
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1303 /* Check if we should draw the resize icon */
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1304 if (SDL_VideoSurface->flags & SDL_RESIZABLE) {
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1305
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1306 Rect icon;
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1307 SetRect (&icon, SDL_VideoSurface->w - 13, SDL_VideoSurface->h - 13,
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1308 SDL_VideoSurface->w, SDL_VideoSurface->h);
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1309
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1310 if (RectInRgn (&icon, dirtyRegion)) {
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1311
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1312 SDL_Rect icon_rect;
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1313
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1314 /* Create the icon image */
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1315 if (resize_icon == NULL) {
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1316
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1317 SDL_RWops *rw;
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1318 SDL_Surface *tmp;
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1319
768 de1b2c3063b9 Max has been reworking this code so it works on MacOS X 10.1 Sam Lantinga <slouken@libsdl.org> parents: 761 diff changeset	1320 rw = SDL_RWFromConstMem (QZ_ResizeIcon, sizeof(QZ_ResizeIcon));
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1321 tmp = SDL_LoadBMP_RW (rw, SDL_TRUE);
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1322
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1323 resize_icon = SDL_ConvertSurface (tmp, SDL_VideoSurface->format, SDL_SRCCOLORKEY);
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1324 SDL_SetColorKey (resize_icon, SDL_SRCCOLORKEY, 0xFFFFFF);
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1325
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1326 SDL_FreeSurface (tmp);
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1327 }
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1328
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1329 icon_rect.x = SDL_VideoSurface->w - 13;
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1330 icon_rect.y = SDL_VideoSurface->h - 13;
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1331 icon_rect.w = 13;
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1332 icon_rect.h = 13;
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1333
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1334 SDL_BlitSurface (resize_icon, NULL, SDL_VideoSurface, &icon_rect);
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1335 }
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1336 }
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1337 }
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1338
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1339 static void QZ_UpdateRects (_THIS, int numRects, SDL_Rect *rects) {
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1340
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1341 if (SDL_VideoSurface->flags & SDL_OPENGLBLIT) {
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1342 QZ_GL_SwapBuffers (this);
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1343 }
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	1344 else if ( [ qz_window isMiniaturized ] ) {
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	1345
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	1346 /* Do nothing if miniaturized */
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1347 }
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	1348
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1349 else if ( ! QZ_IsWindowObscured (qz_window) ) {
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1350
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1351 /* Use direct copy to flush contents to the display */
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1352 CGrafPtr savePort;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1353 CGrafPtr dstPort, srcPort;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1354 const BitMap dstBits, srcBits;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1355 Rect dstRect, srcRect;
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1356 Point offset;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1357 int i;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1358
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1359 GetPort (&savePort);
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1360
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1361 dstPort = CreateNewPortForCGDisplayID ((UInt32)display_id);
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1362 srcPort = [ window_view qdPort ];
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1363
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1364 offset.h = 0;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1365 offset.v = 0;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1366 SetPort (srcPort);
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1367 LocalToGlobal (&offset);
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1368
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1369 SetPort (dstPort);
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1370
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1371 LockPortBits (dstPort);
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1372 LockPortBits (srcPort);
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1373
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1374 dstBits = GetPortBitMapForCopyBits (dstPort);
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1375 srcBits = GetPortBitMapForCopyBits (srcPort);
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1376
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1377 for (i = 0; i < numRects; i++) {
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1378
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1379 SetRect (&srcRect, rects[i].x, rects[i].y,
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1380 rects[i].x + rects[i].w,
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1381 rects[i].y + rects[i].h);
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1382
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1383 SetRect (&dstRect,
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1384 rects[i].x + offset.h,
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1385 rects[i].y + offset.v,
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1386 rects[i].x + rects[i].w + offset.h,
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1387 rects[i].y + rects[i].h + offset.v);
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1388
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1389 CopyBits (srcBits, dstBits,
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1390 &srcRect, &dstRect, srcCopy, NULL);
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1391
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1392 }
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1393
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1394 SetPort (savePort);
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1395 }
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1396 else {
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1397 /* Use QDFlushPortBuffer() to flush content to display */
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1398 int i;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1399 RgnHandle dirty = NewRgn ();
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1400 RgnHandle temp = NewRgn ();
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1401
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1402 SetEmptyRgn (dirty);
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1403
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1404 /* Build the region of dirty rectangles */
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1405 for (i = 0; i < numRects; i++) {
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1406
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1407 MacSetRectRgn (temp, rects[i].x, rects[i].y,
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	1408 rects[i].x + rects[i].w, rects[i].y + rects[i].h);
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1409 MacUnionRgn (dirty, temp, dirty);
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1410 }
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1411
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	1412 QZ_DrawResizeIcon (this, dirty);
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	1413
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1414 /* Flush the dirty region */
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1415 QDFlushPortBuffer ( [ window_view qdPort ], dirty );
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1416 DisposeRgn (dirty);
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1417 DisposeRgn (temp);
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1418 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1419 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1420
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1421 static void QZ_VideoQuit (_THIS) {
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1422
1340 58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	1423 CGDisplayFadeReservationToken fade_token = kCGDisplayFadeReservationInvalidToken;
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	1424
560 37c31c12eb70 Moved some cleanup stuff to QZ_VideoQuit() from QZ_UnsetVideoMode()...fixes Ryan C. Gordon <icculus@icculus.org> parents: 555 diff changeset	1425 /* Restore gamma settings */
37c31c12eb70 Moved some cleanup stuff to QZ_VideoQuit() from QZ_UnsetVideoMode()...fixes Ryan C. Gordon <icculus@icculus.org> parents: 555 diff changeset	1426 CGDisplayRestoreColorSyncSettings ();
37c31c12eb70 Moved some cleanup stuff to QZ_VideoQuit() from QZ_UnsetVideoMode()...fixes Ryan C. Gordon <icculus@icculus.org> parents: 555 diff changeset	1427
37c31c12eb70 Moved some cleanup stuff to QZ_VideoQuit() from QZ_UnsetVideoMode()...fixes Ryan C. Gordon <icculus@icculus.org> parents: 555 diff changeset	1428 /* Ensure the cursor will be visible and working when we quit */
37c31c12eb70 Moved some cleanup stuff to QZ_VideoQuit() from QZ_UnsetVideoMode()...fixes Ryan C. Gordon <icculus@icculus.org> parents: 555 diff changeset	1429 CGDisplayShowCursor (display_id);
37c31c12eb70 Moved some cleanup stuff to QZ_VideoQuit() from QZ_UnsetVideoMode()...fixes Ryan C. Gordon <icculus@icculus.org> parents: 555 diff changeset	1430 CGAssociateMouseAndMouseCursorPosition (1);
37c31c12eb70 Moved some cleanup stuff to QZ_VideoQuit() from QZ_UnsetVideoMode()...fixes Ryan C. Gordon <icculus@icculus.org> parents: 555 diff changeset	1431
1340 58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	1432 if (mode_flags & SDL_FULLSCREEN) {
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	1433 /* Fade to black to hide resolution-switching flicker (and garbage
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	1434 that is displayed by a destroyed OpenGL context, if applicable) */
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	1435 if (CGAcquireDisplayFadeReservation (5, &fade_token) == kCGErrorSuccess) {
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	1436 CGDisplayFade (fade_token, 0.3, kCGDisplayBlendNormal, kCGDisplayBlendSolidColor, 0.0, 0.0, 0.0, TRUE);
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	1437 }
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	1438 QZ_UnsetVideoMode (this, TRUE);
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	1439 if (fade_token != kCGDisplayFadeReservationInvalidToken) {
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	1440 CGDisplayFade (fade_token, 0.5, kCGDisplayBlendSolidColor, kCGDisplayBlendNormal, 0.0, 0.0, 0.0, FALSE);
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	1441 CGReleaseDisplayFadeReservation (fade_token);
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	1442 }
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	1443 }
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	1444 else
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	1445 QZ_UnsetVideoMode (this, TRUE);
58b114ef50e7 Faster fades when changing to/from/between fullscreen modes on Mac OS X. Also, Ryan C. Gordon <icculus@icculus.org> parents: 1271 diff changeset	1446
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1447 CGPaletteRelease (palette);
1181 49d3efec6651 Quartz driver OpenGL updates: Ryan C. Gordon <icculus@icculus.org> parents: 1160 diff changeset	1448
1189 c96b326b90ba Moved Quartz SDL_GL_LoadLibrary() to SDL_loadso interface. Ryan C. Gordon <icculus@icculus.org> parents: 1183 diff changeset	1449 if (opengl_library) {
c96b326b90ba Moved Quartz SDL_GL_LoadLibrary() to SDL_loadso interface. Ryan C. Gordon <icculus@icculus.org> parents: 1183 diff changeset	1450 SDL_UnloadObject(opengl_library);
c96b326b90ba Moved Quartz SDL_GL_LoadLibrary() to SDL_loadso interface. Ryan C. Gordon <icculus@icculus.org> parents: 1183 diff changeset	1451 opengl_library = NULL;
1181 49d3efec6651 Quartz driver OpenGL updates: Ryan C. Gordon <icculus@icculus.org> parents: 1160 diff changeset	1452 }
49d3efec6651 Quartz driver OpenGL updates: Ryan C. Gordon <icculus@icculus.org> parents: 1160 diff changeset	1453 this->gl_config.driver_loaded = 0;
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1454 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1455
674 be597a247e20 Fix compilation on MacOS 10.1 Sam Lantinga <slouken@libsdl.org> parents: 668 diff changeset	1456 #if 0 /* Not used (apparently, it's really slow) */
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1457 static int QZ_FillHWRect (_THIS, SDL_Surface dst, SDL_Rect rect, Uint32 color) {
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1458
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1459 CGSDisplayHWFill (display_id, rect->x, rect->y, rect->w, rect->h, color);
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1460
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1461 return 0;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1462 }
674 be597a247e20 Fix compilation on MacOS 10.1 Sam Lantinga <slouken@libsdl.org> parents: 668 diff changeset	1463 #endif
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1464
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1465 static int QZ_LockHWSurface(_THIS, SDL_Surface *surface) {
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1466
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1467 return 1;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1468 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1469
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1470 static void QZ_UnlockHWSurface(_THIS, SDL_Surface *surface) {
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1471
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1472 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1473
1120 8e1fde455471 Patch by me to fix crash described below. Ryan C. Gordon <icculus@icculus.org> parents: 1119 diff changeset	1474 static int QZ_AllocHWSurface(_THIS, SDL_Surface *surface) {
8e1fde455471 Patch by me to fix crash described below. Ryan C. Gordon <icculus@icculus.org> parents: 1119 diff changeset	1475 return(-1); /* unallowed (no HWSURFACE support here). */
8e1fde455471 Patch by me to fix crash described below. Ryan C. Gordon <icculus@icculus.org> parents: 1119 diff changeset	1476 }
8e1fde455471 Patch by me to fix crash described below. Ryan C. Gordon <icculus@icculus.org> parents: 1119 diff changeset	1477
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1478 static void QZ_FreeHWSurface (_THIS, SDL_Surface *surface) {
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1479 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1480
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1481 /*
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1482 int QZ_FlipHWSurface (_THIS, SDL_Surface *surface) {
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1483 return 0;
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1484 }
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1485 */
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1486
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1487 /* Gamma functions */
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1488 int QZ_SetGamma (_THIS, float red, float green, float blue) {
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1489
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1490 const CGGammaValue min = 0.0, max = 1.0;
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1491
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1492 if (red == 0.0)
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1493 red = FLT_MAX;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1494 else
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1495 red = 1.0 / red;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1496
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1497 if (green == 0.0)
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1498 green = FLT_MAX;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1499 else
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1500 green = 1.0 / green;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1501
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1502 if (blue == 0.0)
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1503 blue = FLT_MAX;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1504 else
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1505 blue = 1.0 / blue;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1506
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1507 if ( CGDisplayNoErr == CGSetDisplayTransferByFormula
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1508 (display_id, min, max, red, min, max, green, min, max, blue) ) {
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1509
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1510 return 0;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1511 }
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1512 else {
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1513
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1514 return -1;
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1515 }
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1516 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1517
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1518 int QZ_GetGamma (_THIS, float red, float green, float *blue) {
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1519
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1520 CGGammaValue dummy;
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1521 if ( CGDisplayNoErr == CGGetDisplayTransferByFormula
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1522 (display_id, &dummy, &dummy, red,
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1523 &dummy, &dummy, green, &dummy, &dummy, blue) )
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1524
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1525 return 0;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1526 else
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1527 return -1;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1528 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1529
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1530 int QZ_SetGammaRamp (_THIS, Uint16 *ramp) {
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1531
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1532 const CGTableCount tableSize = 255;
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1533 CGGammaValue redTable[tableSize];
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1534 CGGammaValue greenTable[tableSize];
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1535 CGGammaValue blueTable[tableSize];
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1536
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1537 int i;
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1538
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1539 /* Extract gamma values into separate tables, convert to floats between 0.0 and 1.0 */
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1540 for (i = 0; i < 256; i++)
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1541 redTable[i % 256] = ramp[i] / 65535.0;
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1542
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1543 for (i=256; i < 512; i++)
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1544 greenTable[i % 256] = ramp[i] / 65535.0;
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1545
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1546 for (i=512; i < 768; i++)
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1547 blueTable[i % 256] = ramp[i] / 65535.0;
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1548
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1549 if ( CGDisplayNoErr == CGSetDisplayTransferByTable
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1550 (display_id, tableSize, redTable, greenTable, blueTable) )
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1551 return 0;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1552 else
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1553 return -1;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1554 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1555
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1556 int QZ_GetGammaRamp (_THIS, Uint16 *ramp) {
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1557
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1558 const CGTableCount tableSize = 255;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1559 CGGammaValue redTable[tableSize];
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1560 CGGammaValue greenTable[tableSize];
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1561 CGGammaValue blueTable[tableSize];
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1562 CGTableCount actual;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1563 int i;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1564
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1565 if ( CGDisplayNoErr != CGGetDisplayTransferByTable
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1566 (display_id, tableSize, redTable, greenTable, blueTable, &actual) \|\|
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1567 actual != tableSize)
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1568
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1569 return -1;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1570
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1571 /* Pack tables into one array, with values from 0 to 65535 */
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1572 for (i = 0; i < 256; i++)
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1573 ramp[i] = redTable[i % 256] * 65535.0;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1574
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1575 for (i=256; i < 512; i++)
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1576 ramp[i] = greenTable[i % 256] * 65535.0;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1577
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1578 for (i=512; i < 768; i++)
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1579 ramp[i] = blueTable[i % 256] * 65535.0;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1580
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1581 return 0;
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1582 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1583

Mercurial > sdl-ios-xcode

annotate src/video/quartz/SDL_QuartzVideo.m @ 3922:4e02435ad2be SDL-1.2