sdl-ios-xcode: src/video/quartz/SDL_QuartzWindow.m annotate

annotate src/video/quartz/SDL_QuartzWindow.m @ 1321:e05bc5d315e3

Date: Wed, 1 Feb 2006 18:20:33 -0800 From: Eric Wing Subject: SDL/Universal Binary updates Hi Sam, Attached is a big set of changes to the Xcode projects to support Universal Binaries. I have also included .dmgs that include the prebuilt frameworks. Ryan, I also updated SMPEG which is also in the package. The SDL and smpeg binaries were built against the CVS version (pulled maybe a month ago?). I do not have an Intel Mac to test on so I have no idea if this stuff actually works. However, Christian Walther has been a big help in testing 10.2.8 and 10.3.9 so I'm fairly confident we got the build settings correct for at least PPC. I have attempted to document the important things for producing these Universal Binaries. Documentation is somewhat scattered through out everything, but there is a big centralized piece of documentation in the UniversalBinaryNotes.rtf in the SDL.dmg. As far as Universal Binaries are concerned, the big things were: - Build with gcc 3.3 on PPC, 4.0 on Intel. - We couldn't get any of the MMX/SSE code to compile/link (SDL and smpeg). - All 3rd party dependencies had to be rebuilt as Universal There were also a bunch of non-Universal things that have been updated: - I converted the SDL-satellites to create .dmg's instead of .pkg installers - Updated all 3rd party static libraries with current versions. (I think libpng was the most dramatic going from 1.0.? to 1.2.8 with API breakage. I haven't found any problems so far in doing this.) - Changed some compiler optimization settings - Finally updated the exports list for SDL_mixer - Tried to include a static smpeg in SDL_mixer (multiple build variants in Xcode project now) - Enabled Altivec in SDL (we forgot to add the flags to Xcode last time) - More documentation Since so many things have changed, there might be new problems introduced. The big issue I've found so far is with SDL_mixer. As I mentioned on the mailing list, MP3's produce an assertion failure. And the MikMod problem reported on Bugzilla continues to persist. There's probably a bunch of other stuff I'm forgetting. There really were hundreds of little things I mucked with so it's hard to remember them all. If you have any questions, feel free to ask. Thanks, Eric

author	Sam Lantinga <slouken@libsdl.org>
date	Thu, 02 Feb 2006 06:26:39 +0000
parents	68c8da837fc0
children	376665398b25

