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

annotate src/video/cocoa/SDL_cocoawindow.m @ 4484:9322f7db8603

Cleaned up the mouse window focus handling: you always pass in the relative window when sending a mouse event. Fixed a bug where only mouse wheel up was sent on Mac OS X Fixed a bug where mouse window focus was getting hosed by the fullscreen mouse code on Mac OS X

author	Sam Lantinga <slouken@libsdl.org>
date	Mon, 05 Jul 2010 22:48:13 -0700
parents	3e69e077cb95
children	3d91e31fcf71

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 {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	34 r->origin.y = CGDisplayPixelsHigh(kCGDirectMainDisplay) - r->origin.y - r->size.height;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	35 }
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 @implementation Cocoa_WindowListener
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	38
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	39 - (void)listen:(SDL_WindowData *)data
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	40 {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	41 NSNotificationCenter *center;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	42
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	43 _data = data;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	44
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	45 center = [NSNotificationCenter defaultCenter];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	46
3688 6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	47 [_data->nswindow setNextResponder:self];
6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	48 if ([_data->nswindow delegate] != nil) {
6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	49 [center addObserver:self selector:@selector(windowDisExpose:) name:NSWindowDidExposeNotification object:_data->nswindow];
6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	50 [center addObserver:self selector:@selector(windowDidMove:) name:NSWindowDidMoveNotification object:_data->nswindow];
6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	51 [center addObserver:self selector:@selector(windowDidResize:) name:NSWindowDidResizeNotification object:_data->nswindow];
6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	52 [center addObserver:self selector:@selector(windowDidMiniaturize:) name:NSWindowDidMiniaturizeNotification object:_data->nswindow];
6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	53 [center addObserver:self selector:@selector(windowDidDeminiaturize:) name:NSWindowDidDeminiaturizeNotification object:_data->nswindow];
6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	54 [center addObserver:self selector:@selector(windowDidBecomeKey:) name:NSWindowDidBecomeKeyNotification object:_data->nswindow];
6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	55 [center addObserver:self selector:@selector(windowDidResignKey:) name:NSWindowDidResignKeyNotification object:_data->nswindow];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	56 } else {
3688 6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	57 [_data->nswindow setDelegate:self];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	58 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	59 [center addObserver:self selector:@selector(windowDidHide:) name:NSApplicationDidHideNotification object:NSApp];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	60 [center addObserver:self selector:@selector(windowDidUnhide:) name:NSApplicationDidUnhideNotification object:NSApp];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	61
3688 6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	62 [_data->nswindow setAcceptsMouseMovedEvents:YES];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	63 }
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 - (void)close
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	66 {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	67 NSNotificationCenter *center;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	68
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	69 center = [NSNotificationCenter defaultCenter];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	70
3688 6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	71 [_data->nswindow setNextResponder:nil];
6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	72 if ([_data->nswindow delegate] != self) {
6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	73 [center removeObserver:self name:NSWindowDidExposeNotification object:_data->nswindow];
6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	74 [center removeObserver:self name:NSWindowDidMoveNotification object:_data->nswindow];
6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	75 [center removeObserver:self name:NSWindowDidResizeNotification object:_data->nswindow];
6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	76 [center removeObserver:self name:NSWindowDidMiniaturizeNotification object:_data->nswindow];
6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	77 [center removeObserver:self name:NSWindowDidDeminiaturizeNotification object:_data->nswindow];
6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	78 [center removeObserver:self name:NSWindowDidBecomeKeyNotification object:_data->nswindow];
6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	79 [center removeObserver:self name:NSWindowDidResignKeyNotification object:_data->nswindow];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	80 } else {
3688 6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	81 [_data->nswindow setDelegate:nil];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	82 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	83 [center removeObserver:self name:NSApplicationDidHideNotification object:NSApp];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	84 [center removeObserver:self name:NSApplicationDidUnhideNotification object:NSApp];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	85 }
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 - (BOOL)windowShouldClose:(id)sender
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	88 {
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3530 diff changeset	89 SDL_SendWindowEvent(_data->window, SDL_WINDOWEVENT_CLOSE, 0, 0);
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	90 return NO;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	91 }
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 - (void)windowDidExpose:(NSNotification *)aNotification
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	94 {
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3530 diff changeset	95 SDL_SendWindowEvent(_data->window, SDL_WINDOWEVENT_EXPOSED, 0, 0);
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	96 }
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 - (void)windowDidMove:(NSNotification *)aNotification
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	99 {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	100 int x, y;
3688 6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	101 NSRect rect = [_data->nswindow contentRectForFrameRect:[_data->nswindow frame]];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	102 ConvertNSRect(&rect);
3507 3712547eac4f The window positions are relative to the origin of the windowing system (upper left of the primary display). Sam Lantinga <slouken@libsdl.org> parents: 3506 diff changeset	103 x = (int)rect.origin.x;
3712547eac4f The window positions are relative to the origin of the windowing system (upper left of the primary display). Sam Lantinga <slouken@libsdl.org> parents: 3506 diff changeset	104 y = (int)rect.origin.y;
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3530 diff changeset	105 SDL_SendWindowEvent(_data->window, SDL_WINDOWEVENT_MOVED, x, y);
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	106 }
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 - (void)windowDidResize:(NSNotification *)aNotification
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	109 {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	110 int w, h;
3688 6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	111 NSRect rect = [_data->nswindow contentRectForFrameRect:[_data->nswindow frame]];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	112 w = (int)rect.size.width;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	113 h = (int)rect.size.height;
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3530 diff changeset	114 SDL_SendWindowEvent(_data->window, SDL_WINDOWEVENT_RESIZED, w, h);
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	115 }
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 - (void)windowDidMiniaturize:(NSNotification *)aNotification
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	118 {
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3530 diff changeset	119 SDL_SendWindowEvent(_data->window, SDL_WINDOWEVENT_MINIMIZED, 0, 0);
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	120 }
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 - (void)windowDidDeminiaturize:(NSNotification *)aNotification
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	123 {
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3530 diff changeset	124 SDL_SendWindowEvent(_data->window, SDL_WINDOWEVENT_RESTORED, 0, 0);
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	125 }
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 - (void)windowDidBecomeKey:(NSNotification *)aNotification
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	128 {
2059 4685ccd33d0e Fixed mouse enter/leave events for a single window. Sam Lantinga <slouken@libsdl.org> parents: 1973 diff changeset	129 /* We're going to get keyboard events, since we're key. */
4465 3e69e077cb95 Removed multi-mouse / multi-keyboard support in anticipation of a real multi-mouse and multi-touch API. Sam Lantinga <slouken@libsdl.org> parents: 3688 diff changeset	130 SDL_SetKeyboardFocus(_data->window);
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	131 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	132
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	133 - (void)windowDidResignKey:(NSNotification *)aNotification
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	134 {
2059 4685ccd33d0e Fixed mouse enter/leave events for a single window. Sam Lantinga <slouken@libsdl.org> parents: 1973 diff changeset	135 /* Some other window will get mouse events, since we're not key. */
4465 3e69e077cb95 Removed multi-mouse / multi-keyboard support in anticipation of a real multi-mouse and multi-touch API. Sam Lantinga <slouken@libsdl.org> parents: 3688 diff changeset	136 if (SDL_GetMouseFocus() == _data->window) {
3e69e077cb95 Removed multi-mouse / multi-keyboard support in anticipation of a real multi-mouse and multi-touch API. Sam Lantinga <slouken@libsdl.org> parents: 3688 diff changeset	137 SDL_SetMouseFocus(NULL);
2059 4685ccd33d0e Fixed mouse enter/leave events for a single window. Sam Lantinga <slouken@libsdl.org> parents: 1973 diff changeset	138 }
4685ccd33d0e Fixed mouse enter/leave events for a single window. Sam Lantinga <slouken@libsdl.org> parents: 1973 diff changeset	139
4685ccd33d0e Fixed mouse enter/leave events for a single window. Sam Lantinga <slouken@libsdl.org> parents: 1973 diff changeset	140 /* Some other window will get keyboard events, since we're not key. */
4465 3e69e077cb95 Removed multi-mouse / multi-keyboard support in anticipation of a real multi-mouse and multi-touch API. Sam Lantinga <slouken@libsdl.org> parents: 3688 diff changeset	141 if (SDL_GetKeyboardFocus() == _data->window) {
3e69e077cb95 Removed multi-mouse / multi-keyboard support in anticipation of a real multi-mouse and multi-touch API. Sam Lantinga <slouken@libsdl.org> parents: 3688 diff changeset	142 SDL_SetKeyboardFocus(NULL);
3e69e077cb95 Removed multi-mouse / multi-keyboard support in anticipation of a real multi-mouse and multi-touch API. Sam Lantinga <slouken@libsdl.org> parents: 3688 diff changeset	143 }
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	144 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	145
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	146 - (void)windowDidHide:(NSNotification *)aNotification
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	147 {
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3530 diff changeset	148 SDL_SendWindowEvent(_data->window, SDL_WINDOWEVENT_HIDDEN, 0, 0);
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	149 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	150
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	151 - (void)windowDidUnhide:(NSNotification *)aNotification
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	152 {
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3530 diff changeset	153 SDL_SendWindowEvent(_data->window, SDL_WINDOWEVENT_SHOWN, 0, 0);
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	154 }
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 - (void)mouseDown:(NSEvent *)theEvent
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	157 {
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	158 int button;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	159
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	160 switch ([theEvent buttonNumber]) {
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	161 case 0:
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	162 button = SDL_BUTTON_LEFT;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	163 break;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	164 case 1:
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	165 button = SDL_BUTTON_RIGHT;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	166 break;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	167 case 2:
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	168 button = SDL_BUTTON_MIDDLE;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	169 break;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	170 default:
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	171 button = [theEvent buttonNumber];
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	172 break;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	173 }
4484 9322f7db8603 Cleaned up the mouse window focus handling: you always pass in the relative window when sending a mouse event. Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	174 SDL_SendMouseButton(_data->window, SDL_PRESSED, button);
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	175 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	176
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	177 - (void)rightMouseDown:(NSEvent *)theEvent
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	178 {
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	179 [self mouseDown:theEvent];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	180 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	181
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	182 - (void)otherMouseDown:(NSEvent *)theEvent
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	183 {
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	184 [self mouseDown:theEvent];
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)mouseUp:(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 int button;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	190
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	191 switch ([theEvent buttonNumber]) {
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	192 case 0:
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	193 button = SDL_BUTTON_LEFT;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	194 break;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	195 case 1:
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	196 button = SDL_BUTTON_RIGHT;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	197 break;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	198 case 2:
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	199 button = SDL_BUTTON_MIDDLE;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	200 break;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	201 default:
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	202 button = [theEvent buttonNumber];
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	203 break;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	204 }
4484 9322f7db8603 Cleaned up the mouse window focus handling: you always pass in the relative window when sending a mouse event. Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	205 SDL_SendMouseButton(_data->window, SDL_RELEASED, button);
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	206 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	207
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	208 - (void)rightMouseUp:(NSEvent *)theEvent
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	209 {
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	210 [self mouseUp:theEvent];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	211 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	212
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	213 - (void)otherMouseUp:(NSEvent *)theEvent
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	214 {
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	215 [self mouseUp:theEvent];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	216 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	217
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	218 - (void)mouseMoved:(NSEvent *)theEvent
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	219 {
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3530 diff changeset	220 SDL_Window *window = _data->window;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	221 NSPoint point;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	222
3517 e7eec78e4b92 Fixed mouse events for fullscreen windows on Mac OS X Sam Lantinga <slouken@libsdl.org> parents: 3509 diff changeset	223 point = [theEvent locationInWindow];
e7eec78e4b92 Fixed mouse events for fullscreen windows on Mac OS X Sam Lantinga <slouken@libsdl.org> parents: 3509 diff changeset	224 point.y = window->h - point.y;
3507 3712547eac4f The window positions are relative to the origin of the windowing system (upper left of the primary display). Sam Lantinga <slouken@libsdl.org> parents: 3506 diff changeset	225 if ( point.x < 0 \|\| point.x >= window->w \|\|
3712547eac4f The window positions are relative to the origin of the windowing system (upper left of the primary display). Sam Lantinga <slouken@libsdl.org> parents: 3506 diff changeset	226 point.y < 0 \|\| point.y >= window->h ) {
4465 3e69e077cb95 Removed multi-mouse / multi-keyboard support in anticipation of a real multi-mouse and multi-touch API. Sam Lantinga <slouken@libsdl.org> parents: 3688 diff changeset	227 if (SDL_GetMouseFocus() == window) {
3e69e077cb95 Removed multi-mouse / multi-keyboard support in anticipation of a real multi-mouse and multi-touch API. Sam Lantinga <slouken@libsdl.org> parents: 3688 diff changeset	228 SDL_SetMouseFocus(NULL);
2059 4685ccd33d0e Fixed mouse enter/leave events for a single window. Sam Lantinga <slouken@libsdl.org> parents: 1973 diff changeset	229 }
4685ccd33d0e Fixed mouse enter/leave events for a single window. Sam Lantinga <slouken@libsdl.org> parents: 1973 diff changeset	230 } else {
4484 9322f7db8603 Cleaned up the mouse window focus handling: you always pass in the relative window when sending a mouse event. Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	231 SDL_SendMouseMotion(window, 0, (int)point.x, (int)point.y);
2059 4685ccd33d0e Fixed mouse enter/leave events for a single window. Sam Lantinga <slouken@libsdl.org> parents: 1973 diff changeset	232 }
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	233 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	234
1957 c7803e4c21d3 Implemented Cocoa mouse wheel events Sam Lantinga <slouken@libsdl.org> parents: 1956 diff changeset	235 - (void)mouseDragged:(NSEvent *)theEvent
c7803e4c21d3 Implemented Cocoa mouse wheel events Sam Lantinga <slouken@libsdl.org> parents: 1956 diff changeset	236 {
c7803e4c21d3 Implemented Cocoa mouse wheel events Sam Lantinga <slouken@libsdl.org> parents: 1956 diff changeset	237 [self mouseMoved:theEvent];
c7803e4c21d3 Implemented Cocoa mouse wheel events Sam Lantinga <slouken@libsdl.org> parents: 1956 diff changeset	238 }
c7803e4c21d3 Implemented Cocoa mouse wheel events Sam Lantinga <slouken@libsdl.org> parents: 1956 diff changeset	239
1958 5fc6fb0fb605 Added right/other drag code for Cocoa windows Sam Lantinga <slouken@libsdl.org> parents: 1957 diff changeset	240 - (void)rightMouseDragged:(NSEvent *)theEvent
5fc6fb0fb605 Added right/other drag code for Cocoa windows Sam Lantinga <slouken@libsdl.org> parents: 1957 diff changeset	241 {
5fc6fb0fb605 Added right/other drag code for Cocoa windows Sam Lantinga <slouken@libsdl.org> parents: 1957 diff changeset	242 [self mouseMoved:theEvent];
5fc6fb0fb605 Added right/other drag code for Cocoa windows Sam Lantinga <slouken@libsdl.org> parents: 1957 diff changeset	243 }
5fc6fb0fb605 Added right/other drag code for Cocoa windows Sam Lantinga <slouken@libsdl.org> parents: 1957 diff changeset	244
5fc6fb0fb605 Added right/other drag code for Cocoa windows Sam Lantinga <slouken@libsdl.org> parents: 1957 diff changeset	245 - (void)otherMouseDragged:(NSEvent *)theEvent
5fc6fb0fb605 Added right/other drag code for Cocoa windows Sam Lantinga <slouken@libsdl.org> parents: 1957 diff changeset	246 {
5fc6fb0fb605 Added right/other drag code for Cocoa windows Sam Lantinga <slouken@libsdl.org> parents: 1957 diff changeset	247 [self mouseMoved:theEvent];
5fc6fb0fb605 Added right/other drag code for Cocoa windows Sam Lantinga <slouken@libsdl.org> parents: 1957 diff changeset	248 }
5fc6fb0fb605 Added right/other drag code for Cocoa windows Sam Lantinga <slouken@libsdl.org> parents: 1957 diff changeset	249
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	250 - (void)scrollWheel:(NSEvent *)theEvent
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	251 {
4484 9322f7db8603 Cleaned up the mouse window focus handling: you always pass in the relative window when sending a mouse event. Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	252 float x = [theEvent deltaX];
9322f7db8603 Cleaned up the mouse window focus handling: you always pass in the relative window when sending a mouse event. Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	253 float y = [theEvent deltaY];
9322f7db8603 Cleaned up the mouse window focus handling: you always pass in the relative window when sending a mouse event. Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	254
9322f7db8603 Cleaned up the mouse window focus handling: you always pass in the relative window when sending a mouse event. Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	255 if (x > 0) {
9322f7db8603 Cleaned up the mouse window focus handling: you always pass in the relative window when sending a mouse event. Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	256 x += 0.9f;
9322f7db8603 Cleaned up the mouse window focus handling: you always pass in the relative window when sending a mouse event. Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	257 } else if (x < 0) {
9322f7db8603 Cleaned up the mouse window focus handling: you always pass in the relative window when sending a mouse event. Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	258 x -= 0.9f;
9322f7db8603 Cleaned up the mouse window focus handling: you always pass in the relative window when sending a mouse event. Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	259 }
9322f7db8603 Cleaned up the mouse window focus handling: you always pass in the relative window when sending a mouse event. Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	260 if (y > 0) {
9322f7db8603 Cleaned up the mouse window focus handling: you always pass in the relative window when sending a mouse event. Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	261 y += 0.9f;
9322f7db8603 Cleaned up the mouse window focus handling: you always pass in the relative window when sending a mouse event. Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	262 } else if (y < 0) {
9322f7db8603 Cleaned up the mouse window focus handling: you always pass in the relative window when sending a mouse event. Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	263 y -= 0.9f;
9322f7db8603 Cleaned up the mouse window focus handling: you always pass in the relative window when sending a mouse event. Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	264 }
9322f7db8603 Cleaned up the mouse window focus handling: you always pass in the relative window when sending a mouse event. Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	265 SDL_SendMouseWheel(_data->window, (int)x, (int)y);
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	266 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	267
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	268 @end
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	269
1973 81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	270 @interface SDLWindow : NSWindow
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	271 /* These are needed for borderless/fullscreen windows */
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	272 - (BOOL)canBecomeKeyWindow;
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	273 - (BOOL)canBecomeMainWindow;
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	274 @end
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	275
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	276 @implementation SDLWindow
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	277 - (BOOL)canBecomeKeyWindow
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	278 {
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	279 return YES;
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	280 }
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	281
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	282 - (BOOL)canBecomeMainWindow
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	283 {
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	284 return YES;
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	285 }
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	286 @end
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	287
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	288 static int
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: 1937 diff changeset	289 SetupWindowData(_THIS, SDL_Window * window, NSWindow *nswindow, SDL_bool created)
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	290 {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	291 NSAutoreleasePool *pool;
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: 1937 diff changeset	292 SDL_VideoData videodata = (SDL_VideoData ) _this->driverdata;
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3530 diff changeset	293 SDL_VideoDisplay *display = window->display;
3530 e96be66e3673 The window position is display relative, at least for now... Sam Lantinga <slouken@libsdl.org> parents: 3529 diff changeset	294 SDL_DisplayData displaydata = (SDL_DisplayData ) display->driverdata;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	295 SDL_WindowData *data;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	296
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	297 /* Allocate the window data */
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	298 data = (SDL_WindowData ) SDL_malloc(sizeof(data));
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	299 if (!data) {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	300 SDL_OutOfMemory();
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	301 return -1;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	302 }
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3530 diff changeset	303 data->window = window;
3688 6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	304 data->nswindow = nswindow;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	305 data->created = created;
3506 e829b6098435 Added support for placing windows on different displays Sam Lantinga <slouken@libsdl.org> parents: 3414 diff changeset	306 data->display = displaydata->display;
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: 1937 diff changeset	307 data->videodata = videodata;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	308
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	309 pool = [[NSAutoreleasePool alloc] init];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	310
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	311 /* Create an event listener for the window */
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	312 data->listener = [[Cocoa_WindowListener alloc] init];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	313 [data->listener listen:data];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	314
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	315 /* Fill in the SDL window with the window data */
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	316 {
3530 e96be66e3673 The window position is display relative, at least for now... Sam Lantinga <slouken@libsdl.org> parents: 3529 diff changeset	317 SDL_Rect bounds;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	318 NSRect rect = [nswindow contentRectForFrameRect:[nswindow frame]];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	319 ConvertNSRect(&rect);
3530 e96be66e3673 The window position is display relative, at least for now... Sam Lantinga <slouken@libsdl.org> parents: 3529 diff changeset	320 Cocoa_GetDisplayBounds(_this, display, &bounds);
e96be66e3673 The window position is display relative, at least for now... Sam Lantinga <slouken@libsdl.org> parents: 3529 diff changeset	321 window->x = (int)rect.origin.x - bounds.x;
e96be66e3673 The window position is display relative, at least for now... Sam Lantinga <slouken@libsdl.org> parents: 3529 diff changeset	322 window->y = (int)rect.origin.y - bounds.y;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	323 window->w = (int)rect.size.width;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	324 window->h = (int)rect.size.height;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	325 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	326 if ([nswindow isVisible]) {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	327 window->flags \|= SDL_WINDOW_SHOWN;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	328 } else {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	329 window->flags &= ~SDL_WINDOW_SHOWN;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	330 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	331 {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	332 unsigned int style = [nswindow styleMask];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	333
1956 ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	334 if ((style & ~NSResizableWindowMask) == NSBorderlessWindowMask) {
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	335 window->flags \|= SDL_WINDOW_BORDERLESS;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	336 } else {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	337 window->flags &= ~SDL_WINDOW_BORDERLESS;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	338 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	339 if (style & NSResizableWindowMask) {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	340 window->flags \|= SDL_WINDOW_RESIZABLE;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	341 } else {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	342 window->flags &= ~SDL_WINDOW_RESIZABLE;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	343 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	344 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	345 if ([nswindow isZoomed]) {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	346 window->flags \|= SDL_WINDOW_MAXIMIZED;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	347 } else {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	348 window->flags &= ~SDL_WINDOW_MAXIMIZED;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	349 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	350 if ([nswindow isMiniaturized]) {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	351 window->flags \|= SDL_WINDOW_MINIMIZED;
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_MINIMIZED;
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 ([nswindow isKeyWindow]) {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	356 window->flags \|= SDL_WINDOW_INPUT_FOCUS;
4465 3e69e077cb95 Removed multi-mouse / multi-keyboard support in anticipation of a real multi-mouse and multi-touch API. Sam Lantinga <slouken@libsdl.org> parents: 3688 diff changeset	357 SDL_SetKeyboardFocus(data->window);
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	358
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	359 if (window->flags & SDL_WINDOW_INPUT_GRABBED) {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	360 /* FIXME */
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	361 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	362 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	363
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	364 /* All done! */
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	365 [pool release];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	366 window->driverdata = data;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	367 return 0;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	368 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	369
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	370 int
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	371 Cocoa_CreateWindow(_THIS, SDL_Window * window)
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	372 {
3506 e829b6098435 Added support for placing windows on different displays Sam Lantinga <slouken@libsdl.org> parents: 3414 diff changeset	373 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	374 NSWindow *nswindow;
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3530 diff changeset	375 SDL_VideoDisplay *display = window->display;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	376 NSRect rect;
3528 59ff7a2beb57 Added an API function to query geometry of multiple monitors: Sam Lantinga <slouken@libsdl.org> parents: 3525 diff changeset	377 SDL_Rect bounds;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	378 unsigned int style;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	379
3528 59ff7a2beb57 Added an API function to query geometry of multiple monitors: Sam Lantinga <slouken@libsdl.org> parents: 3525 diff changeset	380 Cocoa_GetDisplayBounds(_this, display, &bounds);
3075 4c28a9655933 Fixed bug using SDL_WINDOWPOS_CENTERED with SDL_SetWindowPosition() Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	381 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	382 \|\| window->x == SDL_WINDOWPOS_CENTERED) {
3528 59ff7a2beb57 Added an API function to query geometry of multiple monitors: Sam Lantinga <slouken@libsdl.org> parents: 3525 diff changeset	383 rect.origin.x = bounds.x + (bounds.w - window->w) / 2;
59ff7a2beb57 Added an API function to query geometry of multiple monitors: Sam Lantinga <slouken@libsdl.org> parents: 3525 diff changeset	384 } else if (window->x == SDL_WINDOWPOS_UNDEFINED) {
59ff7a2beb57 Added an API function to query geometry of multiple monitors: Sam Lantinga <slouken@libsdl.org> parents: 3525 diff changeset	385 rect.origin.x = bounds.x;
59ff7a2beb57 Added an API function to query geometry of multiple monitors: Sam Lantinga <slouken@libsdl.org> parents: 3525 diff changeset	386 } else {
3530 e96be66e3673 The window position is display relative, at least for now... Sam Lantinga <slouken@libsdl.org> parents: 3529 diff changeset	387 rect.origin.x = bounds.x + window->x;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	388 }
3075 4c28a9655933 Fixed bug using SDL_WINDOWPOS_CENTERED with SDL_SetWindowPosition() Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	389 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	390 \|\| window->y == SDL_WINDOWPOS_CENTERED) {
3528 59ff7a2beb57 Added an API function to query geometry of multiple monitors: Sam Lantinga <slouken@libsdl.org> parents: 3525 diff changeset	391 rect.origin.y = bounds.y + (bounds.h - window->h) / 2;
59ff7a2beb57 Added an API function to query geometry of multiple monitors: Sam Lantinga <slouken@libsdl.org> parents: 3525 diff changeset	392 } else if (window->x == SDL_WINDOWPOS_UNDEFINED) {
59ff7a2beb57 Added an API function to query geometry of multiple monitors: Sam Lantinga <slouken@libsdl.org> parents: 3525 diff changeset	393 rect.origin.y = bounds.y;
59ff7a2beb57 Added an API function to query geometry of multiple monitors: Sam Lantinga <slouken@libsdl.org> parents: 3525 diff changeset	394 } else {
3530 e96be66e3673 The window position is display relative, at least for now... Sam Lantinga <slouken@libsdl.org> parents: 3529 diff changeset	395 rect.origin.y = bounds.y + window->y;
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 rect.size.width = window->w;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	398 rect.size.height = window->h;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	399 ConvertNSRect(&rect);
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	400
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	401 if (window->flags & SDL_WINDOW_BORDERLESS) {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	402 style = NSBorderlessWindowMask;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	403 } else {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	404 style = (NSTitledWindowMask\|NSClosableWindowMask\|NSMiniaturizableWindowMask);
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	405 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	406 if (window->flags & SDL_WINDOW_RESIZABLE) {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	407 style \|= NSResizableWindowMask;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	408 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	409
3506 e829b6098435 Added support for placing windows on different displays Sam Lantinga <slouken@libsdl.org> parents: 3414 diff changeset	410 /* Figure out which screen to place this window */
e829b6098435 Added support for placing windows on different displays Sam Lantinga <slouken@libsdl.org> parents: 3414 diff changeset	411 NSArray *screens = [NSScreen screens];
e829b6098435 Added support for placing windows on different displays Sam Lantinga <slouken@libsdl.org> parents: 3414 diff changeset	412 NSScreen *screen = nil;
e829b6098435 Added support for placing windows on different displays Sam Lantinga <slouken@libsdl.org> parents: 3414 diff changeset	413 NSScreen *candidate;
3525 455a6c47d2c6 Fixed compilation on Mac OS X 10.4 Sam Lantinga <slouken@libsdl.org> parents: 3517 diff changeset	414 int i, count = [screens count];
455a6c47d2c6 Fixed compilation on Mac OS X 10.4 Sam Lantinga <slouken@libsdl.org> parents: 3517 diff changeset	415 for (i = 0; i < count; ++i) {
3529 09155ec3e291 Fixed crash Sam Lantinga <slouken@libsdl.org> parents: 3528 diff changeset	416 candidate = [screens objectAtIndex:i];
3506 e829b6098435 Added support for placing windows on different displays Sam Lantinga <slouken@libsdl.org> parents: 3414 diff changeset	417 NSRect screenRect = [candidate frame];
e829b6098435 Added support for placing windows on different displays Sam Lantinga <slouken@libsdl.org> parents: 3414 diff changeset	418 if (rect.origin.x >= screenRect.origin.x &&
e829b6098435 Added support for placing windows on different displays Sam Lantinga <slouken@libsdl.org> parents: 3414 diff changeset	419 rect.origin.x < screenRect.origin.x + screenRect.size.width &&
e829b6098435 Added support for placing windows on different displays Sam Lantinga <slouken@libsdl.org> parents: 3414 diff changeset	420 rect.origin.y >= screenRect.origin.y &&
e829b6098435 Added support for placing windows on different displays Sam Lantinga <slouken@libsdl.org> parents: 3414 diff changeset	421 rect.origin.y < screenRect.origin.y + screenRect.size.height) {
e829b6098435 Added support for placing windows on different displays Sam Lantinga <slouken@libsdl.org> parents: 3414 diff changeset	422 screen = candidate;
e829b6098435 Added support for placing windows on different displays Sam Lantinga <slouken@libsdl.org> parents: 3414 diff changeset	423 rect.origin.x -= screenRect.origin.x;
e829b6098435 Added support for placing windows on different displays Sam Lantinga <slouken@libsdl.org> parents: 3414 diff changeset	424 rect.origin.y -= screenRect.origin.y;
e829b6098435 Added support for placing windows on different displays Sam Lantinga <slouken@libsdl.org> parents: 3414 diff changeset	425 }
e829b6098435 Added support for placing windows on different displays Sam Lantinga <slouken@libsdl.org> parents: 3414 diff changeset	426 }
e829b6098435 Added support for placing windows on different displays Sam Lantinga <slouken@libsdl.org> parents: 3414 diff changeset	427 nswindow = [[SDLWindow alloc] initWithContentRect:rect styleMask:style backing:NSBackingStoreBuffered defer:FALSE screen:screen];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	428
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	429 [pool release];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	430
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: 1937 diff changeset	431 if (SetupWindowData(_this, window, nswindow, SDL_TRUE) < 0) {
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	432 [nswindow release];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	433 return -1;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	434 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	435 return 0;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	436 }
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 int
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	439 Cocoa_CreateWindowFrom(_THIS, SDL_Window * window, const void *data)
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	440 {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	441 NSAutoreleasePool *pool;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	442 NSWindow nswindow = (NSWindow ) data;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	443 NSString *title;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	444
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	445 pool = [[NSAutoreleasePool alloc] init];
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 /* Query the title from the existing window */
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	448 title = [nswindow title];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	449 if (title) {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	450 window->title = SDL_strdup([title UTF8String]);
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	451 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	452
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	453 [pool release];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	454
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: 1937 diff changeset	455 return SetupWindowData(_this, window, nswindow, SDL_FALSE);
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	456 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	457
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	458 void
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	459 Cocoa_SetWindowTitle(_THIS, SDL_Window * window)
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	460 {
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	461 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
3688 6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	462 NSWindow nswindow = ((SDL_WindowData ) window->driverdata)->nswindow;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	463 NSString *string;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	464
1956 ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	465 if(window->title) {
ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	466 string = [[NSString alloc] initWithUTF8String:window->title];
ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	467 } else {
ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	468 string = [[NSString alloc] init];
ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	469 }
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	470 [nswindow setTitle:string];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	471 [string release];
1956 ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	472
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	473 [pool release];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	474 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	475
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	476 void
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	477 Cocoa_SetWindowPosition(_THIS, SDL_Window * window)
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	478 {
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	479 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
3688 6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	480 NSWindow nswindow = ((SDL_WindowData ) window->driverdata)->nswindow;
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3530 diff changeset	481 SDL_VideoDisplay *display = window->display;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	482 NSRect rect;
3528 59ff7a2beb57 Added an API function to query geometry of multiple monitors: Sam Lantinga <slouken@libsdl.org> parents: 3525 diff changeset	483 SDL_Rect bounds;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	484
3528 59ff7a2beb57 Added an API function to query geometry of multiple monitors: Sam Lantinga <slouken@libsdl.org> parents: 3525 diff changeset	485 Cocoa_GetDisplayBounds(_this, display, &bounds);
3075 4c28a9655933 Fixed bug using SDL_WINDOWPOS_CENTERED with SDL_SetWindowPosition() Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	486 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	487 \|\| window->x == SDL_WINDOWPOS_CENTERED) {
3528 59ff7a2beb57 Added an API function to query geometry of multiple monitors: Sam Lantinga <slouken@libsdl.org> parents: 3525 diff changeset	488 rect.origin.x = bounds.x + (bounds.w - window->w) / 2;
3075 4c28a9655933 Fixed bug using SDL_WINDOWPOS_CENTERED with SDL_SetWindowPosition() Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	489 } else {
3530 e96be66e3673 The window position is display relative, at least for now... Sam Lantinga <slouken@libsdl.org> parents: 3529 diff changeset	490 rect.origin.x = bounds.x + window->x;
3075 4c28a9655933 Fixed bug using SDL_WINDOWPOS_CENTERED with SDL_SetWindowPosition() Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	491 }
4c28a9655933 Fixed bug using SDL_WINDOWPOS_CENTERED with SDL_SetWindowPosition() Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	492 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	493 \|\| window->y == SDL_WINDOWPOS_CENTERED) {
3528 59ff7a2beb57 Added an API function to query geometry of multiple monitors: Sam Lantinga <slouken@libsdl.org> parents: 3525 diff changeset	494 rect.origin.y = bounds.y + (bounds.h - window->h) / 2;
3075 4c28a9655933 Fixed bug using SDL_WINDOWPOS_CENTERED with SDL_SetWindowPosition() Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	495 } else {
3530 e96be66e3673 The window position is display relative, at least for now... Sam Lantinga <slouken@libsdl.org> parents: 3529 diff changeset	496 rect.origin.y = bounds.y + window->y;
3075 4c28a9655933 Fixed bug using SDL_WINDOWPOS_CENTERED with SDL_SetWindowPosition() Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	497 }
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	498 rect.size.width = window->w;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	499 rect.size.height = window->h;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	500 ConvertNSRect(&rect);
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	501 rect = [nswindow frameRectForContentRect:rect];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	502 [nswindow setFrameOrigin:rect.origin];
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	503 [pool release];
1933 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
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	506 void
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	507 Cocoa_SetWindowSize(_THIS, SDL_Window * window)
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	508 {
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	509 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
3688 6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	510 NSWindow nswindow = ((SDL_WindowData ) window->driverdata)->nswindow;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	511 NSSize size;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	512
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	513 size.width = window->w;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	514 size.height = window->h;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	515 [nswindow setContentSize:size];
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	516 [pool release];
1933 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
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	519 void
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	520 Cocoa_ShowWindow(_THIS, SDL_Window * window)
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	521 {
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	522 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
3688 6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	523 NSWindow nswindow = ((SDL_WindowData ) window->driverdata)->nswindow;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	524
1956 ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	525 if (![nswindow isMiniaturized]) {
ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	526 [nswindow makeKeyAndOrderFront:nil];
ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	527 }
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	528 [pool release];
1933 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
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	531 void
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	532 Cocoa_HideWindow(_THIS, SDL_Window * window)
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	533 {
1956 ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	534 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
3688 6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	535 NSWindow nswindow = ((SDL_WindowData ) window->driverdata)->nswindow;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	536
1956 ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	537 [nswindow orderOut:nil];
ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	538 [pool release];
1933 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
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	541 void
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	542 Cocoa_RaiseWindow(_THIS, SDL_Window * window)
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	543 {
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	544 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
3688 6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	545 NSWindow nswindow = ((SDL_WindowData ) window->driverdata)->nswindow;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	546
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	547 [nswindow makeKeyAndOrderFront:nil];
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	548 [pool release];
1933 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
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	551 void
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	552 Cocoa_MaximizeWindow(_THIS, SDL_Window * window)
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	553 {
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	554 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
3688 6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	555 NSWindow nswindow = ((SDL_WindowData ) window->driverdata)->nswindow;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	556
1956 ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	557 [nswindow zoom:nil];
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	558 [pool release];
1933 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
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	561 void
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	562 Cocoa_MinimizeWindow(_THIS, SDL_Window * window)
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	563 {
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	564 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
3688 6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	565 NSWindow nswindow = ((SDL_WindowData ) window->driverdata)->nswindow;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	566
1956 ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	567 [nswindow miniaturize:nil];
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	568 [pool release];
1933 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
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	571 void
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	572 Cocoa_RestoreWindow(_THIS, SDL_Window * window)
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	573 {
1956 ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	574 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
3688 6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	575 NSWindow nswindow = ((SDL_WindowData ) window->driverdata)->nswindow;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	576
1956 ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	577 if ([nswindow isMiniaturized]) {
ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	578 [nswindow deminiaturize:nil];
ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	579 } else if ([nswindow isZoomed]) {
ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	580 [nswindow zoom:nil];
ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	581 }
ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	582 [pool release];
1933 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
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	585 void
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	586 Cocoa_SetWindowGrab(_THIS, SDL_Window * window)
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	587 {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	588 if ((window->flags & SDL_WINDOW_INPUT_GRABBED) &&
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	589 (window->flags & SDL_WINDOW_INPUT_FOCUS)) {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	590 /* FIXME: Grab mouse */
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	591 } else {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	592 /* FIXME: Release mouse */
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
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	596 void
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	597 Cocoa_DestroyWindow(_THIS, SDL_Window * window)
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	598 {
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	599 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	600 SDL_WindowData data = (SDL_WindowData ) window->driverdata;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	601
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	602 if (data) {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	603 [data->listener close];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	604 [data->listener release];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	605 if (data->created) {
3688 6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	606 [data->nswindow close];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	607 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	608 SDL_free(data);
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	609 }
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	610 [pool release];
1933 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
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	613 SDL_bool
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	614 Cocoa_GetWindowWMInfo(_THIS, SDL_Window * window, SDL_SysWMinfo * info)
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	615 {
4465 3e69e077cb95 Removed multi-mouse / multi-keyboard support in anticipation of a real multi-mouse and multi-touch API. Sam Lantinga <slouken@libsdl.org> parents: 3688 diff changeset	616 //NSWindow nswindow = ((SDL_WindowData ) window->driverdata)->nswindow;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	617
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	618 if (info->version.major <= SDL_MAJOR_VERSION) {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	619 //info->window = nswindow;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	620 return SDL_TRUE;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	621 } else {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	622 SDL_SetError("Application not compiled with SDL %d.%d\n",
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	623 SDL_MAJOR_VERSION, SDL_MINOR_VERSION);
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	624 return SDL_FALSE;
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
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	628 /* vi: set ts=4 sw=4 expandtab: */

Mercurial > sdl-ios-xcode

annotate src/video/cocoa/SDL_cocoawindow.m @ 4484:9322f7db8603