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

annotate src/video/cocoa/SDL_cocoawindow.m @ 5057:bdff53ed6c8b

Fix mouse wheel events in fullscreen mode for OS X With proposed patch by vernier.

author	Jjgod Jiang <gzjjgod@gmail.com>
date	Fri, 21 Jan 2011 00:15:18 +0100
parents	8b7988f42fcb
children	00d1fef487c5

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:
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	183 button = [theEvent buttonNumber];
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:
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	214 button = [theEvent buttonNumber];
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	215 break;
25d6537feea4 Implemented Cocoa key event handling. Sam Lantinga <slouken@libsdl.org> parents: 1958 diff changeset	216 }
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
3517 e7eec78e4b92 Fixed mouse events for fullscreen windows on Mac OS X Sam Lantinga <slouken@libsdl.org> parents: 3509 diff changeset	235 point = [theEvent locationInWindow];
e7eec78e4b92 Fixed mouse events for fullscreen windows on Mac OS X Sam Lantinga <slouken@libsdl.org> parents: 3509 diff changeset	236 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	237 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	238 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	239 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	240 SDL_SetMouseFocus(NULL);
2059 4685ccd33d0e Fixed mouse enter/leave events for a single window. Sam Lantinga <slouken@libsdl.org> parents: 1973 diff changeset	241 }
4685ccd33d0e Fixed mouse enter/leave events for a single window. Sam Lantinga <slouken@libsdl.org> parents: 1973 diff changeset	242 } 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	243 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	244 }
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	245 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	246
1957 c7803e4c21d3 Implemented Cocoa mouse wheel events Sam Lantinga <slouken@libsdl.org> parents: 1956 diff changeset	247 - (void)mouseDragged:(NSEvent *)theEvent
c7803e4c21d3 Implemented Cocoa mouse wheel events Sam Lantinga <slouken@libsdl.org> parents: 1956 diff changeset	248 {
c7803e4c21d3 Implemented Cocoa mouse wheel events Sam Lantinga <slouken@libsdl.org> parents: 1956 diff changeset	249 [self mouseMoved:theEvent];
c7803e4c21d3 Implemented Cocoa mouse wheel events Sam Lantinga <slouken@libsdl.org> parents: 1956 diff changeset	250 }
c7803e4c21d3 Implemented Cocoa mouse wheel events Sam Lantinga <slouken@libsdl.org> parents: 1956 diff changeset	251
1958 5fc6fb0fb605 Added right/other drag code for Cocoa windows Sam Lantinga <slouken@libsdl.org> parents: 1957 diff changeset	252 - (void)rightMouseDragged:(NSEvent *)theEvent
5fc6fb0fb605 Added right/other drag code for Cocoa windows Sam Lantinga <slouken@libsdl.org> parents: 1957 diff changeset	253 {
5fc6fb0fb605 Added right/other drag code for Cocoa windows Sam Lantinga <slouken@libsdl.org> parents: 1957 diff changeset	254 [self mouseMoved:theEvent];
5fc6fb0fb605 Added right/other drag code for Cocoa windows Sam Lantinga <slouken@libsdl.org> parents: 1957 diff changeset	255 }
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 - (void)otherMouseDragged:(NSEvent *)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 [self mouseMoved:theEvent];
5fc6fb0fb605 Added right/other drag code for Cocoa windows Sam Lantinga <slouken@libsdl.org> parents: 1957 diff changeset	260 }
5fc6fb0fb605 Added right/other drag code for Cocoa windows Sam Lantinga <slouken@libsdl.org> parents: 1957 diff changeset	261
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	262 - (void)scrollWheel:(NSEvent *)theEvent
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	263 {
5057 bdff53ed6c8b Fix mouse wheel events in fullscreen mode for OS X Jjgod Jiang <gzjjgod@gmail.com> parents: 5056 diff changeset	264 Cocoa_HandleMouseWheel(_data->window, theEvent);
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	265 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	266
4673 c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	267 - (void)touchesBeganWithEvent:(NSEvent *) theEvent
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	268 {
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	269 [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	270 }
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 - (void)touchesMovedWithEvent:(NSEvent *) 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 [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	275 }
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 - (void)touchesEndedWithEvent:(NSEvent *) 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 [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	280 }
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 - (void)touchesCancelledWithEvent:(NSEvent *) 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 [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	285 }
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 - (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	288 {
4927 d716dff4b13e Fixed touch events on Mac OS X 10.6 Sam Lantinga <slouken@libsdl.org> parents: 4925 diff changeset	289 #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	290 NSSet *touches = 0;
229529693289 Fixed sending motion and finger up events Sam Lantinga <slouken@libsdl.org> parents: 4679 diff changeset	291 NSEnumerator *enumerator;
229529693289 Fixed sending motion and finger up events Sam Lantinga <slouken@libsdl.org> parents: 4679 diff changeset	292 NSTouch *touch;
1957 c7803e4c21d3 Implemented Cocoa mouse wheel events Sam Lantinga <slouken@libsdl.org> parents: 1956 diff changeset	293
4680 229529693289 Fixed sending motion and finger up events Sam Lantinga <slouken@libsdl.org> parents: 4679 diff changeset	294 switch (type) {
229529693289 Fixed sending motion and finger up events Sam Lantinga <slouken@libsdl.org> parents: 4679 diff changeset	295 case COCOA_TOUCH_DOWN:
229529693289 Fixed sending motion and finger up events Sam Lantinga <slouken@libsdl.org> parents: 4679 diff changeset	296 touches = [event touchesMatchingPhase:NSTouchPhaseBegan inView:nil];
229529693289 Fixed sending motion and finger up events Sam Lantinga <slouken@libsdl.org> parents: 4679 diff changeset	297 break;
229529693289 Fixed sending motion and finger up events Sam Lantinga <slouken@libsdl.org> parents: 4679 diff changeset	298 case COCOA_TOUCH_UP:
229529693289 Fixed sending motion and finger up events Sam Lantinga <slouken@libsdl.org> parents: 4679 diff changeset	299 case COCOA_TOUCH_CANCELLED:
229529693289 Fixed sending motion and finger up events Sam Lantinga <slouken@libsdl.org> parents: 4679 diff changeset	300 touches = [event touchesMatchingPhase:NSTouchPhaseEnded inView:nil];
229529693289 Fixed sending motion and finger up events Sam Lantinga <slouken@libsdl.org> parents: 4679 diff changeset	301 break;
229529693289 Fixed sending motion and finger up events Sam Lantinga <slouken@libsdl.org> parents: 4679 diff changeset	302 case COCOA_TOUCH_MOVE:
229529693289 Fixed sending motion and finger up events Sam Lantinga <slouken@libsdl.org> parents: 4679 diff changeset	303 touches = [event touchesMatchingPhase:NSTouchPhaseMoved 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 }
229529693289 Fixed sending motion and finger up events Sam Lantinga <slouken@libsdl.org> parents: 4679 diff changeset	306
229529693289 Fixed sending motion and finger up events Sam Lantinga <slouken@libsdl.org> parents: 4679 diff changeset	307 enumerator = [touches objectEnumerator];
229529693289 Fixed sending motion and finger up events Sam Lantinga <slouken@libsdl.org> parents: 4679 diff changeset	308 touch = (NSTouch*)[enumerator nextObject];
4673 c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	309 while (touch) {
4680 229529693289 Fixed sending motion and finger up events Sam Lantinga <slouken@libsdl.org> parents: 4679 diff changeset	310 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	311 if (!SDL_GetTouch(touchId)) {
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	312 SDL_Touch touch;
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	313
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	314 touch.id = touchId;
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	315 touch.x_min = 0;
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	316 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	317 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	318 touch.y_min = 0;
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	319 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	320 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	321 touch.pressure_min = 0;
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	322 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	323 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	324
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	325 if (SDL_AddTouch(&touch, "") < 0) {
4680 229529693289 Fixed sending motion and finger up events Sam Lantinga <slouken@libsdl.org> parents: 4679 diff changeset	326 return;
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 }
4687 257bdf117af8 Fixed so the origin of the touch events is the upper left. Sam Lantinga <slouken@libsdl.org> parents: 4680 diff changeset	329
257bdf117af8 Fixed so the origin of the touch events is the upper left. Sam Lantinga <slouken@libsdl.org> parents: 4680 diff changeset	330 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	331 float x = [touch normalizedPosition].x;
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	332 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	333 /* 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	334 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	335
4673 c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	336 switch (type) {
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	337 case COCOA_TOUCH_DOWN:
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	338 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	339 break;
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	340 case COCOA_TOUCH_UP:
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	341 case COCOA_TOUCH_CANCELLED:
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	342 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	343 break;
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	344 case COCOA_TOUCH_MOVE:
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	345 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	346 break;
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	347 }
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	348
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	349 touch = (NSTouch*)[enumerator nextObject];
c17ac64abb70 Fixed the code so we receive Cocoa touch events Sam Lantinga <slouken@libsdl.org> parents: 4503 diff changeset	350 }
4927 d716dff4b13e Fixed touch events on Mac OS X 10.6 Sam Lantinga <slouken@libsdl.org> parents: 4925 diff changeset	351 #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	352 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	353
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	354 @end
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	355
1973 81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	356 @interface SDLWindow : NSWindow
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	357 /* These are needed for borderless/fullscreen windows */
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	358 - (BOOL)canBecomeKeyWindow;
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	359 - (BOOL)canBecomeMainWindow;
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	360 @end
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	361
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	362 @implementation SDLWindow
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	363 - (BOOL)canBecomeKeyWindow
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 return YES;
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	366 }
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 - (BOOL)canBecomeMainWindow
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 return YES;
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	371 }
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	372 @end
81255f93dfcd Fixed fullscreen modes with Cocoa video driver. Sam Lantinga <slouken@libsdl.org> parents: 1962 diff changeset	373
4915 834ce48a19c2 Fix right mouse event handling in Cocoa Jjgod Jiang <gzjjgod@gmail.com> parents: 4902 diff changeset	374 @interface SDLView : NSView {
834ce48a19c2 Fix right mouse event handling in Cocoa Jjgod Jiang <gzjjgod@gmail.com> parents: 4902 diff changeset	375 Cocoa_WindowListener *listener;
834ce48a19c2 Fix right mouse event handling in Cocoa Jjgod Jiang <gzjjgod@gmail.com> parents: 4902 diff changeset	376 }
834ce48a19c2 Fix right mouse event handling in Cocoa Jjgod Jiang <gzjjgod@gmail.com> parents: 4902 diff changeset	377 @end
834ce48a19c2 Fix right mouse event handling in Cocoa Jjgod Jiang <gzjjgod@gmail.com> parents: 4902 diff changeset	378
834ce48a19c2 Fix right mouse event handling in Cocoa Jjgod Jiang <gzjjgod@gmail.com> parents: 4902 diff changeset	379 @implementation SDLView
834ce48a19c2 Fix right mouse event handling in Cocoa Jjgod Jiang <gzjjgod@gmail.com> parents: 4902 diff changeset	380
834ce48a19c2 Fix right mouse event handling in Cocoa Jjgod Jiang <gzjjgod@gmail.com> parents: 4902 diff changeset	381 - (id) initWithFrame: (NSRect) rect
834ce48a19c2 Fix right mouse event handling in Cocoa Jjgod Jiang <gzjjgod@gmail.com> parents: 4902 diff changeset	382 listener: (Cocoa_WindowListener *) theListener
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 if (self = [super initWithFrame:rect]) {
834ce48a19c2 Fix right mouse event handling in Cocoa Jjgod Jiang <gzjjgod@gmail.com> parents: 4902 diff changeset	385 listener = 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
834ce48a19c2 Fix right mouse event handling in Cocoa Jjgod Jiang <gzjjgod@gmail.com> parents: 4902 diff changeset	388 return self;
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 - (void)rightMouseDown:(NSEvent *)theEvent
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 [listener mouseDown:theEvent];
834ce48a19c2 Fix right mouse event handling in Cocoa Jjgod Jiang <gzjjgod@gmail.com> parents: 4902 diff changeset	394 }
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 @end
834ce48a19c2 Fix right mouse event handling in Cocoa Jjgod Jiang <gzjjgod@gmail.com> parents: 4902 diff changeset	397
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	398 static int
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: 1937 diff changeset	399 SetupWindowData(_THIS, SDL_Window * window, NSWindow *nswindow, SDL_bool created)
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	400 {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	401 NSAutoreleasePool *pool;
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: 1937 diff changeset	402 SDL_VideoData videodata = (SDL_VideoData ) _this->driverdata;
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3530 diff changeset	403 SDL_VideoDisplay *display = window->display;
3530 e96be66e3673 The window position is display relative, at least for now... Sam Lantinga <slouken@libsdl.org> parents: 3529 diff changeset	404 SDL_DisplayData displaydata = (SDL_DisplayData ) display->driverdata;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	405 SDL_WindowData *data;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	406
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	407 /* Allocate the window data */
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	408 data = (SDL_WindowData ) SDL_malloc(sizeof(data));
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	409 if (!data) {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	410 SDL_OutOfMemory();
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	411 return -1;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	412 }
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	413 data->window = window;
3688 6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	414 data->nswindow = nswindow;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	415 data->created = created;
3506 e829b6098435 Added support for placing windows on different displays Sam Lantinga <slouken@libsdl.org> parents: 3414 diff changeset	416 data->display = displaydata->display;
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: 1937 diff changeset	417 data->videodata = videodata;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	418
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	419 pool = [[NSAutoreleasePool alloc] init];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	420
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	421 /* Create an event listener for the window */
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	422 data->listener = [[Cocoa_WindowListener alloc] init];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	423 [data->listener listen:data];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	424
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	425 /* Fill in the SDL window with the window data */
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	426 {
3530 e96be66e3673 The window position is display relative, at least for now... Sam Lantinga <slouken@libsdl.org> parents: 3529 diff changeset	427 SDL_Rect bounds;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	428 NSRect rect = [nswindow contentRectForFrameRect:[nswindow frame]];
4915 834ce48a19c2 Fix right mouse event handling in Cocoa Jjgod Jiang <gzjjgod@gmail.com> parents: 4902 diff changeset	429 NSView *contentView = [[SDLView alloc] initWithFrame: rect
834ce48a19c2 Fix right mouse event handling in Cocoa Jjgod Jiang <gzjjgod@gmail.com> parents: 4902 diff changeset	430 listener: data->listener];
4927 d716dff4b13e Fixed touch events on Mac OS X 10.6 Sam Lantinga <slouken@libsdl.org> parents: 4925 diff changeset	431 #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	432 [contentView setAcceptsTouchEvents:YES];
d716dff4b13e Fixed touch events on Mac OS X 10.6 Sam Lantinga <slouken@libsdl.org> parents: 4925 diff changeset	433 #endif
4915 834ce48a19c2 Fix right mouse event handling in Cocoa Jjgod Jiang <gzjjgod@gmail.com> parents: 4902 diff changeset	434 [nswindow setContentView: contentView];
834ce48a19c2 Fix right mouse event handling in Cocoa Jjgod Jiang <gzjjgod@gmail.com> parents: 4902 diff changeset	435 [contentView release];
834ce48a19c2 Fix right mouse event handling in Cocoa Jjgod Jiang <gzjjgod@gmail.com> parents: 4902 diff changeset	436
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	437 ConvertNSRect(&rect);
3530 e96be66e3673 The window position is display relative, at least for now... Sam Lantinga <slouken@libsdl.org> parents: 3529 diff changeset	438 Cocoa_GetDisplayBounds(_this, display, &bounds);
e96be66e3673 The window position is display relative, at least for now... Sam Lantinga <slouken@libsdl.org> parents: 3529 diff changeset	439 window->x = (int)rect.origin.x - bounds.x;
e96be66e3673 The window position is display relative, at least for now... Sam Lantinga <slouken@libsdl.org> parents: 3529 diff changeset	440 window->y = (int)rect.origin.y - bounds.y;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	441 window->w = (int)rect.size.width;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	442 window->h = (int)rect.size.height;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	443 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	444 if ([nswindow isVisible]) {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	445 window->flags \|= SDL_WINDOW_SHOWN;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	446 } else {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	447 window->flags &= ~SDL_WINDOW_SHOWN;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	448 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	449 {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	450 unsigned int style = [nswindow styleMask];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	451
1956 ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	452 if ((style & ~NSResizableWindowMask) == NSBorderlessWindowMask) {
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	453 window->flags \|= SDL_WINDOW_BORDERLESS;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	454 } else {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	455 window->flags &= ~SDL_WINDOW_BORDERLESS;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	456 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	457 if (style & NSResizableWindowMask) {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	458 window->flags \|= SDL_WINDOW_RESIZABLE;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	459 } else {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	460 window->flags &= ~SDL_WINDOW_RESIZABLE;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	461 }
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 if ([nswindow isZoomed]) {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	464 window->flags \|= SDL_WINDOW_MAXIMIZED;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	465 } else {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	466 window->flags &= ~SDL_WINDOW_MAXIMIZED;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	467 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	468 if ([nswindow isMiniaturized]) {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	469 window->flags \|= SDL_WINDOW_MINIMIZED;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	470 } else {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	471 window->flags &= ~SDL_WINDOW_MINIMIZED;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	472 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	473 if ([nswindow isKeyWindow]) {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	474 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	475 SDL_SetKeyboardFocus(data->window);
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	476
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	477 if (window->flags & SDL_WINDOW_INPUT_GRABBED) {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	478 /* FIXME */
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	479 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	480 }
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 /* All done! */
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	483 [pool release];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	484 window->driverdata = data;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	485 return 0;
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
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	488 int
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	489 Cocoa_CreateWindow(_THIS, SDL_Window * window)
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	490 {
3506 e829b6098435 Added support for placing windows on different displays Sam Lantinga <slouken@libsdl.org> parents: 3414 diff changeset	491 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	492 NSWindow *nswindow;
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3530 diff changeset	493 SDL_VideoDisplay *display = window->display;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	494 NSRect rect;
3528 59ff7a2beb57 Added an API function to query geometry of multiple monitors: Sam Lantinga <slouken@libsdl.org> parents: 3525 diff changeset	495 SDL_Rect bounds;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	496 unsigned int style;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	497
3528 59ff7a2beb57 Added an API function to query geometry of multiple monitors: Sam Lantinga <slouken@libsdl.org> parents: 3525 diff changeset	498 Cocoa_GetDisplayBounds(_this, display, &bounds);
3075 4c28a9655933 Fixed bug using SDL_WINDOWPOS_CENTERED with SDL_SetWindowPosition() Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	499 if ((window->flags & SDL_WINDOW_FULLSCREEN)
4c28a9655933 Fixed bug using SDL_WINDOWPOS_CENTERED with SDL_SetWindowPosition() Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	500 \|\| window->x == SDL_WINDOWPOS_CENTERED) {
3528 59ff7a2beb57 Added an API function to query geometry of multiple monitors: Sam Lantinga <slouken@libsdl.org> parents: 3525 diff changeset	501 rect.origin.x = bounds.x + (bounds.w - window->w) / 2;
59ff7a2beb57 Added an API function to query geometry of multiple monitors: Sam Lantinga <slouken@libsdl.org> parents: 3525 diff changeset	502 } else if (window->x == SDL_WINDOWPOS_UNDEFINED) {
59ff7a2beb57 Added an API function to query geometry of multiple monitors: Sam Lantinga <slouken@libsdl.org> parents: 3525 diff changeset	503 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	504 } else {
3530 e96be66e3673 The window position is display relative, at least for now... Sam Lantinga <slouken@libsdl.org> parents: 3529 diff changeset	505 rect.origin.x = bounds.x + window->x;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	506 }
3075 4c28a9655933 Fixed bug using SDL_WINDOWPOS_CENTERED with SDL_SetWindowPosition() Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	507 if ((window->flags & SDL_WINDOW_FULLSCREEN)
4c28a9655933 Fixed bug using SDL_WINDOWPOS_CENTERED with SDL_SetWindowPosition() Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	508 \|\| window->y == SDL_WINDOWPOS_CENTERED) {
3528 59ff7a2beb57 Added an API function to query geometry of multiple monitors: Sam Lantinga <slouken@libsdl.org> parents: 3525 diff changeset	509 rect.origin.y = bounds.y + (bounds.h - window->h) / 2;
59ff7a2beb57 Added an API function to query geometry of multiple monitors: Sam Lantinga <slouken@libsdl.org> parents: 3525 diff changeset	510 } else if (window->x == SDL_WINDOWPOS_UNDEFINED) {
59ff7a2beb57 Added an API function to query geometry of multiple monitors: Sam Lantinga <slouken@libsdl.org> parents: 3525 diff changeset	511 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	512 } else {
3530 e96be66e3673 The window position is display relative, at least for now... Sam Lantinga <slouken@libsdl.org> parents: 3529 diff changeset	513 rect.origin.y = bounds.y + window->y;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	514 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	515 rect.size.width = window->w;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	516 rect.size.height = window->h;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	517 ConvertNSRect(&rect);
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	518
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	519 if (window->flags & SDL_WINDOW_BORDERLESS) {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	520 style = NSBorderlessWindowMask;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	521 } else {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	522 style = (NSTitledWindowMask\|NSClosableWindowMask\|NSMiniaturizableWindowMask);
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	523 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	524 if (window->flags & SDL_WINDOW_RESIZABLE) {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	525 style \|= NSResizableWindowMask;
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
3506 e829b6098435 Added support for placing windows on different displays Sam Lantinga <slouken@libsdl.org> parents: 3414 diff changeset	528 /* 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	529 NSArray *screens = [NSScreen screens];
e829b6098435 Added support for placing windows on different displays Sam Lantinga <slouken@libsdl.org> parents: 3414 diff changeset	530 NSScreen *screen = nil;
e829b6098435 Added support for placing windows on different displays Sam Lantinga <slouken@libsdl.org> parents: 3414 diff changeset	531 NSScreen *candidate;
3525 455a6c47d2c6 Fixed compilation on Mac OS X 10.4 Sam Lantinga <slouken@libsdl.org> parents: 3517 diff changeset	532 int i, count = [screens count];
455a6c47d2c6 Fixed compilation on Mac OS X 10.4 Sam Lantinga <slouken@libsdl.org> parents: 3517 diff changeset	533 for (i = 0; i < count; ++i) {
3529 09155ec3e291 Fixed crash Sam Lantinga <slouken@libsdl.org> parents: 3528 diff changeset	534 candidate = [screens objectAtIndex:i];
3506 e829b6098435 Added support for placing windows on different displays Sam Lantinga <slouken@libsdl.org> parents: 3414 diff changeset	535 NSRect screenRect = [candidate frame];
e829b6098435 Added support for placing windows on different displays Sam Lantinga <slouken@libsdl.org> parents: 3414 diff changeset	536 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	537 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	538 rect.origin.y >= screenRect.origin.y &&
e829b6098435 Added support for placing windows on different displays Sam Lantinga <slouken@libsdl.org> parents: 3414 diff changeset	539 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	540 screen = candidate;
e829b6098435 Added support for placing windows on different displays Sam Lantinga <slouken@libsdl.org> parents: 3414 diff changeset	541 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.y -= screenRect.origin.y;
e829b6098435 Added support for placing windows on different displays Sam Lantinga <slouken@libsdl.org> parents: 3414 diff changeset	543 }
e829b6098435 Added support for placing windows on different displays Sam Lantinga <slouken@libsdl.org> parents: 3414 diff changeset	544 }
e829b6098435 Added support for placing windows on different displays Sam Lantinga <slouken@libsdl.org> parents: 3414 diff changeset	545 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	546
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	547 [pool release];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	548
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: 1937 diff changeset	549 if (SetupWindowData(_this, window, nswindow, SDL_TRUE) < 0) {
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	550 [nswindow release];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	551 return -1;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	552 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	553 return 0;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	554 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	555
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	556 int
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	557 Cocoa_CreateWindowFrom(_THIS, SDL_Window * window, const void *data)
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	558 {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	559 NSAutoreleasePool *pool;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	560 NSWindow nswindow = (NSWindow ) data;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	561 NSString *title;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	562
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	563 pool = [[NSAutoreleasePool alloc] init];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	564
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	565 /* Query the title from the existing window */
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	566 title = [nswindow title];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	567 if (title) {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	568 window->title = SDL_strdup([title UTF8String]);
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	569 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	570
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	571 [pool release];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	572
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: 1937 diff changeset	573 return SetupWindowData(_this, window, nswindow, SDL_FALSE);
1933 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 void
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	577 Cocoa_SetWindowTitle(_THIS, SDL_Window * window)
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	578 {
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	579 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
3688 6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	580 NSWindow nswindow = ((SDL_WindowData ) window->driverdata)->nswindow;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	581 NSString *string;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	582
1956 ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	583 if(window->title) {
ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	584 string = [[NSString alloc] initWithUTF8String:window->title];
ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	585 } else {
ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	586 string = [[NSString alloc] init];
ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	587 }
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	588 [nswindow setTitle:string];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	589 [string release];
1956 ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	590
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	591 [pool release];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	592 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	593
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	594 void
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	595 Cocoa_SetWindowPosition(_THIS, SDL_Window * window)
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	596 {
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	597 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
3688 6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	598 NSWindow nswindow = ((SDL_WindowData ) window->driverdata)->nswindow;
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3530 diff changeset	599 SDL_VideoDisplay *display = window->display;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	600 NSRect rect;
3528 59ff7a2beb57 Added an API function to query geometry of multiple monitors: Sam Lantinga <slouken@libsdl.org> parents: 3525 diff changeset	601 SDL_Rect bounds;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	602
3528 59ff7a2beb57 Added an API function to query geometry of multiple monitors: Sam Lantinga <slouken@libsdl.org> parents: 3525 diff changeset	603 Cocoa_GetDisplayBounds(_this, display, &bounds);
3075 4c28a9655933 Fixed bug using SDL_WINDOWPOS_CENTERED with SDL_SetWindowPosition() Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	604 if ((window->flags & SDL_WINDOW_FULLSCREEN)
4c28a9655933 Fixed bug using SDL_WINDOWPOS_CENTERED with SDL_SetWindowPosition() Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	605 \|\| window->x == SDL_WINDOWPOS_CENTERED) {
3528 59ff7a2beb57 Added an API function to query geometry of multiple monitors: Sam Lantinga <slouken@libsdl.org> parents: 3525 diff changeset	606 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	607 } else {
3530 e96be66e3673 The window position is display relative, at least for now... Sam Lantinga <slouken@libsdl.org> parents: 3529 diff changeset	608 rect.origin.x = bounds.x + window->x;
3075 4c28a9655933 Fixed bug using SDL_WINDOWPOS_CENTERED with SDL_SetWindowPosition() Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	609 }
4c28a9655933 Fixed bug using SDL_WINDOWPOS_CENTERED with SDL_SetWindowPosition() Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	610 if ((window->flags & SDL_WINDOW_FULLSCREEN)
4c28a9655933 Fixed bug using SDL_WINDOWPOS_CENTERED with SDL_SetWindowPosition() Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	611 \|\| window->y == SDL_WINDOWPOS_CENTERED) {
3528 59ff7a2beb57 Added an API function to query geometry of multiple monitors: Sam Lantinga <slouken@libsdl.org> parents: 3525 diff changeset	612 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	613 } else {
3530 e96be66e3673 The window position is display relative, at least for now... Sam Lantinga <slouken@libsdl.org> parents: 3529 diff changeset	614 rect.origin.y = bounds.y + window->y;
3075 4c28a9655933 Fixed bug using SDL_WINDOWPOS_CENTERED with SDL_SetWindowPosition() Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	615 }
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	616 rect.size.width = window->w;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	617 rect.size.height = window->h;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	618 ConvertNSRect(&rect);
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	619 rect = [nswindow frameRectForContentRect:rect];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	620 [nswindow setFrameOrigin:rect.origin];
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	621 [pool release];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	622 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	623
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	624 void
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	625 Cocoa_SetWindowSize(_THIS, SDL_Window * window)
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	626 {
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	627 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
3688 6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	628 NSWindow nswindow = ((SDL_WindowData ) window->driverdata)->nswindow;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	629 NSSize size;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	630
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	631 size.width = window->w;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	632 size.height = window->h;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	633 [nswindow setContentSize:size];
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	634 [pool release];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	635 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	636
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	637 void
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	638 Cocoa_ShowWindow(_THIS, SDL_Window * window)
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	639 {
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	640 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
3688 6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	641 NSWindow nswindow = ((SDL_WindowData ) window->driverdata)->nswindow;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	642
1956 ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	643 if (![nswindow isMiniaturized]) {
ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	644 [nswindow makeKeyAndOrderFront:nil];
ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	645 }
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	646 [pool release];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	647 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	648
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	649 void
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	650 Cocoa_HideWindow(_THIS, SDL_Window * window)
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	651 {
1956 ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	652 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
3688 6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	653 NSWindow nswindow = ((SDL_WindowData ) window->driverdata)->nswindow;
1933 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 [nswindow orderOut:nil];
ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	656 [pool release];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	657 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	658
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	659 void
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	660 Cocoa_RaiseWindow(_THIS, SDL_Window * window)
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	661 {
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	662 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
3688 6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	663 NSWindow nswindow = ((SDL_WindowData ) window->driverdata)->nswindow;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	664
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	665 [nswindow makeKeyAndOrderFront:nil];
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	666 [pool release];
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
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	669 void
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	670 Cocoa_MaximizeWindow(_THIS, SDL_Window * window)
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	671 {
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	672 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
3688 6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	673 NSWindow nswindow = ((SDL_WindowData ) window->driverdata)->nswindow;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	674
1956 ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	675 [nswindow zoom:nil];
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	676 [pool release];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	677 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	678
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	679 void
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	680 Cocoa_MinimizeWindow(_THIS, SDL_Window * window)
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	681 {
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	682 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
3688 6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	683 NSWindow nswindow = ((SDL_WindowData ) window->driverdata)->nswindow;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	684
1956 ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	685 [nswindow miniaturize:nil];
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	686 [pool release];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	687 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	688
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	689 void
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	690 Cocoa_RestoreWindow(_THIS, SDL_Window * window)
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	691 {
1956 ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	692 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
3688 6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	693 NSWindow nswindow = ((SDL_WindowData ) window->driverdata)->nswindow;
1933 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 if ([nswindow isMiniaturized]) {
ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	696 [nswindow deminiaturize:nil];
ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	697 } else if ([nswindow isZoomed]) {
ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	698 [nswindow zoom:nil];
ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	699 }
ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	700 [pool release];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	701 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	702
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	703 void
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	704 Cocoa_SetWindowGrab(_THIS, SDL_Window * window)
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 if ((window->flags & SDL_WINDOW_INPUT_GRABBED) &&
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	707 (window->flags & SDL_WINDOW_INPUT_FOCUS)) {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	708 /* FIXME: Grab mouse */
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	709 } else {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	710 /* FIXME: Release mouse */
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	711 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	712 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	713
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	714 void
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	715 Cocoa_DestroyWindow(_THIS, SDL_Window * window)
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	716 {
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	717 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	718 SDL_WindowData data = (SDL_WindowData ) window->driverdata;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	719
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	720 if (data) {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	721 [data->listener close];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	722 [data->listener release];
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	723 if (data->created) {
3688 6512cba48440 Fixed Cocoa and OpenGL builds Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	724 [data->nswindow close];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	725 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	726 SDL_free(data);
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	727 }
1937 05e88d266921 Fixed Objective-C memory leaks Sam Lantinga <slouken@libsdl.org> parents: 1936 diff changeset	728 [pool release];
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	729 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	730
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	731 SDL_bool
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	732 Cocoa_GetWindowWMInfo(_THIS, SDL_Window * window, SDL_SysWMinfo * info)
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	733 {
4900 69d9db65f248 Merged the Windows custom window system hooks into the union used by X11. Sam Lantinga <slouken@libsdl.org> parents: 4862 diff changeset	734 NSWindow nswindow = ((SDL_WindowData ) window->driverdata)->nswindow;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	735
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	736 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	737 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	738 info->info.cocoa.window = nswindow;
1933 7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	739 return SDL_TRUE;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	740 } else {
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	741 SDL_SetError("Application not compiled with SDL %d.%d\n",
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	742 SDL_MAJOR_VERSION, SDL_MINOR_VERSION);
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	743 return SDL_FALSE;
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	744 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	745 }
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	746
7ee5297340f7 Implemented Cocoa window support Sam Lantinga <slouken@libsdl.org> parents: diff changeset	747 /* vi: set ts=4 sw=4 expandtab: */

Mercurial > sdl-ios-xcode

annotate src/video/cocoa/SDL_cocoawindow.m @ 5057:bdff53ed6c8b