rev	line source
761 c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	1 /*
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	2 SDL - Simple DirectMedia Layer
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
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	4
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	5 This library is free software; you can redistribute it and/or
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	6 modify it under the terms of the GNU Library General Public
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	7 License as published by the Free Software Foundation; either
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	8 version 2 of the License, or (at your option) any later version.
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	9
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	10 This library is distributed in the hope that it will be useful,
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	11 but WITHOUT ANY WARRANTY; without even the implied warranty of
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	13 Library General Public License for more details.
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	14
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	15 You should have received a copy of the GNU Library General Public
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	16 License along with this library; if not, write to the Free
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	17 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	18
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	19 Sam Lantinga
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	20 slouken@libsdl.org
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	21 */
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	22
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	23 #include "SDL_QuartzVideo.h"
c5b2b6d2d1fe Date: Wed, 31 Dec 2003 21:55:30 +0100 Sam Lantinga <slouken@libsdl.org> parents: 683 diff changeset	24 #include "SDL_QuartzWindow.h"
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	25
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 272 diff changeset	26 /*
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 272 diff changeset	27 This function makes the SDL region of the window 100% opaque.
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 272 diff changeset	28 The genie effect uses the alpha component. Otherwise,
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 272 diff changeset	29 it doesn't seem to matter what value it has.
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 272 diff changeset	30 */
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 272 diff changeset	31 static void QZ_SetPortAlphaOpaque () {
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 58 diff changeset	32
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 272 diff changeset	33 SDL_Surface *surface = current_video->screen;
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 272 diff changeset	34 int bpp;
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 58 diff changeset	35
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 272 diff changeset	36 bpp = surface->format->BitsPerPixel;
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 58 diff changeset	37
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 58 diff changeset	38 if (bpp == 32) {
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 58 diff changeset	39
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 272 diff changeset	40 Uint32 pixels = (Uint32) surface->pixels;
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 272 diff changeset	41 Uint32 rowPixels = surface->pitch / 4;
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 272 diff changeset	42 Uint32 i, j;
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 58 diff changeset	43
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 272 diff changeset	44 for (i = 0; i < surface->h; i++)
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 272 diff changeset	45 for (j = 0; j < surface->w; j++) {
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 58 diff changeset	46
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 58 diff changeset	47 pixels[ (i * rowPixels) + j ] \|= 0xFF000000;
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 58 diff changeset	48 }
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 58 diff changeset	49 }
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 58 diff changeset	50 }
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 58 diff changeset	51
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	52 @implementation SDL_QuartzWindow
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	53
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 272 diff changeset	54 /* we override these methods to fix the miniaturize animation/dock icon bug */
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	55 - (void)miniaturize:(id)sender
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	56 {
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 58 diff changeset	57 if (SDL_VideoSurface->flags & SDL_OPENGL) {
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 58 diff changeset	58
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 272 diff changeset	59 /*
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 272 diff changeset	60 Future: Grab framebuffer and put into NSImage
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 272 diff changeset	61 [ qz_window setMiniwindowImage:image ];
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 272 diff changeset	62 */
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 58 diff changeset	63 }
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 58 diff changeset	64 else {
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 58 diff changeset	65
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 272 diff changeset	66 /* make the alpha channel opaque so anim won't have holes in it */
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 272 diff changeset	67 QZ_SetPortAlphaOpaque ();
272 d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 58 diff changeset	68 }
d1447a846d80 Date: Sat, 19 Jan 2002 17:24:32 -0500 (EST) Sam Lantinga <slouken@libsdl.org> parents: 58 diff changeset	69
631 52864d66d168 Date: Mon, 5 May 2003 00:08:51 -0400 Sam Lantinga <slouken@libsdl.org> parents: 501 diff changeset	70 /* window is hidden now */
52864d66d168 Date: Mon, 5 May 2003 00:08:51 -0400 Sam Lantinga <slouken@libsdl.org> parents: 501 diff changeset	71 SDL_PrivateAppActive (0, SDL_APPACTIVE);
52864d66d168 Date: Mon, 5 May 2003 00:08:51 -0400 Sam Lantinga <slouken@libsdl.org> parents: 501 diff changeset	72
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	73 [ super miniaturize:sender ];
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	74 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	75
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 272 diff changeset	76 - (void)display
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 272 diff changeset	77 {
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 272 diff changeset	78 /*
683 5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	79 This method fires just before the window deminaturizes from the Dock.
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	80
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	81 We'll save the current visible surface, let the window manager redraw any
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	82 UI elements, and restore the SDL surface. This way, no expose event
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	83 is required, and the deminiaturize works perfectly.
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 272 diff changeset	84 */
683 5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	85 SDL_VideoDevice this = (SDL_VideoDevice)current_video;
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	86
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	87 /* make sure pixels are fully opaque */
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	88 if (! ( SDL_VideoSurface->flags & SDL_OPENGL ) )
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 272 diff changeset	89 QZ_SetPortAlphaOpaque ();
683 5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	90
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	91 /* save current visible SDL surface */
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	92 [ self cacheImageInRect:[ window_view frame ] ];
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	93
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	94 /* let the window manager redraw controls, border, etc */
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	95 [ super display ];
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	96
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	97 /* restore visible SDL surface */
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	98 [ self restoreCachedImage ];
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	99
631 52864d66d168 Date: Mon, 5 May 2003 00:08:51 -0400 Sam Lantinga <slouken@libsdl.org> parents: 501 diff changeset	100 /* window is visible again */
52864d66d168 Date: Mon, 5 May 2003 00:08:51 -0400 Sam Lantinga <slouken@libsdl.org> parents: 501 diff changeset	101 SDL_PrivateAppActive (1, SDL_APPACTIVE);
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	102 }
45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	103
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 272 diff changeset	104 - (void)setFrame:(NSRect)frameRect display:(BOOL)flag
56 ce9cd2cf0d0d Date: Sun, 10 Jun 2001 17:33:44 -0500 Sam Lantinga <slouken@lokigames.com> parents: 47 diff changeset	105 {
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 272 diff changeset	106
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 272 diff changeset	107 /*
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 272 diff changeset	108 If the video surface is NULL, this originated from QZ_SetVideoMode,
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 272 diff changeset	109 so don't send the resize event.
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 272 diff changeset	110 */
683 5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	111 SDL_VideoDevice this = (SDL_VideoDevice)current_video;
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	112
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	113 if (this && SDL_VideoSurface == NULL) {
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 272 diff changeset	114
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 272 diff changeset	115 [ super setFrame:frameRect display:flag ];
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 272 diff changeset	116 }
683 5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	117 else if (this && qz_window) {
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 272 diff changeset	118
683 5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	119 NSRect newViewFrame;
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 272 diff changeset	120
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 272 diff changeset	121 [ super setFrame:frameRect display:flag ];
683 5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	122
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	123 newViewFrame = [ window_view frame ];
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	124
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	125 SDL_PrivateResize (newViewFrame.size.width, newViewFrame.size.height);
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 272 diff changeset	126
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 272 diff changeset	127 /* If not OpenGL, we have to update the pixels and pitch */
683 5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	128 if ( ! ( SDL_VideoSurface->flags & SDL_OPENGL ) ) {
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 272 diff changeset	129
683 5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	130 CGrafPtr thePort = [ window_view qdPort ];
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	131 LockPortBits ( thePort );
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 272 diff changeset	132
683 5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	133 SDL_VideoSurface->pixels = GetPixBaseAddr ( GetPortPixMap ( thePort ) );
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	134 SDL_VideoSurface->pitch = GetPixRowBytes ( GetPortPixMap ( thePort ) );
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	135
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	136 /*
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	137 SDL_VideoSurface->pixels now points to the window's pixels
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	138 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: 631 diff changeset	139 */
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	140 {
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	141 int vOffset = [ qz_window frame ].size.height -
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	142 newViewFrame.size.height - newViewFrame.origin.y;
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	143
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	144 int hOffset = newViewFrame.origin.x;
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	145
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	146 SDL_VideoSurface->pixels += (vOffset * SDL_VideoSurface->pitch) + hOffset * (device_bpp/8);
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	147 }
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 272 diff changeset	148
683 5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	149 UnlockPortBits ( thePort );
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 272 diff changeset	150 }
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 272 diff changeset	151 }
56 ce9cd2cf0d0d Date: Sun, 10 Jun 2001 17:33:44 -0500 Sam Lantinga <slouken@lokigames.com> parents: 47 diff changeset	152 }
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 272 diff changeset	153
631 52864d66d168 Date: Mon, 5 May 2003 00:08:51 -0400 Sam Lantinga <slouken@libsdl.org> parents: 501 diff changeset	154 - (void)appDidHide:(NSNotification*)note
52864d66d168 Date: Mon, 5 May 2003 00:08:51 -0400 Sam Lantinga <slouken@libsdl.org> parents: 501 diff changeset	155 {
52864d66d168 Date: Mon, 5 May 2003 00:08:51 -0400 Sam Lantinga <slouken@libsdl.org> parents: 501 diff changeset	156 SDL_PrivateAppActive (0, SDL_APPACTIVE);
52864d66d168 Date: Mon, 5 May 2003 00:08:51 -0400 Sam Lantinga <slouken@libsdl.org> parents: 501 diff changeset	157 }
52864d66d168 Date: Mon, 5 May 2003 00:08:51 -0400 Sam Lantinga <slouken@libsdl.org> parents: 501 diff changeset	158
683 5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	159 - (void)appWillUnhide:(NSNotification*)note
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	160 {
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	161 SDL_VideoDevice this = (SDL_VideoDevice)current_video;
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	162
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	163 if ( this ) {
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	164
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	165 /* make sure pixels are fully opaque */
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	166 if (! ( SDL_VideoSurface->flags & SDL_OPENGL ) )
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	167 QZ_SetPortAlphaOpaque ();
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	168
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	169 /* save current visible SDL surface */
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	170 [ self cacheImageInRect:[ window_view frame ] ];
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	171 }
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	172 }
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	173
631 52864d66d168 Date: Mon, 5 May 2003 00:08:51 -0400 Sam Lantinga <slouken@libsdl.org> parents: 501 diff changeset	174 - (void)appDidUnhide:(NSNotification*)note
52864d66d168 Date: Mon, 5 May 2003 00:08:51 -0400 Sam Lantinga <slouken@libsdl.org> parents: 501 diff changeset	175 {
683 5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	176 /* restore cached image, since it may not be current, post expose event too */
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	177 [ self restoreCachedImage ];
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	178
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	179 //SDL_PrivateExpose ();
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	180
631 52864d66d168 Date: Mon, 5 May 2003 00:08:51 -0400 Sam Lantinga <slouken@libsdl.org> parents: 501 diff changeset	181 SDL_PrivateAppActive (1, SDL_APPACTIVE);
52864d66d168 Date: Mon, 5 May 2003 00:08:51 -0400 Sam Lantinga <slouken@libsdl.org> parents: 501 diff changeset	182 }
52864d66d168 Date: Mon, 5 May 2003 00:08:51 -0400 Sam Lantinga <slouken@libsdl.org> parents: 501 diff changeset	183
52864d66d168 Date: Mon, 5 May 2003 00:08:51 -0400 Sam Lantinga <slouken@libsdl.org> parents: 501 diff changeset	184 - (id)initWithContentRect:(NSRect)contentRect styleMask:(unsigned int)styleMask backing:(NSBackingStoreType)backingType defer:(BOOL)flag
52864d66d168 Date: Mon, 5 May 2003 00:08:51 -0400 Sam Lantinga <slouken@libsdl.org> parents: 501 diff changeset	185 {
52864d66d168 Date: Mon, 5 May 2003 00:08:51 -0400 Sam Lantinga <slouken@libsdl.org> parents: 501 diff changeset	186 /* Make our window subclass receive these application notifications */
52864d66d168 Date: Mon, 5 May 2003 00:08:51 -0400 Sam Lantinga <slouken@libsdl.org> parents: 501 diff changeset	187 [ [ NSNotificationCenter defaultCenter ] addObserver:self
52864d66d168 Date: Mon, 5 May 2003 00:08:51 -0400 Sam Lantinga <slouken@libsdl.org> parents: 501 diff changeset	188 selector:@selector(appDidHide:) name:NSApplicationDidHideNotification object:NSApp ];
52864d66d168 Date: Mon, 5 May 2003 00:08:51 -0400 Sam Lantinga <slouken@libsdl.org> parents: 501 diff changeset	189
52864d66d168 Date: Mon, 5 May 2003 00:08:51 -0400 Sam Lantinga <slouken@libsdl.org> parents: 501 diff changeset	190 [ [ NSNotificationCenter defaultCenter ] addObserver:self
52864d66d168 Date: Mon, 5 May 2003 00:08:51 -0400 Sam Lantinga <slouken@libsdl.org> parents: 501 diff changeset	191 selector:@selector(appDidUnhide:) name:NSApplicationDidUnhideNotification object:NSApp ];
683 5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	192
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	193 [ [ NSNotificationCenter defaultCenter ] addObserver:self
5d2f027b3349 Date: Sat, 9 Aug 2003 20:14:06 -0400 Sam Lantinga <slouken@libsdl.org> parents: 631 diff changeset	194 selector:@selector(appWillUnhide:) name:NSApplicationWillUnhideNotification object:NSApp ];
631 52864d66d168 Date: Mon, 5 May 2003 00:08:51 -0400 Sam Lantinga <slouken@libsdl.org> parents: 501 diff changeset	195
52864d66d168 Date: Mon, 5 May 2003 00:08:51 -0400 Sam Lantinga <slouken@libsdl.org> parents: 501 diff changeset	196 return [ super initWithContentRect:contentRect styleMask:styleMask backing:backingType defer:flag ];
52864d66d168 Date: Mon, 5 May 2003 00:08:51 -0400 Sam Lantinga <slouken@libsdl.org> parents: 501 diff changeset	197 }
52864d66d168 Date: Mon, 5 May 2003 00:08:51 -0400 Sam Lantinga <slouken@libsdl.org> parents: 501 diff changeset	198
47 45b1c4303f87 Added initial support for Quartz video (thanks Darrell!) Sam Lantinga <slouken@lokigames.com> parents: diff changeset	199 @end
56 ce9cd2cf0d0d Date: Sun, 10 Jun 2001 17:33:44 -0500 Sam Lantinga <slouken@lokigames.com> parents: 47 diff changeset	200
ce9cd2cf0d0d Date: Sun, 10 Jun 2001 17:33:44 -0500 Sam Lantinga <slouken@lokigames.com> parents: 47 diff changeset	201 @implementation SDL_QuartzWindowDelegate
501 74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 272 diff changeset	202 - (BOOL)windowShouldClose:(id)sender
74262d2647ca Lots of cleanups by Darrell, added the ability to resize Cocoa windows. Sam Lantinga <slouken@libsdl.org> parents: 272 diff changeset	203 {
58 bd6b0a910a65 * Removed fullscreen menu option from the "Window" menu Sam Lantinga <slouken@lokigames.com> parents: 56 diff changeset	204 SDL_PrivateQuit();
56 ce9cd2cf0d0d Date: Sun, 10 Jun 2001 17:33:44 -0500 Sam Lantinga <slouken@lokigames.com> parents: 47 diff changeset	205 return NO;
ce9cd2cf0d0d Date: Sun, 10 Jun 2001 17:33:44 -0500 Sam Lantinga <slouken@lokigames.com> parents: 47 diff changeset	206 }
779 68c8da837fc0 Date: Tue, 6 Jan 2004 21:54:02 +0100 Sam Lantinga <slouken@libsdl.org> parents: 761 diff changeset	207
68c8da837fc0 Date: Tue, 6 Jan 2004 21:54:02 +0100 Sam Lantinga <slouken@libsdl.org> parents: 761 diff changeset	208 - (void)windowDidBecomeKey:(NSNotification *)aNotification
68c8da837fc0 Date: Tue, 6 Jan 2004 21:54:02 +0100 Sam Lantinga <slouken@libsdl.org> parents: 761 diff changeset	209 {
68c8da837fc0 Date: Tue, 6 Jan 2004 21:54:02 +0100 Sam Lantinga <slouken@libsdl.org> parents: 761 diff changeset	210 SDL_PrivateAppActive (1, SDL_APPINPUTFOCUS);
68c8da837fc0 Date: Tue, 6 Jan 2004 21:54:02 +0100 Sam Lantinga <slouken@libsdl.org> parents: 761 diff changeset	211 }
68c8da837fc0 Date: Tue, 6 Jan 2004 21:54:02 +0100 Sam Lantinga <slouken@libsdl.org> parents: 761 diff changeset	212
68c8da837fc0 Date: Tue, 6 Jan 2004 21:54:02 +0100 Sam Lantinga <slouken@libsdl.org> parents: 761 diff changeset	213 - (void)windowDidResignKey:(NSNotification *)aNotification
68c8da837fc0 Date: Tue, 6 Jan 2004 21:54:02 +0100 Sam Lantinga <slouken@libsdl.org> parents: 761 diff changeset	214 {
68c8da837fc0 Date: Tue, 6 Jan 2004 21:54:02 +0100 Sam Lantinga <slouken@libsdl.org> parents: 761 diff changeset	215 SDL_PrivateAppActive (0, SDL_APPINPUTFOCUS);
68c8da837fc0 Date: Tue, 6 Jan 2004 21:54:02 +0100 Sam Lantinga <slouken@libsdl.org> parents: 761 diff changeset	216 }
68c8da837fc0 Date: Tue, 6 Jan 2004 21:54:02 +0100 Sam Lantinga <slouken@libsdl.org> parents: 761 diff changeset	217
68c8da837fc0 Date: Tue, 6 Jan 2004 21:54:02 +0100 Sam Lantinga <slouken@libsdl.org> parents: 761 diff changeset	218 - (void)windowDidBecomeMain:(NSNotification *)aNotification
68c8da837fc0 Date: Tue, 6 Jan 2004 21:54:02 +0100 Sam Lantinga <slouken@libsdl.org> parents: 761 diff changeset	219 {
68c8da837fc0 Date: Tue, 6 Jan 2004 21:54:02 +0100 Sam Lantinga <slouken@libsdl.org> parents: 761 diff changeset	220 SDL_VideoDevice this = (SDL_VideoDevice)current_video;
68c8da837fc0 Date: Tue, 6 Jan 2004 21:54:02 +0100 Sam Lantinga <slouken@libsdl.org> parents: 761 diff changeset	221 if (this && QZ_IsMouseInWindow (this))
68c8da837fc0 Date: Tue, 6 Jan 2004 21:54:02 +0100 Sam Lantinga <slouken@libsdl.org> parents: 761 diff changeset	222 SDL_PrivateAppActive (1, SDL_APPMOUSEFOCUS);
68c8da837fc0 Date: Tue, 6 Jan 2004 21:54:02 +0100 Sam Lantinga <slouken@libsdl.org> parents: 761 diff changeset	223 }
68c8da837fc0 Date: Tue, 6 Jan 2004 21:54:02 +0100 Sam Lantinga <slouken@libsdl.org> parents: 761 diff changeset	224
68c8da837fc0 Date: Tue, 6 Jan 2004 21:54:02 +0100 Sam Lantinga <slouken@libsdl.org> parents: 761 diff changeset	225 - (void)windowDidResignMain:(NSNotification *)aNotification
68c8da837fc0 Date: Tue, 6 Jan 2004 21:54:02 +0100 Sam Lantinga <slouken@libsdl.org> parents: 761 diff changeset	226 {
68c8da837fc0 Date: Tue, 6 Jan 2004 21:54:02 +0100 Sam Lantinga <slouken@libsdl.org> parents: 761 diff changeset	227 SDL_PrivateAppActive (0, SDL_APPMOUSEFOCUS);
68c8da837fc0 Date: Tue, 6 Jan 2004 21:54:02 +0100 Sam Lantinga <slouken@libsdl.org> parents: 761 diff changeset	228 }
68c8da837fc0 Date: Tue, 6 Jan 2004 21:54:02 +0100 Sam Lantinga <slouken@libsdl.org> parents: 761 diff changeset	229
58 bd6b0a910a65 * Removed fullscreen menu option from the "Window" menu Sam Lantinga <slouken@lokigames.com> parents: 56 diff changeset	230 @end

Mercurial > sdl-ios-xcode

annotate src/video/quartz/SDL_QuartzWindow.m @ 1321:e05bc5d315e3