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

annotate src/video/quartz/SDL_QuartzVideo.m @ 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. SDL_SetVideoMode() now accepts 0 for width or height and will use the current video mode (or the desktop mode if no mode has been set.)

author	Sam Lantinga <slouken@libsdl.org>
date	Wed, 15 Mar 2006 17:46:41 +0000
parents	dc6b59e925a2
children	ef4a796e7f24

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 /*
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	47 Structure for rez switch gamma fades
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	48 We can hide the monitor flicker by setting the gamma tables to 0
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	49 */
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	50 #define QZ_GAMMA_TABLE_SIZE 256
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	51
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	52 typedef struct {
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 CGGammaValue red[QZ_GAMMA_TABLE_SIZE];
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	55 CGGammaValue green[QZ_GAMMA_TABLE_SIZE];
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	56 CGGammaValue blue[QZ_GAMMA_TABLE_SIZE];
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 } SDL_QuartzGammaTable;
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	59
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	60
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	61 /* Bootstrap functions */
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	62 static int QZ_Available ();
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	63 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	64 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	65
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	66 /* 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	67 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	68
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	69 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	70 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	71 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	72
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	73 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	74 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	75 Uint32 flags);
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	76 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	77 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	78 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	79
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	80 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	81 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	82 static int QZ_ThreadFlip (_THIS);
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	83 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	84 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	85
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	86 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	87 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	88 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	89 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	90 static void QZ_VideoQuit (_THIS);
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	91
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	92 /* 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	93 #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	94 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	95 #endif
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	96 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	97 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	98 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	99 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	100 /* 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	101
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	102 /* 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	103 VideoBootStrap QZ_bootstrap = {
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	104 "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	105 };
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	106
588 2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	107
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	108 /* Bootstrap functions */
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	109 static int QZ_Available () {
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	110 return 1;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	111 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	112
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	113 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	114
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	115 #pragma unused (device_index)
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	116
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	117 SDL_VideoDevice *device;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	118 SDL_PrivateVideoData *hidden;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	119
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	120 device = (SDL_VideoDevice) malloc (sizeof (device) );
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	121 hidden = (SDL_PrivateVideoData) malloc (sizeof (hidden) );
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	122
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	123 if (device == NULL \|\| hidden == NULL)
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	124 SDL_OutOfMemory ();
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	125
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	126 memset (device, 0, sizeof (*device) );
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	127 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	128
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	129 device->hidden = hidden;
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->VideoInit = QZ_VideoInit;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	132 device->ListModes = QZ_ListModes;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	133 device->SetVideoMode = QZ_SetVideoMode;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	134 device->ToggleFullScreen = QZ_ToggleFullScreen;
1212 7663bb0f52c7 To: sdl@libsdl.org Ryan C. Gordon <icculus@icculus.org> parents: 1189 diff changeset	135 device->UpdateMouse = QZ_UpdateMouse;
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	136 device->SetColors = QZ_SetColors;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	137 /* 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	138 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	139
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	140 device->LockHWSurface = QZ_LockHWSurface;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	141 device->UnlockHWSurface = QZ_UnlockHWSurface;
1120 8e1fde455471 Patch by me to fix crash described below. Ryan C. Gordon <icculus@icculus.org> parents: 1119 diff changeset	142 device->AllocHWSurface = QZ_AllocHWSurface;
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	143 device->FreeHWSurface = QZ_FreeHWSurface;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	144 /* device->FlipHWSurface = QZ_FlipHWSurface */;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	145
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	146 device->SetGamma = QZ_SetGamma;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	147 device->GetGamma = QZ_GetGamma;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	148 device->SetGammaRamp = QZ_SetGammaRamp;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	149 device->GetGammaRamp = QZ_GetGammaRamp;
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->GL_GetProcAddress = QZ_GL_GetProcAddress;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	152 device->GL_GetAttribute = QZ_GL_GetAttribute;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	153 device->GL_MakeCurrent = QZ_GL_MakeCurrent;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	154 device->GL_SwapBuffers = QZ_GL_SwapBuffers;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	155 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	156
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	157 device->FreeWMCursor = QZ_FreeWMCursor;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	158 device->CreateWMCursor = QZ_CreateWMCursor;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	159 device->ShowWMCursor = QZ_ShowWMCursor;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	160 device->WarpWMCursor = QZ_WarpWMCursor;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	161 device->MoveWMCursor = QZ_MoveWMCursor;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	162 device->CheckMouseMode = QZ_CheckMouseMode;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	163 device->InitOSKeymap = QZ_InitOSKeymap;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	164 device->PumpEvents = QZ_PumpEvents;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	165
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	166 device->SetCaption = QZ_SetCaption;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	167 device->SetIcon = QZ_SetIcon;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	168 device->IconifyWindow = QZ_IconifyWindow;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	169 /device->GetWMInfo = QZ_GetWMInfo;/
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	170 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	171
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	172 device->CreateYUVOverlay = QZ_CreateYUVOverlay;
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	173
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	174 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	175
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	176 return device;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	177 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	178
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	179 static void QZ_DeleteDevice (SDL_VideoDevice *device) {
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	180
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	181 free (device->hidden);
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	182 free (device);
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	183 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	184
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	185 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	186
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	187 /* 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	188 display_id = kCGDirectMainDisplay;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	189 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	190 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	191 palette = CGPaletteCreateDefaultColorPalette ();
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	192
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	193 /* 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	194 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	195 kCFNumberSInt32Type, &device_bpp);
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	196
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	197 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	198 kCFNumberSInt32Type, &device_width);
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	199
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	200 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	201 kCFNumberSInt32Type, &device_height);
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	202
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	203 /* 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	204 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	205 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	206
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	207 /* 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	208 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	209
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	210 /* 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	211 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	212 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	213 cursor_visible = YES;
823 d67e76f25874 * empty log message * Sam Lantinga <slouken@libsdl.org> parents: 816 diff changeset	214 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	215
876 9e84d106ec19 (Said Max Horn on the SDL mailing list...) Ryan C. Gordon <icculus@icculus.org> parents: 852 diff changeset	216 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	217 system_version = 0;
934 af585d6efec8 Date: Thu, 17 Jun 2004 11:38:51 -0700 (PDT) Sam Lantinga <slouken@libsdl.org> parents: 876 diff changeset	218
555 2536446a92de From: Darrell Walisser Sam Lantinga <slouken@libsdl.org> parents: 501 diff changeset	219 /* register for sleep notifications so wake from sleep generates SDL_VIDEOEXPOSE */
2536446a92de From: Darrell Walisser Sam Lantinga <slouken@libsdl.org> parents: 501 diff changeset	220 QZ_RegisterForSleepNotifications (this);
2536446a92de From: Darrell Walisser Sam Lantinga <slouken@libsdl.org> parents: 501 diff changeset	221
1271 092722dbc766 Whoops! (hope this compiles...) Sam Lantinga <slouken@libsdl.org> parents: 1220 diff changeset	222 /* Fill in some window manager capabilities */
092722dbc766 Whoops! (hope this compiles...) Sam Lantinga <slouken@libsdl.org> parents: 1220 diff changeset	223 this->info.wm_available = 1;
092722dbc766 Whoops! (hope this compiles...) Sam Lantinga <slouken@libsdl.org> parents: 1220 diff changeset	224
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	225 return 0;
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	226 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	227
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	228 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	229
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	230 CFIndex num_modes;
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	231 CFIndex i;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	232
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	233 int list_size = 0;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	234
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	235 /* Any windowed mode is acceptable */
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	236 if ( (flags & SDL_FULLSCREEN) == 0 )
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	237 return (SDL_Rect**)-1;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	238
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	239 /* 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	240 if ( client_mode_list != NULL ) {
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	241
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	242 int i;
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	243
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	244 for (i = 0; client_mode_list[i] != NULL; i++)
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	245 free (client_mode_list[i]);
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	246
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	247 free (client_mode_list);
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	248 client_mode_list = NULL;
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	249 }
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	250
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	251 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	252
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	253 /* 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	254 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	255
155 2d162219f433 Date: Thu, 16 Aug 2001 21:50:51 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 117 diff changeset	256 CFDictionaryRef onemode;
2d162219f433 Date: Thu, 16 Aug 2001 21:50:51 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 117 diff changeset	257 CFNumberRef number;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	258 int bpp;
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	259
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	260 onemode = CFArrayGetValueAtIndex (mode_list, i);
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	261 number = CFDictionaryGetValue (onemode, kCGDisplayBitsPerPixel);
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	262 CFNumberGetValue (number, kCFNumberSInt32Type, &bpp);
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	263
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	264 if (bpp == format->BitsPerPixel) {
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	265
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	266 int intvalue;
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	267 int hasMode;
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	268 int width, height;
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	269
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	270 number = CFDictionaryGetValue (onemode, kCGDisplayWidth);
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	271 CFNumberGetValue (number, kCFNumberSInt32Type, &intvalue);
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	272 width = (Uint16) intvalue;
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	273
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	274 number = CFDictionaryGetValue (onemode, kCGDisplayHeight);
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	275 CFNumberGetValue (number, kCFNumberSInt32Type, &intvalue);
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	276 height = (Uint16) intvalue;
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	277
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	278 /* 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	279 {
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	280 int i;
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	281 hasMode = SDL_FALSE;
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	282 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	283 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	284 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	285 hasMode = SDL_TRUE;
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	286 break;
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	287 }
155 2d162219f433 Date: Thu, 16 Aug 2001 21:50:51 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 117 diff changeset	288 }
2d162219f433 Date: Thu, 16 Aug 2001 21:50:51 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 117 diff changeset	289 }
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	290
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	291 /* 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	292 if ( ! hasMode ) {
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	293
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	294 SDL_Rect *rect;
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 list_size++;
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	297
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	298 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	299 client_mode_list = (SDL_Rect**)
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	300 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	301 else
501 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 = (SDL_Rect**)
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	303 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	304
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	305 rect = (SDL_Rect) malloc (sizeof(*client_mode_list));
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	306
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	307 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	308 SDL_OutOfMemory ();
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	309 return NULL;
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	310 }
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	311
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	312 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	313 rect->w = width;
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	314 rect->h = height;
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	315
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	316 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	317 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	318 }
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	319 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	320 }
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	321
155 2d162219f433 Date: Thu, 16 Aug 2001 21:50:51 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 117 diff changeset	322 /* 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	323 {
2d162219f433 Date: Thu, 16 Aug 2001 21:50:51 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 117 diff changeset	324 int i, j;
2d162219f433 Date: Thu, 16 Aug 2001 21:50:51 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 117 diff changeset	325 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	326 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	327
155 2d162219f433 Date: Thu, 16 Aug 2001 21:50:51 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 117 diff changeset	328 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	329 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	330 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	331
155 2d162219f433 Date: Thu, 16 Aug 2001 21:50:51 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 117 diff changeset	332 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	333 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	334 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	335 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	336 }
2d162219f433 Date: Thu, 16 Aug 2001 21:50:51 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 117 diff changeset	337 }
2d162219f433 Date: Thu, 16 Aug 2001 21:50:51 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 117 diff changeset	338 }
2d162219f433 Date: Thu, 16 Aug 2001 21:50:51 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 117 diff changeset	339 }
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	340 return client_mode_list;
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	341 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	342
657 714053f573e7 Date: Thu, 24 Jul 2003 01:40:17 +0200 Sam Lantinga <slouken@libsdl.org> parents: 656 diff changeset	343 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	344 {
714053f573e7 Date: Thu, 24 Jul 2003 01:40:17 +0200 Sam Lantinga <slouken@libsdl.org> parents: 656 diff changeset	345 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	346 if ( window ) {
714053f573e7 Date: Thu, 24 Jul 2003 01:40:17 +0200 Sam Lantinga <slouken@libsdl.org> parents: 656 diff changeset	347 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	348 return SDL_TRUE;
714053f573e7 Date: Thu, 24 Jul 2003 01:40:17 +0200 Sam Lantinga <slouken@libsdl.org> parents: 656 diff changeset	349 }
714053f573e7 Date: Thu, 24 Jul 2003 01:40:17 +0200 Sam Lantinga <slouken@libsdl.org> parents: 656 diff changeset	350 }
714053f573e7 Date: Thu, 24 Jul 2003 01:40:17 +0200 Sam Lantinga <slouken@libsdl.org> parents: 656 diff changeset	351 return SDL_FALSE;
714053f573e7 Date: Thu, 24 Jul 2003 01:40:17 +0200 Sam Lantinga <slouken@libsdl.org> parents: 656 diff changeset	352 }
714053f573e7 Date: Thu, 24 Jul 2003 01:40:17 +0200 Sam Lantinga <slouken@libsdl.org> parents: 656 diff changeset	353
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	354 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	355
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	356 /* 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	357 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	358 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	359 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	360 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	361 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	362
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	363 /* Release fullscreen resources */
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	364 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	365
435 140798e1e7a6 Darrell's fix for Quartz mouse motion Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	366 NSRect screen_rect;
140798e1e7a6 Darrell's fix for Quartz mouse motion Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	367
588 2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	368 /* 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	369 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	370 quit_thread = YES;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	371 SDL_SemPost (sem1);
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	372 SDL_WaitThread (thread, NULL);
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	373 SDL_DestroySemaphore (sem1);
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	374 SDL_DestroySemaphore (sem2);
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	375 free (sw_buffers[0]);
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	376 }
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	377
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	378 /*
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	379 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	380 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	381 */
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	382 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	383
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	384 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	385 CGLSetFullScreen (NULL);
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	386 }
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	387 if (to_desktop) {
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	388 /* 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	389 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	390 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	391 ShowMenuBar ();
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	392 /*
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	393 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	394 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	395 */
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	396 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	397 [ [ 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	398 }
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	399 }
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	400 /* Release window mode resources */
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	401 else {
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	402
158 4382c38dfbee Date: Tue, 21 Aug 2001 03:50:01 +0200 Sam Lantinga <slouken@libsdl.org> parents: 155 diff changeset	403 [ 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	404 [ qz_window release ];
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	405 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	406 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	407
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	408 /* Release the OpenGL context */
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	409 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	410 QZ_TearDownOpenGL (this);
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	411 }
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	412
155 2d162219f433 Date: Thu, 16 Aug 2001 21:50:51 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 117 diff changeset	413 /* Signal successful teardown */
2d162219f433 Date: Thu, 16 Aug 2001 21:50:51 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 117 diff changeset	414 video_set = SDL_FALSE;
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	415 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	416
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	417 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	418 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	419 boolean_t exact_match = 0;
435 140798e1e7a6 Darrell's fix for Quartz mouse motion Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	420 NSRect screen_rect;
588 2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	421 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	422 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	423
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	424 /* 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	425 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	426 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	427 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	428 }
435 140798e1e7a6 Darrell's fix for Quartz mouse motion Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	429
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	430 /* 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	431 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	432 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	433
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	434 /* 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	435 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	436 height, &exact_match);
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	437
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	438 /* 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	439 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	440 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	441 goto ERR_NO_MATCH;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	442 }
155 2d162219f433 Date: Thu, 16 Aug 2001 21:50:51 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 117 diff changeset	443
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	444 /* 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	445 if (getenv ("SDL_SINGLEDISPLAY"))
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	446 error = CGDisplayCapture (display_id);
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	447 else
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	448 error = CGCaptureAllDisplays ();
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	449
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	450 if ( CGDisplayNoErr != error ) {
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	451 SDL_SetError ("Failed capturing display");
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	452 goto ERR_NO_CAPTURE;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	453 }
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	454
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	455 /* Do the physical switch */
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	456 if ( CGDisplayNoErr != CGDisplaySwitchToMode (display_id, mode) ) {
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	457 SDL_SetError ("Failed switching display resolution");
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	458 goto ERR_NO_SWITCH;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	459 }
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	460
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	461 current->pixels = (Uint32*) CGDisplayBaseAddress (display_id);
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	462 current->pitch = CGDisplayBytesPerRow (display_id);
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	463
58 bd6b0a910a65 * Removed fullscreen menu option from the "Window" menu Sam Lantinga <slouken@lokigames.com> parents: 56 diff changeset	464 current->flags = 0;
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	465 current->w = width;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	466 current->h = height;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	467 current->flags \|= SDL_FULLSCREEN;
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	468 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	469 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	470
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	471 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	472 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	473 this->UnlockHWSurface = QZ_UnlockHWSurface;
588 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 /* Setup double-buffer emulation */
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	476 if ( flags & SDL_DOUBLEBUF ) {
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	477
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	478 /*
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	479 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	480 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	481 surface looks hideous).
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	482
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	483 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	484 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	485 */
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	486 this->LockHWSurface = NULL;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	487 this->UnlockHWSurface = NULL;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	488 this->UpdateRects = NULL;
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 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	491 this->UpdateRects = QZ_DoubleBufferUpdate;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	492 this->LockHWSurface = QZ_LockDoubleBuffer;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	493 this->UnlockHWSurface = QZ_UnlockDoubleBuffer;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	494 this->FlipHWSurface = QZ_FlipDoubleBuffer;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	495
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	496 current->pixels = malloc (current->pitch * current->h * 2);
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	497 if (current->pixels == NULL) {
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	498 SDL_OutOfMemory ();
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	499 goto ERR_DOUBLEBUF;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	500 }
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	501
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	502 sw_buffers[0] = current->pixels;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	503 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	504
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	505 quit_thread = NO;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	506 sem1 = SDL_CreateSemaphore (0);
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	507 sem2 = SDL_CreateSemaphore (1);
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	508 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	509 }
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	510
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	511 if ( CGDisplayCanSetPalette (display_id) )
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	512 current->flags \|= SDL_HWPALETTE;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	513
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	514 /* Setup OpenGL for a fullscreen context */
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	515 if (flags & SDL_OPENGL) {
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	516
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	517 CGLError err;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	518 CGLContextObj ctx;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	519
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	520 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	521 goto ERR_NO_GL;
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	522 }
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	523
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	524 ctx = [ gl_context cglContext ];
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	525 err = CGLSetFullScreen (ctx);
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	526
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	527 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	528 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	529 goto ERR_NO_GL;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	530 }
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	531
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	532 [ gl_context makeCurrentContext];
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	533
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	534 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	535
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	536 [ gl_context flushBuffer ];
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	537
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	538 current->flags \|= SDL_OPENGL;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	539 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	540
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	541 /* 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	542 HideMenuBar ();
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	543
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	544 /* 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	545 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	546 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	547 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	548 }
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	549
435 140798e1e7a6 Darrell's fix for Quartz mouse motion Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	550 /*
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	551 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	552 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	553 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	554 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	555 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	556 */
140798e1e7a6 Darrell's fix for Quartz mouse motion Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	557 screen_rect = NSMakeRect(0,0,width,height);
140798e1e7a6 Darrell's fix for Quartz mouse motion Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	558 [ [ NSScreen mainScreen ] setFrame:screen_rect ];
140798e1e7a6 Darrell's fix for Quartz mouse motion Sam Lantinga <slouken@libsdl.org> parents: 390 diff changeset	559
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	560 /* 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	561 mode_flags = current->flags;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	562
1119 430d8d701f69 SDL_GetAppState() correction when toggling fullscreen on OSX. Ryan C. Gordon <icculus@icculus.org> parents: 967 diff changeset	563 /* we're fullscreen, so flag all input states... */
430d8d701f69 SDL_GetAppState() correction when toggling fullscreen on OSX. Ryan C. Gordon <icculus@icculus.org> parents: 967 diff changeset	564 SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS \| SDL_APPINPUTFOCUS \| SDL_APPACTIVE);
430d8d701f69 SDL_GetAppState() correction when toggling fullscreen on OSX. Ryan C. Gordon <icculus@icculus.org> parents: 967 diff changeset	565
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	566 return current;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	567
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	568 /* 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	569 ERR_NO_GL:
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	570 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	571 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	572 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	573 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	574 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	575 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	576 }
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	577 return NULL;
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	578 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	579
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	580 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	581 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	582 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	583 NSRect contentRect;
683 5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	584 BOOL isCustom = NO;
657 714053f573e7 Date: Thu, 24 Jul 2003 01:40:17 +0200 Sam Lantinga <slouken@libsdl.org> parents: 656 diff changeset	585 int center_window = 1;
714053f573e7 Date: Thu, 24 Jul 2003 01:40:17 +0200 Sam Lantinga <slouken@libsdl.org> parents: 656 diff changeset	586 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	587 CGDisplayFadeReservationToken fade_token = kCGDisplayFadeReservationInvalidToken;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	588
58 bd6b0a910a65 * Removed fullscreen menu option from the "Window" menu Sam Lantinga <slouken@lokigames.com> parents: 56 diff changeset	589 current->flags = 0;
bd6b0a910a65 * Removed fullscreen menu option from the "Window" menu Sam Lantinga <slouken@lokigames.com> parents: 56 diff changeset	590 current->w = width;
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	591 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	592
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	593 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	594
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	595 /*
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	596 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	597 - 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	598 - 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	599 - 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	600 - 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	601 */
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	602 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	603 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	604 /* 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	605 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	606 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	607 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	608 }
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	609 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	610 }
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	611 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	612 (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	613 (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	614 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	615 }
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	616 }
683 5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	617
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	618 /* 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	619 {
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	620 char *windowPtrString = getenv ("SDL_NSWindowPointer");
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	621 char *viewPtrString = getenv ("SDL_NSQuickDrawViewPointer");
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	622
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	623 if (windowPtrString && viewPtrString) {
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	624
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	625 /* Release any previous window */
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	626 if ( qz_window ) {
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	627 [ qz_window release ];
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	628 qz_window = nil;
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	629 }
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 qz_window = (NSWindow*)atoi(windowPtrString);
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	632 window_view = (NSQuickDrawView*)atoi(viewPtrString);
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	633 isCustom = YES;
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 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	637 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	638 */
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	639 [ qz_window retain ];
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	640
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	641 style = [ qz_window styleMask ];
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	642 /* Check resizability */
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	643 if ( style & NSResizableWindowMask )
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	644 current->flags \|= SDL_RESIZABLE;
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	645
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	646 /* Check frame */
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	647 if ( style & NSBorderlessWindowMask )
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	648 current->flags \|= SDL_NOFRAME;
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	649 }
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	650 }
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	651
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	652 /* 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	653 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	654
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	655 /* 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	656 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	657 style = NSBorderlessWindowMask;
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	658 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	659 } else {
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	660 style = NSTitledWindowMask;
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	661 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	662 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	663 style \|= NSResizableWindowMask;
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	664 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	665 }
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	666 }
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	667
657 714053f573e7 Date: Thu, 24 Jul 2003 01:40:17 +0200 Sam Lantinga <slouken@libsdl.org> parents: 656 diff changeset	668 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	669 center_window = 0;
714053f573e7 Date: Thu, 24 Jul 2003 01:40:17 +0200 Sam Lantinga <slouken@libsdl.org> parents: 656 diff changeset	670 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	671 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	672 }
714053f573e7 Date: Thu, 24 Jul 2003 01:40:17 +0200 Sam Lantinga <slouken@libsdl.org> parents: 656 diff changeset	673
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	674 /* 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	675 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	676 initWithContentRect:contentRect
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	677 styleMask:style
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	678 backing:NSBackingStoreBuffered
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	679 defer:NO ];
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	680
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	681 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	682 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	683 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	684 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	685 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	686 }
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	687 return NULL;
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	688 }
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	689
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1403 diff changeset	690 /[ 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	691 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	692 [ 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	693 [ qz_window setViewsNeedDisplay:NO ];
657 714053f573e7 Date: Thu, 24 Jul 2003 01:40:17 +0200 Sam Lantinga <slouken@libsdl.org> parents: 656 diff changeset	694 if ( center_window ) {
714053f573e7 Date: Thu, 24 Jul 2003 01:40:17 +0200 Sam Lantinga <slouken@libsdl.org> parents: 656 diff changeset	695 [ qz_window center ];
714053f573e7 Date: Thu, 24 Jul 2003 01:40:17 +0200 Sam Lantinga <slouken@libsdl.org> parents: 656 diff changeset	696 }
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	697 [ 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	698 [ [ [ 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	699 }
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	700 /* 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	701 else {
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	702
683 5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	703 if (!isCustom) {
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	704 [ qz_window setContentSize:contentRect.size ];
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	705 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	706 [ 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	707 }
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	708 }
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	709
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	710 /* 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	711 if ( flags & SDL_OPENGL ) {
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	712
1183 634d85aefc8c Fixed bug reported here: Ryan C. Gordon <icculus@icculus.org> parents: 1181 diff changeset	713 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	714 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	715 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	716 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	717 }
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	718 return NULL;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	719 }
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	720
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	721 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	722 [ 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	723 [ [ 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	724 [ 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	725 [ window_view release ];
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	726 [ gl_context makeCurrentContext];
158 4382c38dfbee Date: Tue, 21 Aug 2001 03:50:01 +0200 Sam Lantinga <slouken@libsdl.org> parents: 155 diff changeset	727 [ qz_window makeKeyAndOrderFront:nil ];
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	728 current->flags \|= SDL_OPENGL;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	729 }
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	730 /* 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	731 else {
1183 634d85aefc8c Fixed bug reported here: Ryan C. Gordon <icculus@icculus.org> parents: 1181 diff changeset	732 short qdbpp = 0;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	733
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	734 /* 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	735 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	736
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	737 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	738 [ 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	739 [ [ 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	740 [ 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	741 [ 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	742 }
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	743
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	744 LockPortBits ( [ window_view qdPort ] );
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	745 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	746 current->pitch = GetPixRowBytes ( GetPortPixMap ( [ window_view qdPort ] ) );
1183 634d85aefc8c Fixed bug reported here: Ryan C. Gordon <icculus@icculus.org> parents: 1181 diff changeset	747 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	748 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	749
1183 634d85aefc8c Fixed bug reported here: Ryan C. Gordon <icculus@icculus.org> parents: 1181 diff changeset	750 /* 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	751 *bpp = qdbpp;
634d85aefc8c Fixed bug reported here: Ryan C. Gordon <icculus@icculus.org> parents: 1181 diff changeset	752
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	753 current->flags \|= SDL_SWSURFACE;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	754 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	755 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	756
683 5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	757 /*
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	758 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	759 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	760 */
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	761 {
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	762 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	763 [ 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	764
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 674 diff changeset	765 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	766
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1403 diff changeset	767 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	768 }
498 4b8ff8ac2c07 Fixed window update problems on MacOS X 10.2 (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 450 diff changeset	769 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	770 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	771 this->UnlockHWSurface = QZ_UnlockWindow;
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	772 }
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	773
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	774 /* 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	775 mode_flags = current->flags;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	776
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	777 /* 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	778 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	779 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	780 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	781 }
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	782
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	783 return current;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	784 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	785
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	786 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	787 int height, int bpp, Uint32 flags) {
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	788
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	789 current->flags = 0;
852 2651b6b43840 Quartz fix: Ryan C. Gordon <icculus@icculus.org> parents: 832 diff changeset	790 current->pixels = NULL;
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 full screen video */
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	793 if ( flags & SDL_FULLSCREEN ) {
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	794 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	795 if (current == NULL)
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	796 return NULL;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	797 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	798 /* Setup windowed video */
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	799 else {
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	800 /* 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	801 bpp = device_bpp;
1183 634d85aefc8c Fixed bug reported here: Ryan C. Gordon <icculus@icculus.org> parents: 1181 diff changeset	802 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	803 if (current == NULL)
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	804 return NULL;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	805 }
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	806
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	807 /* Setup the new pixel format */
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	808 {
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	809 int amask = 0,
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	810 rmask = 0,
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	811 gmask = 0,
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	812 bmask = 0;
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	813
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	814 switch (bpp) {
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	815 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	816 amask = 0;
58 bd6b0a910a65 * Removed fullscreen menu option from the "Window" menu Sam Lantinga <slouken@lokigames.com> parents: 56 diff changeset	817 rmask = 0x7C00;
bd6b0a910a65 * Removed fullscreen menu option from the "Window" menu Sam Lantinga <slouken@lokigames.com> parents: 56 diff changeset	818 gmask = 0x03E0;
bd6b0a910a65 * Removed fullscreen menu option from the "Window" menu Sam Lantinga <slouken@lokigames.com> parents: 56 diff changeset	819 bmask = 0x001F;
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	820 break;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	821 case 24:
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	822 SDL_SetError ("24bpp is not available");
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	823 return NULL;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	824 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	825 amask = 0x00000000;
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	826 rmask = 0x00FF0000;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	827 gmask = 0x0000FF00;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	828 bmask = 0x000000FF;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	829 break;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	830 }
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	831
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	832 if ( ! SDL_ReallocFormat (current, bpp,
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	833 rmask, gmask, bmask, amask ) ) {
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	834 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	835 return NULL;
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	836 }
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	837 }
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	838
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	839 /* 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	840 video_set = SDL_TRUE;
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 return current;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	843 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	844
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	845 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	846 return 0;
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	847 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	848
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	849 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	850 SDL_Color *colors) {
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	851
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	852 CGTableCount index;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	853 CGDeviceColor color;
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 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	856
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	857 /* 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	858 color.red = colors->r / 255.0;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	859 color.blue = colors->b / 255.0;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	860 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	861
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	862 colors++;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	863
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	864 CGPaletteSetColorAtIndex (palette, color, index);
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	865 }
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	866
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	867 if ( CGDisplayNoErr != CGDisplaySetPalette (display_id, palette) )
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	868 return 0;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	869
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	870 return 1;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	871 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	872
588 2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	873 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	874
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	875 return 1;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	876 }
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 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	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
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	882 /* 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	883 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	884
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	885 union
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	886 {
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	887 UInt64 i;
588 2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	888 Nanoseconds ns;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	889 } temp;
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 temp.i = seconds * 1000000000.0;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	892
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	893 return NanosecondsToAbsolute ( temp.ns );
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
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	896 static int QZ_ThreadFlip (_THIS) {
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	897
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	898 Uint8 src, dst;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	899 int skip, len, h;
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 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	903 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	904 */
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	905 {
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	906 pthread_t current_thread;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	907 int policy;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	908 struct sched_param param;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	909
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	910 current_thread = pthread_self ();
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	911 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	912 policy = SCHED_RR;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	913 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	914 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	915 }
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	916
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	917 while (1) {
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	918
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	919 SDL_SemWait (sem1);
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	920 if (quit_thread)
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	921 return 0;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	922
1219 9a7a016d5a71 Quartz driver: Correctly handle SDL_DOUBLEBUF\|SDL_FULLSCREEN when the Ryan C. Gordon <icculus@icculus.org> parents: 1218 diff changeset	923 /*
9a7a016d5a71 Quartz driver: Correctly handle SDL_DOUBLEBUF\|SDL_FULLSCREEN when the Ryan C. Gordon <icculus@icculus.org> parents: 1218 diff changeset	924 * 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	925 * 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	926 * 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	927 * 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	928 */
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1403 diff changeset	929 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	930 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	931 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	932 h = SDL_VideoSurface->h;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	933 skip = SDL_VideoSurface->pitch;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	934
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	935 /* 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	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 /* 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	939 double refreshRate;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	940 double linesPerSecond;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	941 double target;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	942 double position;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	943 double adjustment;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	944 AbsoluteTime nextTime;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	945 CFNumberRef refreshRateCFNumber;
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 refreshRateCFNumber = CFDictionaryGetValue (mode, kCGDisplayRefreshRate);
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	948 if ( NULL == refreshRateCFNumber ) {
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	949 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	950 goto ERROR;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	951 }
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	952
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	953 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	954 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	955 goto ERROR;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	956 }
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	957
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	958 if ( 0 == refreshRate ) {
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	959
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	960 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	961
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	962 /* 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	963 refreshRate = 60.0;
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 linesPerSecond = refreshRate * h;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	967 target = h;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	968
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	969 /* 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	970 position = CGDisplayBeamPosition (display_id);
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	971 if (position > target)
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	972 position = 0;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	973
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	974 adjustment = (target - position) / linesPerSecond;
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 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	977
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	978 MPDelayUntil (&nextTime);
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
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	982 /* On error, skip VBL delay */
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	983 ERROR:
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	984
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	985 while ( h-- ) {
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	986
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	987 memcpy (dst, src, len);
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	988 src += skip;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	989 dst += skip;
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
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	992 /* signal flip completion */
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	993 SDL_SemPost (sem2);
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	994 }
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 return 0;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	997 }
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 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	1000
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	1001 /* 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	1002 SDL_SemWait (sem2);
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	1003
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	1004 current_buffer = surface->pixels;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	1005
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	1006 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	1007 surface->pixels = sw_buffers[1];
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	1008 else
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	1009 surface->pixels = sw_buffers[0];
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	1010
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	1011 /* 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	1012 SDL_SemPost (sem1);
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	1013
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	1014 return 0;
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	1015 }
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	1016
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	1017
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	1018 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	1019
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	1020 /* 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	1021 this->FlipHWSurface (this, SDL_VideoSurface);
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	1022 }
2c6510c0a304 Darrell added support for emulated SDL_DOUBLEBUF on MacOSX Sam Lantinga <slouken@libsdl.org> parents: 576 diff changeset	1023
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1024 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	1025 #pragma unused(this,num_rects,rects)
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1026 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1027
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	1028 /*
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	1029 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	1030 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	1031 */
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1032
1487 dc6b59e925a2 Cleaning up warnings on MacOS X Sam Lantinga <slouken@libsdl.org> parents: 1403 diff changeset	1033 /#define TEST_OBSCURED 1/
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1034
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1035 #if TEST_OBSCURED
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1036 #include "CGS.h"
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1037 #endif
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1038
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1039 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	1040
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1041
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1042 #if TEST_OBSCURED
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1043
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	1044 /*
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	1045 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	1046 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	1047 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	1048 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	1049 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	1050 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	1051 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	1052
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1053 Notes:
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1054 -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	1055 -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	1056 -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	1057 -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	1058 -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	1059
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1060 Bugs:
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1061 -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	1062 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	1063 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	1064
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1065 -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	1066 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	1067 */
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1068
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1069 /* 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	1070 static CGSConnectionID cgsConnection = (CGSConnectionID) -1;
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 /* 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	1073 static CGSWindowID dockIcons[kMaxWindows];
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1074 static int numCachedDockIcons = 0;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1075
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1076 CGSWindowID windows[kMaxWindows];
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1077 CGSWindowCount i, count;
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1078 CGSWindowLevel winLevel;
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1079 CGSRect winRect;
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1080
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1081 CGSRect contentRect;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1082 int windowNumber;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1083 int firstDockIcon;
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1084 int dockIconCacheMiss;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1085 int windowContentOffset;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1086
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1087 int obscured = SDL_TRUE;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1088
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1089 if ( [ window isVisible ] ) {
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1090
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	1091 /*
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	1092 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	1093 (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	1094 */
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1095
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	1096 /*
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	1097 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	1098 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	1099 */
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1100 if (cgsConnection == (CGSConnectionID) -1) {
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1101 cgsConnection = (CGSConnectionID) 0;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1102 cgsConnection = _CGSDefaultConnection ();
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1103 }
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1104
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1105 if (cgsConnection) {
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1106
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1107 if ( ! [ window styleMask ] & NSBorderlessWindowMask )
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1108 windowContentOffset = 22;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1109 else
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1110 windowContentOffset = 0;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1111
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1112 windowNumber = [ window windowNumber ];
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1113
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1114 /* 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	1115 count = 0;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1116 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	1117 CGSGetScreenRectForWindow (cgsConnection, windowNumber, &contentRect);
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1118
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1119 /* 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	1120 contentRect.origin.y += windowContentOffset;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1121 contentRect.size.height -= windowContentOffset;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1122
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1123 firstDockIcon = -1;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1124 dockIconCacheMiss = SDL_FALSE;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1125
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	1126 /*
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	1127 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	1128 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	1129 */
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1130 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	1131
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1132 /* 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	1133 if (windows[i] == windowNumber) {
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 obscured = SDL_FALSE;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1136 break;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1137 }
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1138 else {
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1139
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1140 float shadowSide;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1141 float shadowTop;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1142 float shadowBottom;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1143
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1144 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	1145
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1146 if (winLevel == kCGSWindowLevelDockIcon) {
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1147
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1148 int j;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1149
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1150 if (firstDockIcon < 0) {
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1151
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1152 firstDockIcon = i;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1153
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1154 if (numCachedDockIcons > 0) {
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1155
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1156 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	1157
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1158 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	1159 i++;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1160 else
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1161 break;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1162 }
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1163
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1164 if (j != 0) {
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1165
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1166 i--;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1167
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1168 if (j < numCachedDockIcons) {
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1169
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1170 dockIconCacheMiss = SDL_TRUE;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1171 }
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1172 }
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1173
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1174 }
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1175 }
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1176
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1177 continue;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1178 }
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1179 else if (winLevel == kCGSWindowLevelMenuIgnore
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1180 /* winLevel == kCGSWindowLevelTop */) {
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1181
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1182 continue; /* cannot obscure window */
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1183 }
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1184 else if (winLevel == kCGSWindowLevelDockMenu \|\|
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1185 winLevel == kCGSWindowLevelMenu) {
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1186
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1187 shadowSide = 18;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1188 shadowTop = 4;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1189 shadowBottom = 22;
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1190 }
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1191 else if (winLevel == kCGSWindowLevelUtility) {
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1192
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1193 shadowSide = 8;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1194 shadowTop = 4;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1195 shadowBottom = 12;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1196 }
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1197 else if (winLevel == kCGSWindowLevelNormal) {
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1198
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	1199 /*
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	1200 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	1201 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	1202 */
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1203 shadowSide = 20;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1204 shadowTop = 10;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1205 shadowBottom = 24;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1206 }
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1207 else if (winLevel == kCGSWindowLevelDock) {
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1208
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1209 /* Create dock icon cache */
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1210 if (numCachedDockIcons != (i-firstDockIcon) \|\|
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1211 dockIconCacheMiss) {
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1212
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1213 numCachedDockIcons = i - firstDockIcon;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1214 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	1215 numCachedDockIcons * sizeof(*windows));
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1216 }
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1217
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1218 /* no shadow */
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1219 shadowSide = 0;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1220 shadowTop = 0;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1221 shadowBottom = 0;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1222 }
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1223 else {
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1224
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	1225 /*
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	1226 kCGSWindowLevelDockLabel,
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	1227 kCGSWindowLevelDock,
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	1228 kOther???
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	1229 */
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 /* no shadow */
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1232 shadowSide = 0;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1233 shadowTop = 0;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1234 shadowBottom = 0;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1235 }
390 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 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	1238
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1239 winRect.origin.x -= shadowSide;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1240 winRect.origin.y -= shadowTop;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1241 winRect.size.width += shadowSide;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1242 winRect.size.height += shadowBottom;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1243
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1244 if (NSIntersectsRect (contentRect, winRect)) {
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1245
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1246 obscured = SDL_TRUE;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1247 break;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1248 }
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1249
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1250 } /* window was not our window */
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1251
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1252 } /* iterate over windows */
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1253
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1254 } /* get cgsConnection */
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1255
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1256 } /* window is visible */
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1257
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1258 return obscured;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1259 #else
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1260 return SDL_TRUE;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1261 #endif
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1262 }
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1263
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	1264
498 4b8ff8ac2c07 Fixed window update problems on MacOS X 10.2 (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 450 diff changeset	1265 /* 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	1266 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	1267
4b8ff8ac2c07 Fixed window update problems on MacOS X 10.2 (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 450 diff changeset	1268 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	1269 }
4b8ff8ac2c07 Fixed window update problems on MacOS X 10.2 (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 450 diff changeset	1270
4b8ff8ac2c07 Fixed window update problems on MacOS X 10.2 (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 450 diff changeset	1271 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	1272
4b8ff8ac2c07 Fixed window update problems on MacOS X 10.2 (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 450 diff changeset	1273 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	1274 }
4b8ff8ac2c07 Fixed window update problems on MacOS X 10.2 (thanks Darrell!) Sam Lantinga <slouken@libsdl.org> parents: 450 diff changeset	1275
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1276 /* Resize icon, BMP format */
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1277 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	1278 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	1279 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	1280 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	1281 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	1282 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	1283 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	1284 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	1285 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	1286 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	1287 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	1288 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	1289 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	1290 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	1291 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	1292 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	1293 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	1294 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	1295 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	1296 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	1297 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	1298 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	1299 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	1300 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	1301 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	1302 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	1303 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	1304 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	1305 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	1306 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	1307 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	1308 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	1309 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	1310 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	1311 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	1312 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	1313 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	1314 };
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1315
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1316 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	1317
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1318 /* 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	1319 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	1320
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1321 Rect icon;
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1322 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	1323 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	1324
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1325 if (RectInRgn (&icon, dirtyRegion)) {
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1326
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1327 SDL_Rect icon_rect;
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 /* Create the icon image */
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1330 if (resize_icon == NULL) {
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1331
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1332 SDL_RWops *rw;
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1333 SDL_Surface *tmp;
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1334
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	1335 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	1336 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	1337
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1338 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	1339 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	1340
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1341 SDL_FreeSurface (tmp);
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1342 }
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1343
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1344 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	1345 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	1346 icon_rect.w = 13;
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1347 icon_rect.h = 13;
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1348
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1349 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	1350 }
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1351 }
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1352 }
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1353
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1354 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	1355
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1356 if (SDL_VideoSurface->flags & SDL_OPENGLBLIT) {
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1357 QZ_GL_SwapBuffers (this);
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1358 }
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	1359 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	1360
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	1361 /* 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	1362 }
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 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 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	1365
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1366 /* 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	1367 CGrafPtr savePort;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1368 CGrafPtr dstPort, srcPort;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1369 const BitMap dstBits, srcBits;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1370 Rect dstRect, srcRect;
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1371 Point offset;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1372 int i;
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 GetPort (&savePort);
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1375
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1376 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	1377 srcPort = [ window_view qdPort ];
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 offset.h = 0;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1380 offset.v = 0;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1381 SetPort (srcPort);
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1382 LocalToGlobal (&offset);
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1383
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1384 SetPort (dstPort);
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1385
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1386 LockPortBits (dstPort);
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1387 LockPortBits (srcPort);
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 dstBits = GetPortBitMapForCopyBits (dstPort);
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1390 srcBits = GetPortBitMapForCopyBits (srcPort);
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 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	1393
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1394 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	1395 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	1396 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	1397
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1398 SetRect (&dstRect,
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1399 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	1400 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	1401 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	1402 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	1403
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1404 CopyBits (srcBits, dstBits,
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1405 &srcRect, &dstRect, srcCopy, NULL);
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1406
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1407 }
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1408
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1409 SetPort (savePort);
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1410 }
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1411 else {
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1412 /* 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	1413 int i;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1414 RgnHandle dirty = NewRgn ();
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1415 RgnHandle temp = NewRgn ();
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1416
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1417 SetEmptyRgn (dirty);
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1418
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1419 /* Build the region of dirty rectangles */
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1420 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	1421
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1422 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	1423 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	1424 MacUnionRgn (dirty, temp, dirty);
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1425 }
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1426
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 500 diff changeset	1427 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	1428
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1429 /* 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	1430 QDFlushPortBuffer ( [ window_view qdPort ], dirty );
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1431 DisposeRgn (dirty);
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1432 DisposeRgn (temp);
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1433 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1434 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1435
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1436 static void QZ_VideoQuit (_THIS) {
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1437
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	1438 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	1439
560 37c31c12eb70 Moved some cleanup stuff to QZ_VideoQuit() from QZ_UnsetVideoMode()...fixes Ryan C. Gordon <icculus@icculus.org> parents: 555 diff changeset	1440 /* 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	1441 CGDisplayRestoreColorSyncSettings ();
37c31c12eb70 Moved some cleanup stuff to QZ_VideoQuit() from QZ_UnsetVideoMode()...fixes Ryan C. Gordon <icculus@icculus.org> parents: 555 diff changeset	1442
37c31c12eb70 Moved some cleanup stuff to QZ_VideoQuit() from QZ_UnsetVideoMode()...fixes Ryan C. Gordon <icculus@icculus.org> parents: 555 diff changeset	1443 /* 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	1444 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	1445 CGAssociateMouseAndMouseCursorPosition (1);
37c31c12eb70 Moved some cleanup stuff to QZ_VideoQuit() from QZ_UnsetVideoMode()...fixes Ryan C. Gordon <icculus@icculus.org> parents: 555 diff changeset	1446
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	1447 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	1448 /* 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	1449 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	1450 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	1451 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	1452 }
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	1453 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	1454 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	1455 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	1456 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	1457 }
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	1458 }
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	1459 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	1460 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	1461
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1462 CGPaletteRelease (palette);
1181 49d3efec6651 Quartz driver OpenGL updates: Ryan C. Gordon <icculus@icculus.org> parents: 1160 diff changeset	1463
1189 c96b326b90ba Moved Quartz SDL_GL_LoadLibrary() to SDL_loadso interface. Ryan C. Gordon <icculus@icculus.org> parents: 1183 diff changeset	1464 if (opengl_library) {
c96b326b90ba Moved Quartz SDL_GL_LoadLibrary() to SDL_loadso interface. Ryan C. Gordon <icculus@icculus.org> parents: 1183 diff changeset	1465 SDL_UnloadObject(opengl_library);
c96b326b90ba Moved Quartz SDL_GL_LoadLibrary() to SDL_loadso interface. Ryan C. Gordon <icculus@icculus.org> parents: 1183 diff changeset	1466 opengl_library = NULL;
1181 49d3efec6651 Quartz driver OpenGL updates: Ryan C. Gordon <icculus@icculus.org> parents: 1160 diff changeset	1467 }
49d3efec6651 Quartz driver OpenGL updates: Ryan C. Gordon <icculus@icculus.org> parents: 1160 diff changeset	1468 this->gl_config.driver_loaded = 0;
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1469 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1470
674 be597a247e20 Fix compilation on MacOS 10.1 Sam Lantinga <slouken@libsdl.org> parents: 668 diff changeset	1471 #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	1472 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	1473
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1474 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	1475
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1476 return 0;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1477 }
674 be597a247e20 Fix compilation on MacOS 10.1 Sam Lantinga <slouken@libsdl.org> parents: 668 diff changeset	1478 #endif
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1479
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1480 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	1481
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1482 return 1;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1483 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1484
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1485 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	1486
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1487 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1488
1120 8e1fde455471 Patch by me to fix crash described below. Ryan C. Gordon <icculus@icculus.org> parents: 1119 diff changeset	1489 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	1490 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	1491 }
8e1fde455471 Patch by me to fix crash described below. Ryan C. Gordon <icculus@icculus.org> parents: 1119 diff changeset	1492
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1493 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	1494 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1495
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1496 /*
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1497 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	1498 return 0;
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1499 }
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1500 */
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1501
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1502 /* Gamma functions */
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1503 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	1504
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1505 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	1506
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1507 if (red == 0.0)
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1508 red = FLT_MAX;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1509 else
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1510 red = 1.0 / red;
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 if (green == 0.0)
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1513 green = FLT_MAX;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1514 else
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1515 green = 1.0 / green;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1516
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1517 if (blue == 0.0)
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1518 blue = FLT_MAX;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1519 else
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1520 blue = 1.0 / blue;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1521
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1522 if ( CGDisplayNoErr == CGSetDisplayTransferByFormula
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1523 (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	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 }
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1527 else {
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1528
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1529 return -1;
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1530 }
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1531 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1532
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1533 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	1534
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1535 CGGammaValue dummy;
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1536 if ( CGDisplayNoErr == CGGetDisplayTransferByFormula
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1537 (display_id, &dummy, &dummy, red,
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1538 &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	1539
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1540 return 0;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1541 else
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1542 return -1;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1543 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1544
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1545 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	1546
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1547 const CGTableCount tableSize = 255;
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1548 CGGammaValue redTable[tableSize];
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1549 CGGammaValue greenTable[tableSize];
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1550 CGGammaValue blueTable[tableSize];
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1551
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1552 int i;
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1553
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1554 /* 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	1555 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	1556 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	1557
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1558 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	1559 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	1560
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1561 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	1562 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	1563
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1564 if ( CGDisplayNoErr == CGSetDisplayTransferByTable
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1565 (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	1566 return 0;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 252 diff changeset	1567 else
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1568 return -1;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1569 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1570
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1571 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	1572
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1573 const CGTableCount tableSize = 255;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1574 CGGammaValue redTable[tableSize];
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1575 CGGammaValue greenTable[tableSize];
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1576 CGGammaValue blueTable[tableSize];
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1577 CGTableCount actual;
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1578 int i;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1579
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1580 if ( CGDisplayNoErr != CGGetDisplayTransferByTable
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1581 (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	1582 actual != tableSize)
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1583
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1584 return -1;
390 19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1585
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1586 /* 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	1587 for (i = 0; i < 256; i++)
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1588 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	1589
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1590 for (i=256; i < 512; i++)
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1591 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	1592
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1593 for (i=512; i < 768; i++)
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1594 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	1595
19e73568a75c Date: Sat, 1 Jun 2002 17:56:45 -0500 Sam Lantinga <slouken@libsdl.org> parents: 359 diff changeset	1596 return 0;
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1597 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	1598

Mercurial > sdl-ios-xcode

annotate src/video/quartz/SDL_QuartzVideo.m @ 1545:8d9bb0cf2c2a