sdl-ios-xcode: src/video/cocoa/SDL_cocoawindow.m annotate

annotate src/video/cocoa/SDL_cocoawindow.m @ 3409:c8f580ebc96a

Adam Strzelecki to SDL Sending a patch for fullscreen Mac OS X SDL 1.3 (SVN) Cocoa mouse position handling. In fullscreen mouse coordinates should be relative to SCREEN not to the window, which doesn't really occupy fullscreen. Without this patch mouse position (especially Y) was totally incorrect (shifted) in fullscreen.

author	Sam Lantinga <slouken@libsdl.org>
date	Thu, 22 Oct 2009 04:46:11 +0000
parents	4c28a9655933
children	1e45c3012a4f

rev	line source
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1 /*
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2 SDL - Simple DirectMedia Layer
2859 99210400e8b9 Updated copyright date Sam Lantinga <slouken@libsdl.org> parents: 2710 diff changeset	3 Copyright (C) 1997-2009 Sam Lantinga
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	4
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	5 This library is free software; you can redistribute it and/or
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	6 modify it under the terms of the GNU Lesser General Public
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	7 License as published by the Free Software Foundation; either
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	8 version 2.1 of the License, or (at your option) any later version.
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	9
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	10 This library is distributed in the hope that it will be useful,
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	11 but WITHOUT ANY WARRANTY; without even the implied warranty of
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	13 Lesser General Public License for more details.
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	14
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	15 You should have received a copy of the GNU Lesser General Public
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	16 License along with this library; if not, write to the Free Software
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	18
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	19 Sam Lantinga
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	20 slouken@libsdl.org
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	21 */
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	22 #include "SDL_config.h"
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	23
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	24 #include "SDL_syswm.h"
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	25 #include "../SDL_sysvideo.h"
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	26 #include "../../events/SDL_keyboard_c.h"
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	27 #include "../../events/SDL_mouse_c.h"
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	28 #include "../../events/SDL_windowevents_c.h"
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	29
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	30 #include "SDL_cocoavideo.h"
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	31
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	32 static __inline__ void ConvertNSRect(NSRect *r)
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	33 {
1936 83946ee0ff1f Implemented OpenGL support on Mac OS X Sam Lantinga <slouken@libsdl.org> parents: 1933 diff changeset	34 /* FIXME: Cache the display used for this window */
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	35 r->origin.y = CGDisplayPixelsHigh(kCGDirectMainDisplay) - r->origin.y - r->size.height;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	36 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	37
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	38 @implementation Cocoa_WindowListener
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	39
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	40 - (void)listen:(SDL_WindowData *)data
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	41 {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	42 NSNotificationCenter *center;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	43
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	44 _data = data;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	45
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	46 center = [NSNotificationCenter defaultCenter];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	47
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	48 [_data->window setNextResponder:self];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	49 if ([_data->window delegate] != nil) {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	50 [center addObserver:self selector:@selector(windowDisExpose:) name:NSWindowDidExposeNotification object:_data->window];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	51 [center addObserver:self selector:@selector(windowDidMove:) name:NSWindowDidMoveNotification object:_data->window];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	52 [center addObserver:self selector:@selector(windowDidResize:) name:NSWindowDidResizeNotification object:_data->window];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	53 [center addObserver:self selector:@selector(windowDidMiniaturize:) name:NSWindowDidMiniaturizeNotification object:_data->window];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	54 [center addObserver:self selector:@selector(windowDidDeminiaturize:) name:NSWindowDidDeminiaturizeNotification object:_data->window];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	55 [center addObserver:self selector:@selector(windowDidBecomeKey:) name:NSWindowDidBecomeKeyNotification object:_data->window];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	56 [center addObserver:self selector:@selector(windowDidResignKey:) name:NSWindowDidResignKeyNotification object:_data->window];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	57 } else {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	58 [_data->window setDelegate:self];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	59 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	60 [center addObserver:self selector:@selector(windowDidHide:) name:NSApplicationDidHideNotification object:NSApp];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	61 [center addObserver:self selector:@selector(windowDidUnhide:) name:NSApplicationDidUnhideNotification object:NSApp];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	62
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	63 [_data->window setAcceptsMouseMovedEvents:YES];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	64 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	65
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	66 - (void)close
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	67 {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	68 NSNotificationCenter *center;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	69
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	70 center = [NSNotificationCenter defaultCenter];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	71
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	72 [_data->window setNextResponder:nil];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	73 if ([_data->window delegate] != self) {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	74 [center removeObserver:self name:NSWindowDidExposeNotification object:_data->window];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	75 [center removeObserver:self name:NSWindowDidMoveNotification object:_data->window];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	76 [center removeObserver:self name:NSWindowDidResizeNotification object:_data->window];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	77 [center removeObserver:self name:NSWindowDidMiniaturizeNotification object:_data->window];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	78 [center removeObserver:self name:NSWindowDidDeminiaturizeNotification object:_data->window];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	79 [center removeObserver:self name:NSWindowDidBecomeKeyNotification object:_data->window];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	80 [center removeObserver:self name:NSWindowDidResignKeyNotification object:_data->window];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	81 } else {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	82 [_data->window setDelegate:nil];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	83 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	84 [center removeObserver:self name:NSApplicationDidHideNotification object:NSApp];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	85 [center removeObserver:self name:NSApplicationDidUnhideNotification object:NSApp];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	86 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	87
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	88 - (BOOL)windowShouldClose:(id)sender
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	89 {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	90 SDL_SendWindowEvent(_data->windowID, SDL_WINDOWEVENT_CLOSE, 0, 0);
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	91 return NO;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	92 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	93
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	94 - (void)windowDidExpose:(NSNotification *)aNotification
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	95 {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	96 SDL_SendWindowEvent(_data->windowID, SDL_WINDOWEVENT_EXPOSED, 0, 0);
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	97 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	98
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	99 - (void)windowDidMove:(NSNotification *)aNotification
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	100 {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	101 int x, y;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	102 NSRect rect = [_data->window contentRectForFrameRect:[_data->window frame]];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	103 ConvertNSRect(&rect);
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	104 x = (int)rect.origin.x;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	105 y = (int)rect.origin.y;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	106 SDL_SendWindowEvent(_data->windowID, SDL_WINDOWEVENT_MOVED, x, y);
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	107 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	108
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	109 - (void)windowDidResize:(NSNotification *)aNotification
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	110 {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	111 int w, h;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	112 NSRect rect = [_data->window contentRectForFrameRect:[_data->window frame]];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	113 w = (int)rect.size.width;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	114 h = (int)rect.size.height;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	115 SDL_SendWindowEvent(_data->windowID, SDL_WINDOWEVENT_RESIZED, w, h);
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	116 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	117
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	118 - (void)windowDidMiniaturize:(NSNotification *)aNotification
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	119 {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	120 SDL_SendWindowEvent(_data->windowID, SDL_WINDOWEVENT_MINIMIZED, 0, 0);
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	121 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	122
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	123 - (void)windowDidDeminiaturize:(NSNotification *)aNotification
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	124 {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	125 SDL_SendWindowEvent(_data->windowID, SDL_WINDOWEVENT_RESTORED, 0, 0);
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	126 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	127
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	128 - (void)windowDidBecomeKey:(NSNotification *)aNotification
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	129 {
1962 c92e5f3e68d9 Hack to stop the beeping Sam Lantinga <slouken@libsdl.org> parents: 1959 diff changeset	130 int index;
c92e5f3e68d9 Hack to stop the beeping Sam Lantinga <slouken@libsdl.org> parents: 1959 diff changeset	131
2059 4685ccd33d0e Fixed mouse enter/leave events for a single window. Sam Lantinga <slouken@libsdl.org> parents: 1973 diff changeset	132 /* We're going to get keyboard events, since we're key. */
1962 c92e5f3e68d9 Hack to stop the beeping Sam Lantinga <slouken@libsdl.org> parents: 1959 diff changeset	133 index = _data->videodata->keyboard;
c92e5f3e68d9 Hack to stop the beeping Sam Lantinga <slouken@libsdl.org> parents: 1959 diff changeset	134 SDL_SetKeyboardFocus(index, _data->windowID);
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	135 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	136
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	137 - (void)windowDidResignKey:(NSNotification *)aNotification
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	138 {
1962 c92e5f3e68d9 Hack to stop the beeping Sam Lantinga <slouken@libsdl.org> parents: 1959 diff changeset	139 int index;
2059 4685ccd33d0e Fixed mouse enter/leave events for a single window. Sam Lantinga <slouken@libsdl.org> parents: 1973 diff changeset	140 SDL_Mouse *mouse;
1962 c92e5f3e68d9 Hack to stop the beeping Sam Lantinga <slouken@libsdl.org> parents: 1959 diff changeset	141
2059 4685ccd33d0e Fixed mouse enter/leave events for a single window. Sam Lantinga <slouken@libsdl.org> parents: 1973 diff changeset	142 /* Some other window will get mouse events, since we're not key. */
4685ccd33d0e Fixed mouse enter/leave events for a single window. Sam Lantinga <slouken@libsdl.org> parents: 1973 diff changeset	143 index = _data->videodata->mouse;
4685ccd33d0e Fixed mouse enter/leave events for a single window. Sam Lantinga <slouken@libsdl.org> parents: 1973 diff changeset	144 mouse = SDL_GetMouse(index);
4685ccd33d0e Fixed mouse enter/leave events for a single window. Sam Lantinga <slouken@libsdl.org> parents: 1973 diff changeset	145 if (mouse->focus == _data->windowID) {
4685ccd33d0e Fixed mouse enter/leave events for a single window. Sam Lantinga <slouken@libsdl.org> parents: 1973 diff changeset	146 SDL_SetMouseFocus(index, 0);
4685ccd33d0e Fixed mouse enter/leave events for a single window. Sam Lantinga <slouken@libsdl.org> parents: 1973 diff changeset	147 }
4685ccd33d0e Fixed mouse enter/leave events for a single window. Sam Lantinga <slouken@libsdl.org> parents: 1973 diff changeset	148
4685ccd33d0e Fixed mouse enter/leave events for a single window. Sam Lantinga <slouken@libsdl.org> parents: 1973 diff changeset	149 /* Some other window will get keyboard events, since we're not key. */
1962 c92e5f3e68d9 Hack to stop the beeping Sam Lantinga <slouken@libsdl.org> parents: 1959 diff changeset	150 index = _data->videodata->keyboard;
c92e5f3e68d9 Hack to stop the beeping Sam Lantinga <slouken@libsdl.org> parents: 1959 diff changeset	151 SDL_SetKeyboardFocus(index, 0);
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	152 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	153
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	154 - (void)windowDidHide:(NSNotification *)aNotification
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	155 {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	156 SDL_SendWindowEvent(_data->windowID, SDL_WINDOWEVENT_HIDDEN, 0, 0);
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	157 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	158
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	159 - (void)windowDidUnhide:(NSNotification *)aNotification
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	160 {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	161 SDL_SendWindowEvent(_data->windowID, SDL_WINDOWEVENT_SHOWN, 0, 0);
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	162 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	163
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	164 - (void)mouseDown:(NSEvent *)theEvent
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	165 {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	166 int index;
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	167 int button;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	168
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	169 index = _data->videodata->mouse;
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	170 switch ([theEvent buttonNumber]) {
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	171 case 0:
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	172 button = SDL_BUTTON_LEFT;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	173 break;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	174 case 1:
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	175 button = SDL_BUTTON_RIGHT;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	176 break;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	177 case 2:
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	178 button = SDL_BUTTON_MIDDLE;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	179 break;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	180 default:
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	181 button = [theEvent buttonNumber];
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	182 break;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	183 }
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	184 SDL_SendMouseButton(index, SDL_PRESSED, button);
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	185 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	186
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	187 - (void)rightMouseDown:(NSEvent *)theEvent
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	188 {
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	189 [self mouseDown:theEvent];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	190 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	191
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	192 - (void)otherMouseDown:(NSEvent *)theEvent
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	193 {
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	194 [self mouseDown:theEvent];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	195 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	196
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	197 - (void)mouseUp:(NSEvent *)theEvent
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	198 {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	199 int index;
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	200 int button;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	201
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	202 index = _data->videodata->mouse;
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	203 switch ([theEvent buttonNumber]) {
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	204 case 0:
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	205 button = SDL_BUTTON_LEFT;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	206 break;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	207 case 1:
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	208 button = SDL_BUTTON_RIGHT;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	209 break;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	210 case 2:
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	211 button = SDL_BUTTON_MIDDLE;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	212 break;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	213 default:
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	214 button = [theEvent buttonNumber];
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	215 break;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	216 }
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	217 SDL_SendMouseButton(index, SDL_RELEASED, button);
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	218 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	219
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	220 - (void)rightMouseUp:(NSEvent *)theEvent
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	221 {
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	222 [self mouseUp:theEvent];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	223 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	224
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	225 - (void)otherMouseUp:(NSEvent *)theEvent
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	226 {
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	227 [self mouseUp:theEvent];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	228 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	229
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	230 - (void)mouseMoved:(NSEvent *)theEvent
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	231 {
1956 ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	232 SDL_Window *window = SDL_GetWindowFromID(_data->windowID);
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	233 int index;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	234 SDL_Mouse *mouse;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	235 NSPoint point;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	236 NSRect rect = [_data->window contentRectForFrameRect:[_data->window frame]];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	237
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	238 index = _data->videodata->mouse;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	239 mouse = SDL_GetMouse(index);
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	240
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	241 point = [NSEvent mouseLocation];
3409 c8f580ebc96a Adam Strzelecki to SDL Sam Lantinga <slouken@libsdl.org> parents: 3075 diff changeset	242 if ( (window->flags & SDL_WINDOW_FULLSCREEN) ) {
c8f580ebc96a Adam Strzelecki to SDL Sam Lantinga <slouken@libsdl.org> parents: 3075 diff changeset	243 rect.size.width = CGDisplayPixelsWide(kCGDirectMainDisplay);
c8f580ebc96a Adam Strzelecki to SDL Sam Lantinga <slouken@libsdl.org> parents: 3075 diff changeset	244 rect.size.height = CGDisplayPixelsHigh(kCGDirectMainDisplay);
c8f580ebc96a Adam Strzelecki to SDL Sam Lantinga <slouken@libsdl.org> parents: 3075 diff changeset	245 point.y = rect.size.height - point.y;
c8f580ebc96a Adam Strzelecki to SDL Sam Lantinga <slouken@libsdl.org> parents: 3075 diff changeset	246 } else {
c8f580ebc96a Adam Strzelecki to SDL Sam Lantinga <slouken@libsdl.org> parents: 3075 diff changeset	247 rect = [_data->window contentRectForFrameRect:[_data->window frame]];
c8f580ebc96a Adam Strzelecki to SDL Sam Lantinga <slouken@libsdl.org> parents: 3075 diff changeset	248 point.x = point.x - rect.origin.x;
c8f580ebc96a Adam Strzelecki to SDL Sam Lantinga <slouken@libsdl.org> parents: 3075 diff changeset	249 point.y = rect.size.height - (point.y - rect.origin.y);
c8f580ebc96a Adam Strzelecki to SDL Sam Lantinga <slouken@libsdl.org> parents: 3075 diff changeset	250 }
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	251 point.x = point.x - rect.origin.x;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	252 point.y = rect.size.height - (point.y - rect.origin.y);
2059 4685ccd33d0e Fixed mouse enter/leave events for a single window. Sam Lantinga <slouken@libsdl.org> parents: 1973 diff changeset	253 if ( point.x < 0 \|\| point.x >= rect.size.width \|\|
4685ccd33d0e Fixed mouse enter/leave events for a single window. Sam Lantinga <slouken@libsdl.org> parents: 1973 diff changeset	254 point.y < 0 \|\| point.y >= rect.size.height ) {
4685ccd33d0e Fixed mouse enter/leave events for a single window. Sam Lantinga <slouken@libsdl.org> parents: 1973 diff changeset	255 if (mouse->focus != 0) {
4685ccd33d0e Fixed mouse enter/leave events for a single window. Sam Lantinga <slouken@libsdl.org> parents: 1973 diff changeset	256 SDL_SetMouseFocus(index, 0);
4685ccd33d0e Fixed mouse enter/leave events for a single window. Sam Lantinga <slouken@libsdl.org> parents: 1973 diff changeset	257 }
4685ccd33d0e Fixed mouse enter/leave events for a single window. Sam Lantinga <slouken@libsdl.org> parents: 1973 diff changeset	258 } else {
4685ccd33d0e Fixed mouse enter/leave events for a single window. Sam Lantinga <slouken@libsdl.org> parents: 1973 diff changeset	259 if (mouse->focus != _data->windowID) {
4685ccd33d0e Fixed mouse enter/leave events for a single window. Sam Lantinga <slouken@libsdl.org> parents: 1973 diff changeset	260 SDL_SetMouseFocus(index, _data->windowID);
4685ccd33d0e Fixed mouse enter/leave events for a single window. Sam Lantinga <slouken@libsdl.org> parents: 1973 diff changeset	261 }
2710 44e49d3fa6cf Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2152 diff changeset	262 SDL_SendMouseMotion(index, 0, (int)point.x, (int)point.y, 0);
2059 4685ccd33d0e Fixed mouse enter/leave events for a single window. Sam Lantinga <slouken@libsdl.org> parents: 1973 diff changeset	263 }
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	264 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	265
1957 c7803e4c21d3 Implemented Cocoa mouse wheel events Sam Lantinga <slouken@libsdl.org> parents: 1956 diff changeset	266 - (void)mouseDragged:(NSEvent *)theEvent
c7803e4c21d3 Implemented Cocoa mouse wheel events Sam Lantinga <slouken@libsdl.org> parents: 1956 diff changeset	267 {
c7803e4c21d3 Implemented Cocoa mouse wheel events Sam Lantinga <slouken@libsdl.org> parents: 1956 diff changeset	268 [self mouseMoved:theEvent];
c7803e4c21d3 Implemented Cocoa mouse wheel events Sam Lantinga <slouken@libsdl.org> parents: 1956 diff changeset	269 }
c7803e4c21d3 Implemented Cocoa mouse wheel events Sam Lantinga <slouken@libsdl.org> parents: 1956 diff changeset	270
1958 5fc6fb0fb605 Added right/other drag code for Cocoa windows Sam Lantinga <slouken@libsdl.org> parents: 1957 diff changeset	271 - (void)rightMouseDragged:(NSEvent *)theEvent
5fc6fb0fb605 Added right/other drag code for Cocoa windows Sam Lantinga <slouken@libsdl.org> parents: 1957 diff changeset	272 {
5fc6fb0fb605 Added right/other drag code for Cocoa windows Sam Lantinga <slouken@libsdl.org> parents: 1957 diff changeset	273 [self mouseMoved:theEvent];
5fc6fb0fb605 Added right/other drag code for Cocoa windows Sam Lantinga <slouken@libsdl.org> parents: 1957 diff changeset	274 }
5fc6fb0fb605 Added right/other drag code for Cocoa windows Sam Lantinga <slouken@libsdl.org> parents: 1957 diff changeset	275
5fc6fb0fb605 Added right/other drag code for Cocoa windows Sam Lantinga <slouken@libsdl.org> parents: 1957 diff changeset	276 - (void)otherMouseDragged:(NSEvent *)theEvent
5fc6fb0fb605 Added right/other drag code for Cocoa windows Sam Lantinga <slouken@libsdl.org> parents: 1957 diff changeset	277 {
5fc6fb0fb605 Added right/other drag code for Cocoa windows Sam Lantinga <slouken@libsdl.org> parents: 1957 diff changeset	278 [self mouseMoved:theEvent];
5fc6fb0fb605 Added right/other drag code for Cocoa windows Sam Lantinga <slouken@libsdl.org> parents: 1957 diff changeset	279 }
5fc6fb0fb605 Added right/other drag code for Cocoa windows Sam Lantinga <slouken@libsdl.org> parents: 1957 diff changeset	280
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	281 - (void)scrollWheel:(NSEvent *)theEvent
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	282 {
1957 c7803e4c21d3 Implemented Cocoa mouse wheel events Sam Lantinga <slouken@libsdl.org> parents: 1956 diff changeset	283 int index;
c7803e4c21d3 Implemented Cocoa mouse wheel events Sam Lantinga <slouken@libsdl.org> parents: 1956 diff changeset	284
c7803e4c21d3 Implemented Cocoa mouse wheel events Sam Lantinga <slouken@libsdl.org> parents: 1956 diff changeset	285 index = _data->videodata->mouse;
2152 003c1b5b07da Fixed bug #382 Sam Lantinga <slouken@libsdl.org> parents: 2059 diff changeset	286 SDL_SendMouseWheel(index, (int)([theEvent deltaX]+0.9f), (int)([theEvent deltaY]+0.9f));
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	287 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	288
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	289 @end
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	290
1973 81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	291 @interface SDLWindow : NSWindow
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	292 /* These are needed for borderless/fullscreen windows */
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	293 - (BOOL)canBecomeKeyWindow;
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	294 - (BOOL)canBecomeMainWindow;
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	295 @end
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	296
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	297 @implementation SDLWindow
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	298 - (BOOL)canBecomeKeyWindow
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	299 {
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	300 return YES;
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	301 }
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	302
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	303 - (BOOL)canBecomeMainWindow
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	304 {
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	305 return YES;
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	306 }
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	307 @end
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	308
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	309 static int
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: 1937 diff changeset	310 SetupWindowData(_THIS, SDL_Window * window, NSWindow *nswindow, SDL_bool created)
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	311 {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	312 NSAutoreleasePool *pool;
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: 1937 diff changeset	313 SDL_VideoData videodata = (SDL_VideoData ) _this->driverdata;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	314 SDL_WindowData *data;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	315
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	316 /* Allocate the window data */
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	317 data = (SDL_WindowData ) SDL_malloc(sizeof(data));
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	318 if (!data) {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	319 SDL_OutOfMemory();
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	320 return -1;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	321 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	322 data->windowID = window->id;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	323 data->window = nswindow;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	324 data->created = created;
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: 1937 diff changeset	325 data->videodata = videodata;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	326
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	327 pool = [[NSAutoreleasePool alloc] init];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	328
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	329 /* Create an event listener for the window */
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	330 data->listener = [[Cocoa_WindowListener alloc] init];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	331 [data->listener listen:data];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	332
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	333 /* Fill in the SDL window with the window data */
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	334 {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	335 NSRect rect = [nswindow contentRectForFrameRect:[nswindow frame]];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	336 ConvertNSRect(&rect);
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	337 window->x = (int)rect.origin.x;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	338 window->y = (int)rect.origin.y;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	339 window->w = (int)rect.size.width;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	340 window->h = (int)rect.size.height;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	341 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	342 if ([nswindow isVisible]) {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	343 window->flags \|= SDL_WINDOW_SHOWN;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	344 } else {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	345 window->flags &= ~SDL_WINDOW_SHOWN;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	346 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	347 {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	348 unsigned int style = [nswindow styleMask];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	349
1956 ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	350 if ((style & ~NSResizableWindowMask) == NSBorderlessWindowMask) {
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	351 window->flags \|= SDL_WINDOW_BORDERLESS;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	352 } else {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	353 window->flags &= ~SDL_WINDOW_BORDERLESS;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	354 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	355 if (style & NSResizableWindowMask) {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	356 window->flags \|= SDL_WINDOW_RESIZABLE;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	357 } else {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	358 window->flags &= ~SDL_WINDOW_RESIZABLE;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	359 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	360 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	361 if ([nswindow isZoomed]) {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	362 window->flags \|= SDL_WINDOW_MAXIMIZED;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	363 } else {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	364 window->flags &= ~SDL_WINDOW_MAXIMIZED;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	365 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	366 if ([nswindow isMiniaturized]) {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	367 window->flags \|= SDL_WINDOW_MINIMIZED;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	368 } else {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	369 window->flags &= ~SDL_WINDOW_MINIMIZED;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	370 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	371 if ([nswindow isKeyWindow]) {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	372 int index = data->videodata->keyboard;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	373 window->flags \|= SDL_WINDOW_INPUT_FOCUS;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	374 SDL_SetKeyboardFocus(index, data->windowID);
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	375
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	376 if (window->flags & SDL_WINDOW_INPUT_GRABBED) {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	377 /* FIXME */
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	378 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	379 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	380
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	381 /* All done! */
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	382 [pool release];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	383 window->driverdata = data;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	384 return 0;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	385 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	386
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	387 int
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	388 Cocoa_CreateWindow(_THIS, SDL_Window * window)
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	389 {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	390 NSAutoreleasePool *pool;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	391 NSWindow *nswindow;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	392 NSRect rect;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	393 unsigned int style;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	394 NSString *title;
1936 83946ee0ff1f Implemented OpenGL support on Mac OS X Sam Lantinga <slouken@libsdl.org> parents: 1933 diff changeset	395 int status;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	396
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	397 pool = [[NSAutoreleasePool alloc] init];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	398
3075 4c28a9655933 Fixed bug using SDL_WINDOWPOS_CENTERED with SDL_SetWindowPosition() Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	399 if ((window->flags & SDL_WINDOW_FULLSCREEN)
4c28a9655933 Fixed bug using SDL_WINDOWPOS_CENTERED with SDL_SetWindowPosition() Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	400 \|\| window->x == SDL_WINDOWPOS_CENTERED) {
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	401 rect.origin.x = (CGDisplayPixelsWide(kCGDirectMainDisplay) - window->w) / 2;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	402 } else if (window->x == SDL_WINDOWPOS_UNDEFINED) {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	403 rect.origin.x = 0;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	404 } else {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	405 rect.origin.x = window->x;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	406 }
3075 4c28a9655933 Fixed bug using SDL_WINDOWPOS_CENTERED with SDL_SetWindowPosition() Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	407 if ((window->flags & SDL_WINDOW_FULLSCREEN)
4c28a9655933 Fixed bug using SDL_WINDOWPOS_CENTERED with SDL_SetWindowPosition() Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	408 \|\| window->y == SDL_WINDOWPOS_CENTERED) {
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	409 rect.origin.y = (CGDisplayPixelsHigh(kCGDirectMainDisplay) - window->h) / 2;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	410 } else if (window->y == SDL_WINDOWPOS_UNDEFINED) {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	411 rect.origin.y = 0;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	412 } else {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	413 rect.origin.y = window->y;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	414 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	415 rect.size.width = window->w;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	416 rect.size.height = window->h;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	417 ConvertNSRect(&rect);
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	418
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	419 if (window->flags & SDL_WINDOW_BORDERLESS) {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	420 style = NSBorderlessWindowMask;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	421 } else {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	422 style = (NSTitledWindowMask\|NSClosableWindowMask\|NSMiniaturizableWindowMask);
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	423 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	424 if (window->flags & SDL_WINDOW_RESIZABLE) {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	425 style \|= NSResizableWindowMask;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	426 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	427
1973 81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	428 nswindow = [[SDLWindow alloc] initWithContentRect:rect styleMask:style backing:NSBackingStoreBuffered defer:FALSE];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	429
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	430 [pool release];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	431
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: 1937 diff changeset	432 if (SetupWindowData(_this, window, nswindow, SDL_TRUE) < 0) {
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	433 [nswindow release];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	434 return -1;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	435 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	436 return 0;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	437 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	438
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	439 int
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	440 Cocoa_CreateWindowFrom(_THIS, SDL_Window * window, const void *data)
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	441 {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	442 NSAutoreleasePool *pool;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	443 NSWindow nswindow = (NSWindow ) data;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	444 NSString *title;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	445 int status;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	446
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	447 pool = [[NSAutoreleasePool alloc] init];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	448
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	449 /* Query the title from the existing window */
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	450 title = [nswindow title];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	451 if (title) {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	452 window->title = SDL_strdup([title UTF8String]);
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	453 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	454
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	455 [pool release];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	456
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: 1937 diff changeset	457 return SetupWindowData(_this, window, nswindow, SDL_FALSE);
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	458 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	459
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	460 void
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	461 Cocoa_SetWindowTitle(_THIS, SDL_Window * window)
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	462 {
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	463 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	464 NSWindow nswindow = ((SDL_WindowData ) window->driverdata)->window;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	465 NSString *string;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	466
1956 ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	467 if(window->title) {
ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	468 string = [[NSString alloc] initWithUTF8String:window->title];
ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	469 } else {
ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	470 string = [[NSString alloc] init];
ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	471 }
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	472 [nswindow setTitle:string];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	473 [string release];
1956 ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	474
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	475 [pool release];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	476 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	477
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	478 void
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	479 Cocoa_SetWindowPosition(_THIS, SDL_Window * window)
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	480 {
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	481 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	482 NSWindow nswindow = ((SDL_WindowData ) window->driverdata)->window;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	483 NSRect rect;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	484
3075 4c28a9655933 Fixed bug using SDL_WINDOWPOS_CENTERED with SDL_SetWindowPosition() Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	485 if ((window->flags & SDL_WINDOW_FULLSCREEN)
4c28a9655933 Fixed bug using SDL_WINDOWPOS_CENTERED with SDL_SetWindowPosition() Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	486 \|\| window->x == SDL_WINDOWPOS_CENTERED) {
4c28a9655933 Fixed bug using SDL_WINDOWPOS_CENTERED with SDL_SetWindowPosition() Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	487 rect.origin.x = (CGDisplayPixelsWide(kCGDirectMainDisplay) - window->w) / 2;
4c28a9655933 Fixed bug using SDL_WINDOWPOS_CENTERED with SDL_SetWindowPosition() Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	488 } else {
4c28a9655933 Fixed bug using SDL_WINDOWPOS_CENTERED with SDL_SetWindowPosition() Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	489 rect.origin.x = window->x;
4c28a9655933 Fixed bug using SDL_WINDOWPOS_CENTERED with SDL_SetWindowPosition() Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	490 }
4c28a9655933 Fixed bug using SDL_WINDOWPOS_CENTERED with SDL_SetWindowPosition() Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	491 if ((window->flags & SDL_WINDOW_FULLSCREEN)
4c28a9655933 Fixed bug using SDL_WINDOWPOS_CENTERED with SDL_SetWindowPosition() Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	492 \|\| window->y == SDL_WINDOWPOS_CENTERED) {
4c28a9655933 Fixed bug using SDL_WINDOWPOS_CENTERED with SDL_SetWindowPosition() Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	493 rect.origin.y = (CGDisplayPixelsHigh(kCGDirectMainDisplay) - window->h) / 2;
4c28a9655933 Fixed bug using SDL_WINDOWPOS_CENTERED with SDL_SetWindowPosition() Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	494 } else {
4c28a9655933 Fixed bug using SDL_WINDOWPOS_CENTERED with SDL_SetWindowPosition() Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	495 rect.origin.y = window->y;
4c28a9655933 Fixed bug using SDL_WINDOWPOS_CENTERED with SDL_SetWindowPosition() Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	496 }
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	497 rect.size.width = window->w;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	498 rect.size.height = window->h;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	499 ConvertNSRect(&rect);
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	500 rect = [nswindow frameRectForContentRect:rect];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	501 [nswindow setFrameOrigin:rect.origin];
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	502 [pool release];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	503 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	504
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	505 void
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	506 Cocoa_SetWindowSize(_THIS, SDL_Window * window)
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	507 {
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	508 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	509 NSWindow nswindow = ((SDL_WindowData ) window->driverdata)->window;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	510 NSSize size;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	511
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	512 size.width = window->w;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	513 size.height = window->h;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	514 [nswindow setContentSize:size];
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	515 [pool release];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	516 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	517
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	518 void
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	519 Cocoa_ShowWindow(_THIS, SDL_Window * window)
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	520 {
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	521 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	522 NSWindow nswindow = ((SDL_WindowData ) window->driverdata)->window;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	523
1956 ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	524 if (![nswindow isMiniaturized]) {
ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	525 [nswindow makeKeyAndOrderFront:nil];
ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	526 }
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	527 [pool release];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	528 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	529
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	530 void
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	531 Cocoa_HideWindow(_THIS, SDL_Window * window)
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	532 {
1956 ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	533 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	534 NSWindow nswindow = ((SDL_WindowData ) window->driverdata)->window;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	535
1956 ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	536 [nswindow orderOut:nil];
ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	537 [pool release];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	538 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	539
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	540 void
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	541 Cocoa_RaiseWindow(_THIS, SDL_Window * window)
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	542 {
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	543 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	544 NSWindow nswindow = ((SDL_WindowData ) window->driverdata)->window;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	545
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	546 [nswindow makeKeyAndOrderFront:nil];
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	547 [pool release];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	548 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	549
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	550 void
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	551 Cocoa_MaximizeWindow(_THIS, SDL_Window * window)
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	552 {
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	553 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	554 NSWindow nswindow = ((SDL_WindowData ) window->driverdata)->window;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	555
1956 ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	556 [nswindow zoom:nil];
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	557 [pool release];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	558 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	559
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	560 void
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	561 Cocoa_MinimizeWindow(_THIS, SDL_Window * window)
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	562 {
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	563 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	564 NSWindow nswindow = ((SDL_WindowData ) window->driverdata)->window;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	565
1956 ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	566 [nswindow miniaturize:nil];
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	567 [pool release];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	568 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	569
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	570 void
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	571 Cocoa_RestoreWindow(_THIS, SDL_Window * window)
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	572 {
1956 ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	573 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	574 NSWindow nswindow = ((SDL_WindowData ) window->driverdata)->window;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	575
1956 ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	576 if ([nswindow isMiniaturized]) {
ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	577 [nswindow deminiaturize:nil];
ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	578 } else if ([nswindow isZoomed]) {
ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	579 [nswindow zoom:nil];
ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	580 }
ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	581 [pool release];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	582 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	583
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	584 void
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	585 Cocoa_SetWindowGrab(_THIS, SDL_Window * window)
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	586 {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	587 if ((window->flags & SDL_WINDOW_INPUT_GRABBED) &&
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	588 (window->flags & SDL_WINDOW_INPUT_FOCUS)) {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	589 /* FIXME: Grab mouse */
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	590 } else {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	591 /* FIXME: Release mouse */
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	592 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	593 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	594
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	595 void
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	596 Cocoa_DestroyWindow(_THIS, SDL_Window * window)
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	597 {
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	598 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	599 SDL_WindowData data = (SDL_WindowData ) window->driverdata;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	600
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	601 if (data) {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	602 [data->listener close];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	603 [data->listener release];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	604 if (data->created) {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	605 [data->window close];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	606 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	607 SDL_free(data);
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	608 }
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	609 [pool release];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	610 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	611
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	612 SDL_bool
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	613 Cocoa_GetWindowWMInfo(_THIS, SDL_Window * window, SDL_SysWMinfo * info)
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	614 {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	615 NSWindow nswindow = ((SDL_WindowData ) window->driverdata)->window;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	616
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	617 if (info->version.major <= SDL_MAJOR_VERSION) {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	618 //info->window = nswindow;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	619 return SDL_TRUE;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	620 } else {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	621 SDL_SetError("Application not compiled with SDL %d.%d\n",
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	622 SDL_MAJOR_VERSION, SDL_MINOR_VERSION);
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	623 return SDL_FALSE;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	624 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	625 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	626
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	627 /* vi: set ts=4 sw=4 expandtab: */

Mercurial > sdl-ios-xcode

annotate src/video/cocoa/SDL_cocoawindow.m @ 3409:c8f580ebc96a