comparison src/video/quartz/SDL_QuartzWindow.m @ 761:c5b2b6d2d1fe

Date: Wed, 31 Dec 2003 21:55:30 +0100 From: Max Horn Subject: SDL: video/quartz cleanup while doing some experimental changes in the quartz code, I was annoyed by having to recompile that one big .o file over and over again. So I decided to finally realize one TODO: properly splitting the code over multiple files :-). With two exceptions, I didn't make code changes, only rearranged files and added new headers. Since there are several new files, making a patch didn't work out so well, so I decided to just send you all the new & modified files. The one source change I made is related to showing/hiding the mouse. I renamed cursor_visible to cursor_should_be_visible and cursor_hidden to cursor_visible; I think that makes reading the code easier. Then I added two new functions: QZ_ShowMouse and QZ_HideMouse. They help manage cursor_visible (the former 'cursor_hidden'). Finally I replaced the Carbon ShowCursor/HiderCuror calls by [NSCursor hide] and [NSCursor unhide]. The API docs are not conclusive, but it might be that with those the "cursor_visible" (former 'cursor_hidden') hack may not be necessary anymore; however so far I didn't test this hypothesis, so I left that in. The other change was to remove in_foreground and use [NSApp isActive] instead: Manually keeping track of whether we are in the foreground is error prone. This should work better in some corner cases.
author Sam Lantinga <slouken@libsdl.org>
date Sun, 04 Jan 2004 14:55:35 +0000
parents 5d2f027b3349
children 68c8da837fc0
comparison
equal deleted inserted replaced
760:cf9dd3aa6756 761:c5b2b6d2d1fe
1 /*
2 SDL - Simple DirectMedia Layer
3 Copyright (C) 1997-2003 Sam Lantinga
4
5 This library is free software; you can redistribute it and/or
6 modify it under the terms of the GNU Library General Public
7 License as published by the Free Software Foundation; either
8 version 2 of the License, or (at your option) any later version.
9
10 This library is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 Library General Public License for more details.
14
15 You should have received a copy of the GNU Library General Public
16 License along with this library; if not, write to the Free
17 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18
19 Sam Lantinga
20 slouken@libsdl.org
21 */
22
23 #include "SDL_QuartzVideo.h"
24 #include "SDL_QuartzWindow.h"
1 25
2 /* 26 /*
3 This function makes the *SDL region* of the window 100% opaque. 27 This function makes the *SDL region* of the window 100% opaque.
4 The genie effect uses the alpha component. Otherwise, 28 The genie effect uses the alpha component. Otherwise,
5 it doesn't seem to matter what value it has. 29 it doesn't seem to matter what value it has.
22 46
23 pixels[ (i * rowPixels) + j ] |= 0xFF000000; 47 pixels[ (i * rowPixels) + j ] |= 0xFF000000;
24 } 48 }
25 } 49 }
26 } 50 }
27
28 /* Subclass of NSWindow to fix genie effect and support resize events */
29 @interface SDL_QuartzWindow : NSWindow
30 {}
31 - (void)miniaturize:(id)sender;
32 - (void)display;
33 - (void)setFrame:(NSRect)frameRect display:(BOOL)flag;
34 - (void)appDidHide:(NSNotification*)note;
35 - (void)appWillUnhide:(NSNotification*)note;
36 - (void)appDidUnhide:(NSNotification*)note;
37 - (id)initWithContentRect:(NSRect)contentRect styleMask:(unsigned int)styleMask backing:(NSBackingStoreType)backingType defer:(BOOL)flag;
38 @end
39 51
40 @implementation SDL_QuartzWindow 52 @implementation SDL_QuartzWindow
41 53
42 /* we override these methods to fix the miniaturize animation/dock icon bug */ 54 /* we override these methods to fix the miniaturize animation/dock icon bug */
43 - (void)miniaturize:(id)sender 55 - (void)miniaturize:(id)sender
184 return [ super initWithContentRect:contentRect styleMask:styleMask backing:backingType defer:flag ]; 196 return [ super initWithContentRect:contentRect styleMask:styleMask backing:backingType defer:flag ];
185 } 197 }
186 198
187 @end 199 @end
188 200
189 /* Delegate for our NSWindow to send SDLQuit() on close */
190 @interface SDL_QuartzWindowDelegate : NSObject
191 {}
192 - (BOOL)windowShouldClose:(id)sender;
193 @end
194
195 @implementation SDL_QuartzWindowDelegate 201 @implementation SDL_QuartzWindowDelegate
196 - (BOOL)windowShouldClose:(id)sender 202 - (BOOL)windowShouldClose:(id)sender
197 { 203 {
198 SDL_PrivateQuit(); 204 SDL_PrivateQuit();
199 return NO; 205 return NO;
200 } 206 }
201 @end 207 @end
202
203 /* Subclass of NSQuickDrawView for the window's subview */
204 @interface SDL_QuartzWindowView : NSQuickDrawView
205 {}
206 @end
207
208 @implementation SDL_QuartzWindowView
209 @end