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

annotate src/video/cocoa/SDL_cocoawindow.m @ 5254:7a963be087ef

Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. There are still some problems with the ConvertNSRect() calculations when switching video modes, which causes wierd window positioning issues, and the fullscreen window is still minimized on exit.

author	Sam Lantinga <slouken@libsdl.org>
date	Fri, 11 Feb 2011 00:25:44 -0800
parents	58265e606e4e
children	9e70b360f423

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
4498 3d91e31fcf71 I missed the Objective C files when updating the copyright date... Sam Lantinga <slouken@libsdl.org> parents: 4484 diff changeset	3 Copyright (C) 1997-2010 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"
4673 c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	28 #include "../../events/SDL_touch_c.h"
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	29 #include "../../events/SDL_windowevents_c.h"
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	30 #include "SDL_cocoavideo.h"
4811 d79939f20c45 Working on Cocoa implementation. Eli Gottlieb <eligottlieb@gmail.com> parents: 3688 diff changeset	31 #include "SDL_cocoashape.h"
5057 bdff53ed6c8b Fix mouse wheel events in fullscreen mode for OS X Jjgod Jiang <gzjjgod@gmail.com> parents: 5056 diff changeset	32 #include "SDL_cocoamouse.h"
1933 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 static __inline__ void ConvertNSRect(NSRect *r)
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 r->origin.y = CGDisplayPixelsHigh(kCGDirectMainDisplay) - r->origin.y - r->size.height;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	37 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	38
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	39 @implementation Cocoa_WindowListener
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 - (void)listen:(SDL_WindowData *)data
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 NSNotificationCenter *center;
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 _data = data;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	46
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	47 center = [NSNotificationCenter defaultCenter];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	48
3688 6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	49 [_data->nswindow setNextResponder:self];
6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	50 if ([_data->nswindow delegate] != nil) {
6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	51 [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	52 [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	53 [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	54 [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	55 [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	56 [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	57 [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	58 } else {
3688 6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	59 [_data->nswindow setDelegate:self];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	60 }
4927 d716dff4b13e Fixed touch events on Mac OS X 10.6 Sam Lantinga <slouken@libsdl.org> parents: 4925 diff changeset	61 // FIXME: Why doesn't this work?
d716dff4b13e Fixed touch events on Mac OS X 10.6 Sam Lantinga <slouken@libsdl.org> parents: 4925 diff changeset	62 // [center addObserver:self selector:@selector(rightMouseDown:) name:[NSString stringWithCString:"rightMouseDown" encoding:NSUTF8StringEncoding] object:[_data->nswindow contentView]];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	63 [center addObserver:self selector:@selector(windowDidHide:) name:NSApplicationDidHideNotification object:NSApp];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	64 [center addObserver:self selector:@selector(windowDidUnhide:) name:NSApplicationDidUnhideNotification object:NSApp];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	65
3688 6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	66 [_data->nswindow setAcceptsMouseMovedEvents:YES];
4927 d716dff4b13e Fixed touch events on Mac OS X 10.6 Sam Lantinga <slouken@libsdl.org> parents: 4925 diff changeset	67 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
4673 c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	68 [[_data->nswindow contentView] setAcceptsTouchEvents:YES];
4925 514f811a4887 Removed support for 10.3.9 Sam Lantinga <slouken@libsdl.org> parents: 4915 diff changeset	69 #endif
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	70 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	71
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	72 - (void)close
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	73 {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	74 NSNotificationCenter *center;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	75
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	76 center = [NSNotificationCenter defaultCenter];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	77
3688 6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	78 [_data->nswindow setNextResponder:nil];
6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	79 if ([_data->nswindow delegate] != self) {
6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	80 [center removeObserver:self name:NSWindowDidExposeNotification object:_data->nswindow];
6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	81 [center removeObserver:self name:NSWindowDidMoveNotification object:_data->nswindow];
6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	82 [center removeObserver:self name:NSWindowDidResizeNotification object:_data->nswindow];
6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	83 [center removeObserver:self name:NSWindowDidMiniaturizeNotification object:_data->nswindow];
6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	84 [center removeObserver:self name:NSWindowDidDeminiaturizeNotification object:_data->nswindow];
6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	85 [center removeObserver:self name:NSWindowDidBecomeKeyNotification object:_data->nswindow];
6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	86 [center removeObserver:self name:NSWindowDidResignKeyNotification object:_data->nswindow];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	87 } else {
3688 6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	88 [_data->nswindow setDelegate:nil];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	89 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	90 [center removeObserver:self name:NSApplicationDidHideNotification object:NSApp];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	91 [center removeObserver:self name:NSApplicationDidUnhideNotification object:NSApp];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	92 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	93
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	94 - (BOOL)windowShouldClose:(id)sender
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	95 {
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	96 SDL_SendWindowEvent(_data->window, SDL_WINDOWEVENT_CLOSE, 0, 0);
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	97 return NO;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	98 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	99
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	100 - (void)windowDidExpose:(NSNotification *)aNotification
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	101 {
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	102 SDL_SendWindowEvent(_data->window, SDL_WINDOWEVENT_EXPOSED, 0, 0);
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	103 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	104
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	105 - (void)windowDidMove:(NSNotification *)aNotification
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 int x, y;
3688 6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	108 NSRect rect = [_data->nswindow contentRectForFrameRect:[_data->nswindow frame]];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	109 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	110 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	111 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	112 SDL_SendWindowEvent(_data->window, SDL_WINDOWEVENT_MOVED, x, y);
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	113 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	114
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	115 - (void)windowDidResize:(NSNotification *)aNotification
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 int w, h;
3688 6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	118 NSRect rect = [_data->nswindow contentRectForFrameRect:[_data->nswindow frame]];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	119 w = (int)rect.size.width;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	120 h = (int)rect.size.height;
4937 24d44c7c4c63 Don't crash when resizing non-shaped windows Sam Lantinga <slouken@libsdl.org> parents: 4927 diff changeset	121 if (SDL_IsShapedWindow(_data->window))
24d44c7c4c63 Don't crash when resizing non-shaped windows Sam Lantinga <slouken@libsdl.org> parents: 4927 diff changeset	122 Cocoa_ResizeWindowShape(_data->window);
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	123 SDL_SendWindowEvent(_data->window, SDL_WINDOWEVENT_RESIZED, w, h);
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	124 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	125
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	126 - (void)windowDidMiniaturize:(NSNotification *)aNotification
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	127 {
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	128 SDL_SendWindowEvent(_data->window, SDL_WINDOWEVENT_MINIMIZED, 0, 0);
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	129 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	130
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	131 - (void)windowDidDeminiaturize:(NSNotification *)aNotification
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	132 {
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	133 SDL_SendWindowEvent(_data->window, SDL_WINDOWEVENT_RESTORED, 0, 0);
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	134 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	135
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	136 - (void)windowDidBecomeKey:(NSNotification *)aNotification
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	137 {
2059 4685ccd33d0e Fixed mouse enter/leave events for a single window. Sam Lantinga <slouken@libsdl.org> parents: 1973 diff changeset	138 /* 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	139 SDL_SetKeyboardFocus(_data->window);
1962 c92e5f3e68d9 Hack to stop the beeping Sam Lantinga <slouken@libsdl.org> parents: 1959 diff changeset	140
4503 524dfefd554c Added an event when the clipboard is updated, triggered after the window gains the keyboard focus. Sam Lantinga <slouken@libsdl.org> parents: 4498 diff changeset	141 /* Check to see if someone updated the clipboard */
524dfefd554c Added an event when the clipboard is updated, triggered after the window gains the keyboard focus. Sam Lantinga <slouken@libsdl.org> parents: 4498 diff changeset	142 Cocoa_CheckClipboardUpdate(_data->videodata);
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	143 }
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 - (void)windowDidResignKey:(NSNotification *)aNotification
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	146 {
2059 4685ccd33d0e Fixed mouse enter/leave events for a single window. Sam Lantinga <slouken@libsdl.org> parents: 1973 diff changeset	147 /* 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	148 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	149 SDL_SetMouseFocus(NULL);
2059 4685ccd33d0e Fixed mouse enter/leave events for a single window. Sam Lantinga <slouken@libsdl.org> parents: 1973 diff changeset	150 }
4685ccd33d0e Fixed mouse enter/leave events for a single window. Sam Lantinga <slouken@libsdl.org> parents: 1973 diff changeset	151
4685ccd33d0e Fixed mouse enter/leave events for a single window. Sam Lantinga <slouken@libsdl.org> parents: 1973 diff changeset	152 /* 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	153 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	154 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	155 }
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	156 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	157
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	158 - (void)windowDidHide:(NSNotification *)aNotification
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	159 {
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	160 SDL_SendWindowEvent(_data->window, SDL_WINDOWEVENT_HIDDEN, 0, 0);
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	161 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	162
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	163 - (void)windowDidUnhide:(NSNotification *)aNotification
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	164 {
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	165 SDL_SendWindowEvent(_data->window, SDL_WINDOWEVENT_SHOWN, 0, 0);
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	166 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	167
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	168 - (void)mouseDown:(NSEvent *)theEvent
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	169 {
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	170 int button;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	171
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	172 switch ([theEvent buttonNumber]) {
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	173 case 0:
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	174 button = SDL_BUTTON_LEFT;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	175 break;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	176 case 1:
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	177 button = SDL_BUTTON_RIGHT;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	178 break;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	179 case 2:
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	180 button = SDL_BUTTON_MIDDLE;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	181 break;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	182 default:
5061 9e9940eae455 Fixed mouse button index for additional mouse buttons Sam Lantinga <slouken@libsdl.org> parents: 5059 diff changeset	183 button = [theEvent buttonNumber] + 1;
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	184 break;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	185 }
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	186 SDL_SendMouseButton(_data->window, SDL_PRESSED, button);
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	187 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	188
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	189 - (void)rightMouseDown:(NSEvent *)theEvent
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 [self mouseDown:theEvent];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	192 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	193
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	194 - (void)otherMouseDown:(NSEvent *)theEvent
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	195 {
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	196 [self mouseDown:theEvent];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	197 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	198
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	199 - (void)mouseUp:(NSEvent *)theEvent
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	200 {
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	201 int button;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	202
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	203 switch ([theEvent buttonNumber]) {
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	204 case 0:
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	205 button = SDL_BUTTON_LEFT;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	206 break;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	207 case 1:
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	208 button = SDL_BUTTON_RIGHT;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	209 break;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	210 case 2:
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	211 button = SDL_BUTTON_MIDDLE;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	212 break;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	213 default:
5061 9e9940eae455 Fixed mouse button index for additional mouse buttons Sam Lantinga <slouken@libsdl.org> parents: 5059 diff changeset	214 button = [theEvent buttonNumber] + 1;
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	215 break;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	216 }
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	217 SDL_SendMouseButton(_data->window, SDL_RELEASED, button);
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	218 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	219
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	220 - (void)rightMouseUp:(NSEvent *)theEvent
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	221 {
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	222 [self mouseUp:theEvent];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	223 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	224
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	225 - (void)otherMouseUp:(NSEvent *)theEvent
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	226 {
1959 25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	227 [self mouseUp:theEvent];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	228 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	229
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	230 - (void)mouseMoved:(NSEvent *)theEvent
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	231 {
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	232 SDL_Window *window = _data->window;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	233 NSPoint point;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	234
5059 00d1fef487c5 Fix double mouse motion in OS X Jjgod Jiang <gzjjgod@gmail.com> parents: 5057 diff changeset	235 if (window->flags & SDL_WINDOW_FULLSCREEN)
00d1fef487c5 Fix double mouse motion in OS X Jjgod Jiang <gzjjgod@gmail.com> parents: 5057 diff changeset	236 return;
00d1fef487c5 Fix double mouse motion in OS X Jjgod Jiang <gzjjgod@gmail.com> parents: 5057 diff changeset	237
3517 e7eec78e4b92 Fixed mouse events for fullscreen windows on Mac OS X Sam Lantinga <slouken@libsdl.org> parents: 3509 diff changeset	238 point = [theEvent locationInWindow];
e7eec78e4b92 Fixed mouse events for fullscreen windows on Mac OS X Sam Lantinga <slouken@libsdl.org> parents: 3509 diff changeset	239 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	240 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	241 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	242 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	243 SDL_SetMouseFocus(NULL);
2059 4685ccd33d0e Fixed mouse enter/leave events for a single window. Sam Lantinga <slouken@libsdl.org> parents: 1973 diff changeset	244 }
4685ccd33d0e Fixed mouse enter/leave events for a single window. Sam Lantinga <slouken@libsdl.org> parents: 1973 diff changeset	245 } 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	246 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	247 }
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	248 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	249
1957 c7803e4c21d3 Implemented Cocoa mouse wheel events Sam Lantinga <slouken@libsdl.org> parents: 1956 diff changeset	250 - (void)mouseDragged:(NSEvent *)theEvent
c7803e4c21d3 Implemented Cocoa mouse wheel events Sam Lantinga <slouken@libsdl.org> parents: 1956 diff changeset	251 {
c7803e4c21d3 Implemented Cocoa mouse wheel events Sam Lantinga <slouken@libsdl.org> parents: 1956 diff changeset	252 [self mouseMoved:theEvent];
c7803e4c21d3 Implemented Cocoa mouse wheel events Sam Lantinga <slouken@libsdl.org> parents: 1956 diff changeset	253 }
c7803e4c21d3 Implemented Cocoa mouse wheel events Sam Lantinga <slouken@libsdl.org> parents: 1956 diff changeset	254
1958 5fc6fb0fb605 Added right/other drag code for Cocoa windows Sam Lantinga <slouken@libsdl.org> parents: 1957 diff changeset	255 - (void)rightMouseDragged:(NSEvent *)theEvent
5fc6fb0fb605 Added right/other drag code for Cocoa windows Sam Lantinga <slouken@libsdl.org> parents: 1957 diff changeset	256 {
5fc6fb0fb605 Added right/other drag code for Cocoa windows Sam Lantinga <slouken@libsdl.org> parents: 1957 diff changeset	257 [self mouseMoved:theEvent];
5fc6fb0fb605 Added right/other drag code for Cocoa windows Sam Lantinga <slouken@libsdl.org> parents: 1957 diff changeset	258 }
5fc6fb0fb605 Added right/other drag code for Cocoa windows Sam Lantinga <slouken@libsdl.org> parents: 1957 diff changeset	259
5fc6fb0fb605 Added right/other drag code for Cocoa windows Sam Lantinga <slouken@libsdl.org> parents: 1957 diff changeset	260 - (void)otherMouseDragged:(NSEvent *)theEvent
5fc6fb0fb605 Added right/other drag code for Cocoa windows Sam Lantinga <slouken@libsdl.org> parents: 1957 diff changeset	261 {
5fc6fb0fb605 Added right/other drag code for Cocoa windows Sam Lantinga <slouken@libsdl.org> parents: 1957 diff changeset	262 [self mouseMoved:theEvent];
5fc6fb0fb605 Added right/other drag code for Cocoa windows Sam Lantinga <slouken@libsdl.org> parents: 1957 diff changeset	263 }
5fc6fb0fb605 Added right/other drag code for Cocoa windows Sam Lantinga <slouken@libsdl.org> parents: 1957 diff changeset	264
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	265 - (void)scrollWheel:(NSEvent *)theEvent
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	266 {
5057 bdff53ed6c8b Fix mouse wheel events in fullscreen mode for OS X Jjgod Jiang <gzjjgod@gmail.com> parents: 5056 diff changeset	267 Cocoa_HandleMouseWheel(_data->window, theEvent);
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	268 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	269
4673 c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	270 - (void)touchesBeganWithEvent:(NSEvent *) theEvent
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	271 {
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	272 [self handleTouches:COCOA_TOUCH_DOWN withEvent:theEvent];
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	273 }
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	274
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	275 - (void)touchesMovedWithEvent:(NSEvent *) theEvent
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	276 {
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	277 [self handleTouches:COCOA_TOUCH_MOVE withEvent:theEvent];
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	278 }
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	279
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	280 - (void)touchesEndedWithEvent:(NSEvent *) theEvent
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	281 {
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	282 [self handleTouches:COCOA_TOUCH_UP withEvent:theEvent];
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	283 }
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	284
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	285 - (void)touchesCancelledWithEvent:(NSEvent *) theEvent
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	286 {
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	287 [self handleTouches:COCOA_TOUCH_CANCELLED withEvent:theEvent];
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	288 }
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	289
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	290 - (void)handleTouches:(cocoaTouchType)type withEvent:(NSEvent *)event
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	291 {
4927 d716dff4b13e Fixed touch events on Mac OS X 10.6 Sam Lantinga <slouken@libsdl.org> parents: 4925 diff changeset	292 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
4680 229529693289 Fixed sending motion and finger up events Sam Lantinga <slouken@libsdl.org> parents: 4679 diff changeset	293 NSSet *touches = 0;
229529693289 Fixed sending motion and finger up events Sam Lantinga <slouken@libsdl.org> parents: 4679 diff changeset	294 NSEnumerator *enumerator;
229529693289 Fixed sending motion and finger up events Sam Lantinga <slouken@libsdl.org> parents: 4679 diff changeset	295 NSTouch *touch;
1957 c7803e4c21d3 Implemented Cocoa mouse wheel events Sam Lantinga <slouken@libsdl.org> parents: 1956 diff changeset	296
4680 229529693289 Fixed sending motion and finger up events Sam Lantinga <slouken@libsdl.org> parents: 4679 diff changeset	297 switch (type) {
229529693289 Fixed sending motion and finger up events Sam Lantinga <slouken@libsdl.org> parents: 4679 diff changeset	298 case COCOA_TOUCH_DOWN:
229529693289 Fixed sending motion and finger up events Sam Lantinga <slouken@libsdl.org> parents: 4679 diff changeset	299 touches = [event touchesMatchingPhase:NSTouchPhaseBegan inView:nil];
229529693289 Fixed sending motion and finger up events Sam Lantinga <slouken@libsdl.org> parents: 4679 diff changeset	300 break;
229529693289 Fixed sending motion and finger up events Sam Lantinga <slouken@libsdl.org> parents: 4679 diff changeset	301 case COCOA_TOUCH_UP:
229529693289 Fixed sending motion and finger up events Sam Lantinga <slouken@libsdl.org> parents: 4679 diff changeset	302 case COCOA_TOUCH_CANCELLED:
229529693289 Fixed sending motion and finger up events Sam Lantinga <slouken@libsdl.org> parents: 4679 diff changeset	303 touches = [event touchesMatchingPhase:NSTouchPhaseEnded inView:nil];
229529693289 Fixed sending motion and finger up events Sam Lantinga <slouken@libsdl.org> parents: 4679 diff changeset	304 break;
229529693289 Fixed sending motion and finger up events Sam Lantinga <slouken@libsdl.org> parents: 4679 diff changeset	305 case COCOA_TOUCH_MOVE:
229529693289 Fixed sending motion and finger up events Sam Lantinga <slouken@libsdl.org> parents: 4679 diff changeset	306 touches = [event touchesMatchingPhase:NSTouchPhaseMoved inView:nil];
229529693289 Fixed sending motion and finger up events Sam Lantinga <slouken@libsdl.org> parents: 4679 diff changeset	307 break;
229529693289 Fixed sending motion and finger up events Sam Lantinga <slouken@libsdl.org> parents: 4679 diff changeset	308 }
229529693289 Fixed sending motion and finger up events Sam Lantinga <slouken@libsdl.org> parents: 4679 diff changeset	309
229529693289 Fixed sending motion and finger up events Sam Lantinga <slouken@libsdl.org> parents: 4679 diff changeset	310 enumerator = [touches objectEnumerator];
229529693289 Fixed sending motion and finger up events Sam Lantinga <slouken@libsdl.org> parents: 4679 diff changeset	311 touch = (NSTouch*)[enumerator nextObject];
4673 c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	312 while (touch) {
4680 229529693289 Fixed sending motion and finger up events Sam Lantinga <slouken@libsdl.org> parents: 4679 diff changeset	313 SDL_TouchID touchId = (SDL_TouchID)[touch device];
4673 c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	314 if (!SDL_GetTouch(touchId)) {
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	315 SDL_Touch touch;
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	316
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	317 touch.id = touchId;
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	318 touch.x_min = 0;
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	319 touch.x_max = 1;
4678 f8431f66613d Added SDL_TouchID, SDL_FingerID, SDL_GestureID types. Converted to integer cioordinates (<- not working). jimtla parents: 4676 diff changeset	320 touch.native_xres = touch.x_max - touch.x_min;
4673 c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	321 touch.y_min = 0;
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	322 touch.y_max = 1;
4678 f8431f66613d Added SDL_TouchID, SDL_FingerID, SDL_GestureID types. Converted to integer cioordinates (<- not working). jimtla parents: 4676 diff changeset	323 touch.native_yres = touch.y_max - touch.y_min;
4673 c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	324 touch.pressure_min = 0;
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	325 touch.pressure_max = 1;
4678 f8431f66613d Added SDL_TouchID, SDL_FingerID, SDL_GestureID types. Converted to integer cioordinates (<- not working). jimtla parents: 4676 diff changeset	326 touch.native_pressureres = touch.pressure_max - touch.pressure_min;
4673 c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	327
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	328 if (SDL_AddTouch(&touch, "") < 0) {
4680 229529693289 Fixed sending motion and finger up events Sam Lantinga <slouken@libsdl.org> parents: 4679 diff changeset	329 return;
4673 c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	330 }
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	331 }
4687 257bdf117af8 Fixed so the origin of the touch events is the upper left. Sam Lantinga <slouken@libsdl.org> parents: 4680 diff changeset	332
257bdf117af8 Fixed so the origin of the touch events is the upper left. Sam Lantinga <slouken@libsdl.org> parents: 4680 diff changeset	333 SDL_FingerID fingerId = (SDL_FingerID)[touch identity];
4673 c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	334 float x = [touch normalizedPosition].x;
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	335 float y = [touch normalizedPosition].y;
4687 257bdf117af8 Fixed so the origin of the touch events is the upper left. Sam Lantinga <slouken@libsdl.org> parents: 4680 diff changeset	336 /* Make the origin the upper left instead of the lower left */
257bdf117af8 Fixed so the origin of the touch events is the upper left. Sam Lantinga <slouken@libsdl.org> parents: 4680 diff changeset	337 y = 1.0f - y;
257bdf117af8 Fixed so the origin of the touch events is the upper left. Sam Lantinga <slouken@libsdl.org> parents: 4680 diff changeset	338
4673 c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	339 switch (type) {
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	340 case COCOA_TOUCH_DOWN:
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	341 SDL_SendFingerDown(touchId, fingerId, SDL_TRUE, x, y, 1);
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	342 break;
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	343 case COCOA_TOUCH_UP:
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	344 case COCOA_TOUCH_CANCELLED:
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	345 SDL_SendFingerDown(touchId, fingerId, SDL_FALSE, x, y, 1);
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	346 break;
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	347 case COCOA_TOUCH_MOVE:
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	348 SDL_SendTouchMotion(touchId, fingerId, SDL_FALSE, x, y, 1);
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	349 break;
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	350 }
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	351
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	352 touch = (NSTouch*)[enumerator nextObject];
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	353 }
4927 d716dff4b13e Fixed touch events on Mac OS X 10.6 Sam Lantinga <slouken@libsdl.org> parents: 4925 diff changeset	354 #endif /* MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 */
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	355 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	356
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	357 @end
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	358
1973 81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	359 @interface SDLWindow : NSWindow
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	360 /* These are needed for borderless/fullscreen windows */
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	361 - (BOOL)canBecomeKeyWindow;
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	362 - (BOOL)canBecomeMainWindow;
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	363 @end
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	364
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	365 @implementation SDLWindow
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	366 - (BOOL)canBecomeKeyWindow
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	367 {
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	368 return YES;
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	369 }
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	370
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	371 - (BOOL)canBecomeMainWindow
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	372 {
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	373 return YES;
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	374 }
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	375 @end
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	376
4915 834ce48a19c2 Fix right mouse event handling in Cocoa Jjgod Jiang <gzjjgod@gmail.com> parents: 4902 diff changeset	377 @interface SDLView : NSView {
834ce48a19c2 Fix right mouse event handling in Cocoa Jjgod Jiang <gzjjgod@gmail.com> parents: 4902 diff changeset	378 Cocoa_WindowListener *listener;
834ce48a19c2 Fix right mouse event handling in Cocoa Jjgod Jiang <gzjjgod@gmail.com> parents: 4902 diff changeset	379 }
834ce48a19c2 Fix right mouse event handling in Cocoa Jjgod Jiang <gzjjgod@gmail.com> parents: 4902 diff changeset	380 @end
834ce48a19c2 Fix right mouse event handling in Cocoa Jjgod Jiang <gzjjgod@gmail.com> parents: 4902 diff changeset	381
834ce48a19c2 Fix right mouse event handling in Cocoa Jjgod Jiang <gzjjgod@gmail.com> parents: 4902 diff changeset	382 @implementation SDLView
834ce48a19c2 Fix right mouse event handling in Cocoa Jjgod Jiang <gzjjgod@gmail.com> parents: 4902 diff changeset	383
834ce48a19c2 Fix right mouse event handling in Cocoa Jjgod Jiang <gzjjgod@gmail.com> parents: 4902 diff changeset	384 - (id) initWithFrame: (NSRect) rect
834ce48a19c2 Fix right mouse event handling in Cocoa Jjgod Jiang <gzjjgod@gmail.com> parents: 4902 diff changeset	385 listener: (Cocoa_WindowListener *) theListener
834ce48a19c2 Fix right mouse event handling in Cocoa Jjgod Jiang <gzjjgod@gmail.com> parents: 4902 diff changeset	386 {
834ce48a19c2 Fix right mouse event handling in Cocoa Jjgod Jiang <gzjjgod@gmail.com> parents: 4902 diff changeset	387 if (self = [super initWithFrame:rect]) {
834ce48a19c2 Fix right mouse event handling in Cocoa Jjgod Jiang <gzjjgod@gmail.com> parents: 4902 diff changeset	388 listener = theListener;
834ce48a19c2 Fix right mouse event handling in Cocoa Jjgod Jiang <gzjjgod@gmail.com> parents: 4902 diff changeset	389 }
834ce48a19c2 Fix right mouse event handling in Cocoa Jjgod Jiang <gzjjgod@gmail.com> parents: 4902 diff changeset	390
834ce48a19c2 Fix right mouse event handling in Cocoa Jjgod Jiang <gzjjgod@gmail.com> parents: 4902 diff changeset	391 return self;
834ce48a19c2 Fix right mouse event handling in Cocoa Jjgod Jiang <gzjjgod@gmail.com> parents: 4902 diff changeset	392 }
834ce48a19c2 Fix right mouse event handling in Cocoa Jjgod Jiang <gzjjgod@gmail.com> parents: 4902 diff changeset	393
834ce48a19c2 Fix right mouse event handling in Cocoa Jjgod Jiang <gzjjgod@gmail.com> parents: 4902 diff changeset	394 - (void)rightMouseDown:(NSEvent *)theEvent
834ce48a19c2 Fix right mouse event handling in Cocoa Jjgod Jiang <gzjjgod@gmail.com> parents: 4902 diff changeset	395 {
834ce48a19c2 Fix right mouse event handling in Cocoa Jjgod Jiang <gzjjgod@gmail.com> parents: 4902 diff changeset	396 [listener mouseDown:theEvent];
834ce48a19c2 Fix right mouse event handling in Cocoa Jjgod Jiang <gzjjgod@gmail.com> parents: 4902 diff changeset	397 }
834ce48a19c2 Fix right mouse event handling in Cocoa Jjgod Jiang <gzjjgod@gmail.com> parents: 4902 diff changeset	398
834ce48a19c2 Fix right mouse event handling in Cocoa Jjgod Jiang <gzjjgod@gmail.com> parents: 4902 diff changeset	399 @end
834ce48a19c2 Fix right mouse event handling in Cocoa Jjgod Jiang <gzjjgod@gmail.com> parents: 4902 diff changeset	400
5254 7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	401 static unsigned int
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	402 GetStyleMask(SDL_Window * window)
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	403 {
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	404 unsigned int style;
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	405
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	406 if (window->flags & SDL_WINDOW_BORDERLESS) {
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	407 style = NSBorderlessWindowMask;
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	408 } else {
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	409 style = (NSTitledWindowMask\|NSClosableWindowMask\|NSMiniaturizableWindowMask);
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	410 }
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	411 if (window->flags & SDL_WINDOW_RESIZABLE) {
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	412 style \|= NSResizableWindowMask;
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	413 }
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	414 return style;
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	415 }
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	416
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	417 static int
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: 1937 diff changeset	418 SetupWindowData(_THIS, SDL_Window * window, NSWindow *nswindow, SDL_bool created)
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	419 {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	420 NSAutoreleasePool *pool;
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: 1937 diff changeset	421 SDL_VideoData videodata = (SDL_VideoData ) _this->driverdata;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	422 SDL_WindowData *data;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	423
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	424 /* Allocate the window data */
5254 7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	425 data = (SDL_WindowData ) SDL_calloc(1, sizeof(data));
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	426 if (!data) {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	427 SDL_OutOfMemory();
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	428 return -1;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	429 }
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	430 data->window = window;
3688 6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	431 data->nswindow = nswindow;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	432 data->created = created;
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: 1937 diff changeset	433 data->videodata = videodata;
1933 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 pool = [[NSAutoreleasePool alloc] init];
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 /* Create an event listener for the window */
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	438 data->listener = [[Cocoa_WindowListener alloc] init];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	439 [data->listener listen: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 /* Fill in the SDL window with the window data */
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	442 {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	443 NSRect rect = [nswindow contentRectForFrameRect:[nswindow frame]];
4915 834ce48a19c2 Fix right mouse event handling in Cocoa Jjgod Jiang <gzjjgod@gmail.com> parents: 4902 diff changeset	444 NSView *contentView = [[SDLView alloc] initWithFrame: rect
834ce48a19c2 Fix right mouse event handling in Cocoa Jjgod Jiang <gzjjgod@gmail.com> parents: 4902 diff changeset	445 listener: data->listener];
4927 d716dff4b13e Fixed touch events on Mac OS X 10.6 Sam Lantinga <slouken@libsdl.org> parents: 4925 diff changeset	446 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
d716dff4b13e Fixed touch events on Mac OS X 10.6 Sam Lantinga <slouken@libsdl.org> parents: 4925 diff changeset	447 [contentView setAcceptsTouchEvents:YES];
d716dff4b13e Fixed touch events on Mac OS X 10.6 Sam Lantinga <slouken@libsdl.org> parents: 4925 diff changeset	448 #endif
4915 834ce48a19c2 Fix right mouse event handling in Cocoa Jjgod Jiang <gzjjgod@gmail.com> parents: 4902 diff changeset	449 [nswindow setContentView: contentView];
834ce48a19c2 Fix right mouse event handling in Cocoa Jjgod Jiang <gzjjgod@gmail.com> parents: 4902 diff changeset	450 [contentView release];
834ce48a19c2 Fix right mouse event handling in Cocoa Jjgod Jiang <gzjjgod@gmail.com> parents: 4902 diff changeset	451
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	452 ConvertNSRect(&rect);
5251 58265e606e4e Window coordinates are in the global space and windows are not tied to a particular display. Sam Lantinga <slouken@libsdl.org> parents: 5061 diff changeset	453 window->x = (int)rect.origin.x;
58265e606e4e Window coordinates are in the global space and windows are not tied to a particular display. Sam Lantinga <slouken@libsdl.org> parents: 5061 diff changeset	454 window->y = (int)rect.origin.y;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	455 window->w = (int)rect.size.width;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	456 window->h = (int)rect.size.height;
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 if ([nswindow isVisible]) {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	459 window->flags \|= SDL_WINDOW_SHOWN;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	460 } else {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	461 window->flags &= ~SDL_WINDOW_SHOWN;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	462 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	463 {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	464 unsigned int style = [nswindow styleMask];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	465
1956 ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	466 if ((style & ~NSResizableWindowMask) == NSBorderlessWindowMask) {
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	467 window->flags \|= SDL_WINDOW_BORDERLESS;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	468 } else {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	469 window->flags &= ~SDL_WINDOW_BORDERLESS;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	470 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	471 if (style & NSResizableWindowMask) {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	472 window->flags \|= SDL_WINDOW_RESIZABLE;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	473 } else {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	474 window->flags &= ~SDL_WINDOW_RESIZABLE;
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 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	477 if ([nswindow isZoomed]) {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	478 window->flags \|= SDL_WINDOW_MAXIMIZED;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	479 } else {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	480 window->flags &= ~SDL_WINDOW_MAXIMIZED;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	481 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	482 if ([nswindow isMiniaturized]) {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	483 window->flags \|= SDL_WINDOW_MINIMIZED;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	484 } else {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	485 window->flags &= ~SDL_WINDOW_MINIMIZED;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	486 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	487 if ([nswindow isKeyWindow]) {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	488 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	489 SDL_SetKeyboardFocus(data->window);
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	490
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	491 if (window->flags & SDL_WINDOW_INPUT_GRABBED) {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	492 /* FIXME */
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	493 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	494 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	495
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	496 /* All done! */
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	497 [pool release];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	498 window->driverdata = data;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	499 return 0;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	500 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	501
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	502 int
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	503 Cocoa_CreateWindow(_THIS, SDL_Window * window)
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	504 {
3506 e829b6098435 Added support for placing windows on different displays Sam Lantinga <slouken@libsdl.org> parents: 3414 diff changeset	505 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	506 NSWindow *nswindow;
5251 58265e606e4e Window coordinates are in the global space and windows are not tied to a particular display. Sam Lantinga <slouken@libsdl.org> parents: 5061 diff changeset	507 SDL_VideoDisplay *display = SDL_GetDisplayForWindow(window);
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	508 NSRect rect;
3528 59ff7a2beb57 Added an API function to query geometry of multiple monitors: Sam Lantinga <slouken@libsdl.org> parents: 3525 diff changeset	509 SDL_Rect bounds;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	510 unsigned int style;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	511
3528 59ff7a2beb57 Added an API function to query geometry of multiple monitors: Sam Lantinga <slouken@libsdl.org> parents: 3525 diff changeset	512 Cocoa_GetDisplayBounds(_this, display, &bounds);
5254 7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	513 if (SDL_WINDOWPOS_ISCENTERED(window->x)) {
3528 59ff7a2beb57 Added an API function to query geometry of multiple monitors: Sam Lantinga <slouken@libsdl.org> parents: 3525 diff changeset	514 rect.origin.x = bounds.x + (bounds.w - window->w) / 2;
5251 58265e606e4e Window coordinates are in the global space and windows are not tied to a particular display. Sam Lantinga <slouken@libsdl.org> parents: 5061 diff changeset	515 } else if (SDL_WINDOWPOS_ISUNDEFINED(window->x)) {
3528 59ff7a2beb57 Added an API function to query geometry of multiple monitors: Sam Lantinga <slouken@libsdl.org> parents: 3525 diff changeset	516 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	517 } else {
5251 58265e606e4e Window coordinates are in the global space and windows are not tied to a particular display. Sam Lantinga <slouken@libsdl.org> parents: 5061 diff changeset	518 rect.origin.x = window->x;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	519 }
5254 7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	520 if (SDL_WINDOWPOS_ISCENTERED(window->y)) {
3528 59ff7a2beb57 Added an API function to query geometry of multiple monitors: Sam Lantinga <slouken@libsdl.org> parents: 3525 diff changeset	521 rect.origin.y = bounds.y + (bounds.h - window->h) / 2;
5251 58265e606e4e Window coordinates are in the global space and windows are not tied to a particular display. Sam Lantinga <slouken@libsdl.org> parents: 5061 diff changeset	522 } else if (SDL_WINDOWPOS_ISUNDEFINED(window->y)) {
3528 59ff7a2beb57 Added an API function to query geometry of multiple monitors: Sam Lantinga <slouken@libsdl.org> parents: 3525 diff changeset	523 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	524 } else {
5251 58265e606e4e Window coordinates are in the global space and windows are not tied to a particular display. Sam Lantinga <slouken@libsdl.org> parents: 5061 diff changeset	525 rect.origin.y = window->y;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	526 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	527 rect.size.width = window->w;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	528 rect.size.height = window->h;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	529 ConvertNSRect(&rect);
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	530
5254 7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	531 style = GetStyleMask(window);
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	532
3506 e829b6098435 Added support for placing windows on different displays Sam Lantinga <slouken@libsdl.org> parents: 3414 diff changeset	533 /* 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	534 NSArray *screens = [NSScreen screens];
e829b6098435 Added support for placing windows on different displays Sam Lantinga <slouken@libsdl.org> parents: 3414 diff changeset	535 NSScreen *screen = nil;
e829b6098435 Added support for placing windows on different displays Sam Lantinga <slouken@libsdl.org> parents: 3414 diff changeset	536 NSScreen *candidate;
3525 455a6c47d2c6 Fixed compilation on Mac OS X 10.4 Sam Lantinga <slouken@libsdl.org> parents: 3517 diff changeset	537 int i, count = [screens count];
455a6c47d2c6 Fixed compilation on Mac OS X 10.4 Sam Lantinga <slouken@libsdl.org> parents: 3517 diff changeset	538 for (i = 0; i < count; ++i) {
3529 09155ec3e291 Fixed crash Sam Lantinga <slouken@libsdl.org> parents: 3528 diff changeset	539 candidate = [screens objectAtIndex:i];
3506 e829b6098435 Added support for placing windows on different displays Sam Lantinga <slouken@libsdl.org> parents: 3414 diff changeset	540 NSRect screenRect = [candidate frame];
e829b6098435 Added support for placing windows on different displays Sam Lantinga <slouken@libsdl.org> parents: 3414 diff changeset	541 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	542 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	543 rect.origin.y >= screenRect.origin.y &&
e829b6098435 Added support for placing windows on different displays Sam Lantinga <slouken@libsdl.org> parents: 3414 diff changeset	544 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	545 screen = candidate;
e829b6098435 Added support for placing windows on different displays Sam Lantinga <slouken@libsdl.org> parents: 3414 diff changeset	546 rect.origin.x -= screenRect.origin.x;
e829b6098435 Added support for placing windows on different displays Sam Lantinga <slouken@libsdl.org> parents: 3414 diff changeset	547 rect.origin.y -= screenRect.origin.y;
e829b6098435 Added support for placing windows on different displays Sam Lantinga <slouken@libsdl.org> parents: 3414 diff changeset	548 }
e829b6098435 Added support for placing windows on different displays Sam Lantinga <slouken@libsdl.org> parents: 3414 diff changeset	549 }
e829b6098435 Added support for placing windows on different displays Sam Lantinga <slouken@libsdl.org> parents: 3414 diff changeset	550 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	551
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	552 [pool release];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	553
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: 1937 diff changeset	554 if (SetupWindowData(_this, window, nswindow, SDL_TRUE) < 0) {
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	555 [nswindow release];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	556 return -1;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	557 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	558 return 0;
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 int
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	562 Cocoa_CreateWindowFrom(_THIS, SDL_Window * window, const void *data)
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	563 {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	564 NSAutoreleasePool *pool;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	565 NSWindow nswindow = (NSWindow ) data;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	566 NSString *title;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	567
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	568 pool = [[NSAutoreleasePool alloc] init];
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 /* Query the title from the existing window */
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	571 title = [nswindow title];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	572 if (title) {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	573 window->title = SDL_strdup([title UTF8String]);
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	574 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	575
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	576 [pool release];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	577
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: 1937 diff changeset	578 return SetupWindowData(_this, window, nswindow, SDL_FALSE);
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	579 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	580
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	581 void
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	582 Cocoa_SetWindowTitle(_THIS, SDL_Window * window)
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	583 {
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	584 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
3688 6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	585 NSWindow nswindow = ((SDL_WindowData ) window->driverdata)->nswindow;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	586 NSString *string;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	587
1956 ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	588 if(window->title) {
ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	589 string = [[NSString alloc] initWithUTF8String:window->title];
ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	590 } else {
ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	591 string = [[NSString alloc] init];
ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	592 }
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	593 [nswindow setTitle:string];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	594 [string release];
1956 ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	595
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	596 [pool release];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	597 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	598
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	599 void
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	600 Cocoa_SetWindowPosition(_THIS, SDL_Window * window)
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	601 {
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	602 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
3688 6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	603 NSWindow nswindow = ((SDL_WindowData ) window->driverdata)->nswindow;
5251 58265e606e4e Window coordinates are in the global space and windows are not tied to a particular display. Sam Lantinga <slouken@libsdl.org> parents: 5061 diff changeset	604 SDL_VideoDisplay *display = SDL_GetDisplayForWindow(window);
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	605 NSRect rect;
3528 59ff7a2beb57 Added an API function to query geometry of multiple monitors: Sam Lantinga <slouken@libsdl.org> parents: 3525 diff changeset	606 SDL_Rect bounds;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	607
3528 59ff7a2beb57 Added an API function to query geometry of multiple monitors: Sam Lantinga <slouken@libsdl.org> parents: 3525 diff changeset	608 Cocoa_GetDisplayBounds(_this, display, &bounds);
5254 7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	609 if (SDL_WINDOWPOS_ISCENTERED(window->x)) {
3528 59ff7a2beb57 Added an API function to query geometry of multiple monitors: Sam Lantinga <slouken@libsdl.org> parents: 3525 diff changeset	610 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	611 } else {
5251 58265e606e4e Window coordinates are in the global space and windows are not tied to a particular display. Sam Lantinga <slouken@libsdl.org> parents: 5061 diff changeset	612 rect.origin.x = window->x;
3075 4c28a9655933 Fixed bug using SDL_WINDOWPOS_CENTERED with SDL_SetWindowPosition() Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	613 }
5254 7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	614 if (SDL_WINDOWPOS_ISCENTERED(window->y)) {
3528 59ff7a2beb57 Added an API function to query geometry of multiple monitors: Sam Lantinga <slouken@libsdl.org> parents: 3525 diff changeset	615 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	616 } else {
5251 58265e606e4e Window coordinates are in the global space and windows are not tied to a particular display. Sam Lantinga <slouken@libsdl.org> parents: 5061 diff changeset	617 rect.origin.y = window->y;
3075 4c28a9655933 Fixed bug using SDL_WINDOWPOS_CENTERED with SDL_SetWindowPosition() Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	618 }
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	619 rect.size.width = window->w;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	620 rect.size.height = window->h;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	621 ConvertNSRect(&rect);
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	622 rect = [nswindow frameRectForContentRect:rect];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	623 [nswindow setFrameOrigin:rect.origin];
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	624 [pool release];
1933 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 void
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	628 Cocoa_SetWindowSize(_THIS, SDL_Window * window)
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	629 {
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	630 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
3688 6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	631 NSWindow nswindow = ((SDL_WindowData ) window->driverdata)->nswindow;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	632 NSSize size;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	633
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	634 size.width = window->w;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	635 size.height = window->h;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	636 [nswindow setContentSize:size];
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	637 [pool release];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	638 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	639
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	640 void
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	641 Cocoa_ShowWindow(_THIS, SDL_Window * window)
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	642 {
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	643 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
3688 6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	644 NSWindow nswindow = ((SDL_WindowData ) window->driverdata)->nswindow;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	645
1956 ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	646 if (![nswindow isMiniaturized]) {
ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	647 [nswindow makeKeyAndOrderFront:nil];
ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	648 }
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	649 [pool release];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	650 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	651
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	652 void
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	653 Cocoa_HideWindow(_THIS, SDL_Window * window)
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	654 {
1956 ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	655 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
3688 6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	656 NSWindow nswindow = ((SDL_WindowData ) window->driverdata)->nswindow;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	657
1956 ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	658 [nswindow orderOut:nil];
ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	659 [pool release];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	660 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	661
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	662 void
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	663 Cocoa_RaiseWindow(_THIS, SDL_Window * window)
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	664 {
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	665 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
3688 6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	666 NSWindow nswindow = ((SDL_WindowData ) window->driverdata)->nswindow;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	667
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	668 [nswindow makeKeyAndOrderFront:nil];
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	669 [pool release];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	670 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	671
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	672 void
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	673 Cocoa_MaximizeWindow(_THIS, SDL_Window * window)
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	674 {
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	675 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
3688 6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	676 NSWindow nswindow = ((SDL_WindowData ) window->driverdata)->nswindow;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	677
1956 ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	678 [nswindow zoom:nil];
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	679 [pool release];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	680 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	681
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	682 void
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	683 Cocoa_MinimizeWindow(_THIS, SDL_Window * window)
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	684 {
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	685 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
3688 6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	686 NSWindow nswindow = ((SDL_WindowData ) window->driverdata)->nswindow;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	687
1956 ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	688 [nswindow miniaturize:nil];
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	689 [pool release];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	690 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	691
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	692 void
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	693 Cocoa_RestoreWindow(_THIS, SDL_Window * window)
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	694 {
1956 ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	695 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
3688 6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	696 NSWindow nswindow = ((SDL_WindowData ) window->driverdata)->nswindow;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	697
1956 ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	698 if ([nswindow isMiniaturized]) {
ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	699 [nswindow deminiaturize:nil];
ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	700 } else if ([nswindow isZoomed]) {
ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	701 [nswindow zoom:nil];
ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	702 }
ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	703 [pool release];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	704 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	705
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	706 void
5254 7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	707 Cocoa_SetWindowFullscreen(_THIS, SDL_Window * window)
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	708 {
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	709 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	710 SDL_WindowData data = (SDL_WindowData ) window->driverdata;
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	711 NSWindow *nswindow = data->nswindow;
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	712 SDL_VideoDisplay *display = SDL_GetDisplayForWindow(window);
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	713 NSRect rect;
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	714 unsigned int style;
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	715
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	716 if (FULLSCREEN_VISIBLE(window)) {
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	717 SDL_Rect bounds;
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	718
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	719 Cocoa_GetDisplayBounds(_this, display, &bounds);
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	720 rect.origin.x = bounds.x;
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	721 rect.origin.y = bounds.y;
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	722 rect.size.width = bounds.w;
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	723 rect.size.height = bounds.h;
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	724 ConvertNSRect(&rect);
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	725
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	726 style = NSBorderlessWindowMask;
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	727 } else {
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	728 rect.origin.x = window->windowed.x;
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	729 rect.origin.y = window->windowed.y;
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	730 rect.size.width = window->windowed.w;
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	731 rect.size.height = window->windowed.h;
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	732 /* FIXME: This calculation is wrong, we're changing the origin */
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	733 ConvertNSRect(&rect);
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	734
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	735 style = GetStyleMask(window);
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	736 }
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	737
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	738 [nswindow setStyleMask:style];
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	739 [nswindow setContentSize:rect.size];
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	740 rect = [nswindow frameRectForContentRect:rect];
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	741 [nswindow setFrameOrigin:rect.origin];
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	742
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	743 #ifdef FULLSCREEN_TOGGLEABLE
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	744 if (FULLSCREEN_VISIBLE(window)) {
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	745 /* OpenGL is rendering to the window, so make it visible! */
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	746 [nswindow setLevel:CGShieldingWindowLevel()];
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	747 } else {
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	748 [nswindow setLevel:kCGNormalWindowLevel];
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	749 }
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	750 #endif
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	751 [nswindow makeKeyAndOrderFront:nil];
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	752
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	753 [pool release];
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	754 }
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	755
7a963be087ef Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off. Sam Lantinga <slouken@libsdl.org> parents: 5251 diff changeset	756 void
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	757 Cocoa_SetWindowGrab(_THIS, SDL_Window * window)
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	758 {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	759 if ((window->flags & SDL_WINDOW_INPUT_GRABBED) &&
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	760 (window->flags & SDL_WINDOW_INPUT_FOCUS)) {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	761 /* FIXME: Grab mouse */
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	762 } else {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	763 /* FIXME: Release mouse */
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	764 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	765 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	766
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	767 void
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	768 Cocoa_DestroyWindow(_THIS, SDL_Window * window)
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	769 {
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	770 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	771 SDL_WindowData data = (SDL_WindowData ) window->driverdata;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	772
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	773 if (data) {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	774 [data->listener close];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	775 [data->listener release];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	776 if (data->created) {
3688 6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	777 [data->nswindow close];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	778 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	779 SDL_free(data);
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	780 }
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	781 [pool release];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	782 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	783
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	784 SDL_bool
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	785 Cocoa_GetWindowWMInfo(_THIS, SDL_Window * window, SDL_SysWMinfo * info)
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	786 {
4900 69d9db65f248 Merged the Windows custom window system hooks into the union used by X11. Sam Lantinga <slouken@libsdl.org> parents: 4862 diff changeset	787 NSWindow nswindow = ((SDL_WindowData ) window->driverdata)->nswindow;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	788
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	789 if (info->version.major <= SDL_MAJOR_VERSION) {
4900 69d9db65f248 Merged the Windows custom window system hooks into the union used by X11. Sam Lantinga <slouken@libsdl.org> parents: 4862 diff changeset	790 info->subsystem = SDL_SYSWM_COCOA;
5056 8b7988f42fcb Added the ability to get the UIKit window through the SDL API. Sam Lantinga <slouken@libsdl.org> parents: 4937 diff changeset	791 info->info.cocoa.window = nswindow;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	792 return SDL_TRUE;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	793 } else {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	794 SDL_SetError("Application not compiled with SDL %d.%d\n",
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	795 SDL_MAJOR_VERSION, SDL_MINOR_VERSION);
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	796 return SDL_FALSE;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	797 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	798 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	799
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	800 /* vi: set ts=4 sw=4 expandtab: */

Mercurial > sdl-ios-xcode

annotate src/video/cocoa/SDL_cocoawindow.m @ 5254:7a963be087ef