author | Ryan C. Gordon <icculus@icculus.org> |
Sat, 03 Aug 2013 02:20:00 -0400 | |
changeset 7566 | b14d00c30095 |
parent 7535 | c515121a3df7 |
child 7593 | 20298a0d8631 |
permissions | -rw-r--r-- |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
1 |
/* |
5535
96594ac5fd1a
SDL 1.3 is now under the zlib license.
Sam Lantinga <slouken@libsdl.org>
parents:
5502
diff
changeset
|
2 |
Simple DirectMedia Layer |
6885 | 3 |
Copyright (C) 1997-2013 Sam Lantinga <slouken@libsdl.org> |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
4 |
|
5535
96594ac5fd1a
SDL 1.3 is now under the zlib license.
Sam Lantinga <slouken@libsdl.org>
parents:
5502
diff
changeset
|
5 |
This software is provided 'as-is', without any express or implied |
96594ac5fd1a
SDL 1.3 is now under the zlib license.
Sam Lantinga <slouken@libsdl.org>
parents:
5502
diff
changeset
|
6 |
warranty. In no event will the authors be held liable for any damages |
96594ac5fd1a
SDL 1.3 is now under the zlib license.
Sam Lantinga <slouken@libsdl.org>
parents:
5502
diff
changeset
|
7 |
arising from the use of this software. |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
8 |
|
5535
96594ac5fd1a
SDL 1.3 is now under the zlib license.
Sam Lantinga <slouken@libsdl.org>
parents:
5502
diff
changeset
|
9 |
Permission is granted to anyone to use this software for any purpose, |
96594ac5fd1a
SDL 1.3 is now under the zlib license.
Sam Lantinga <slouken@libsdl.org>
parents:
5502
diff
changeset
|
10 |
including commercial applications, and to alter it and redistribute it |
96594ac5fd1a
SDL 1.3 is now under the zlib license.
Sam Lantinga <slouken@libsdl.org>
parents:
5502
diff
changeset
|
11 |
freely, subject to the following restrictions: |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
12 |
|
5535
96594ac5fd1a
SDL 1.3 is now under the zlib license.
Sam Lantinga <slouken@libsdl.org>
parents:
5502
diff
changeset
|
13 |
1. The origin of this software must not be misrepresented; you must not |
96594ac5fd1a
SDL 1.3 is now under the zlib license.
Sam Lantinga <slouken@libsdl.org>
parents:
5502
diff
changeset
|
14 |
claim that you wrote the original software. If you use this software |
96594ac5fd1a
SDL 1.3 is now under the zlib license.
Sam Lantinga <slouken@libsdl.org>
parents:
5502
diff
changeset
|
15 |
in a product, an acknowledgment in the product documentation would be |
96594ac5fd1a
SDL 1.3 is now under the zlib license.
Sam Lantinga <slouken@libsdl.org>
parents:
5502
diff
changeset
|
16 |
appreciated but is not required. |
96594ac5fd1a
SDL 1.3 is now under the zlib license.
Sam Lantinga <slouken@libsdl.org>
parents:
5502
diff
changeset
|
17 |
2. Altered source versions must be plainly marked as such, and must not be |
96594ac5fd1a
SDL 1.3 is now under the zlib license.
Sam Lantinga <slouken@libsdl.org>
parents:
5502
diff
changeset
|
18 |
misrepresented as being the original software. |
96594ac5fd1a
SDL 1.3 is now under the zlib license.
Sam Lantinga <slouken@libsdl.org>
parents:
5502
diff
changeset
|
19 |
3. This notice may not be removed or altered from any source distribution. |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
20 |
*/ |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
21 |
#include "SDL_config.h" |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
22 |
|
6044
35448a5ea044
Lots of fixes importing SDL source wholesale into a new iOS project
Sam Lantinga <slouken@libsdl.org>
parents:
5873
diff
changeset
|
23 |
#if SDL_VIDEO_DRIVER_COCOA |
35448a5ea044
Lots of fixes importing SDL source wholesale into a new iOS project
Sam Lantinga <slouken@libsdl.org>
parents:
5873
diff
changeset
|
24 |
|
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
25 |
#include "SDL_syswm.h" |
5398
83816c8a2b58
Restore the windowed position and size when coming back from fullscreen.
Sam Lantinga <slouken@libsdl.org>
parents:
5396
diff
changeset
|
26 |
#include "SDL_timer.h" /* For SDL_GetTicks() */ |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
27 |
#include "../SDL_sysvideo.h" |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
28 |
#include "../../events/SDL_keyboard_c.h" |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
29 |
#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
|
30 |
#include "../../events/SDL_touch_c.h" |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
31 |
#include "../../events/SDL_windowevents_c.h" |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
32 |
#include "SDL_cocoavideo.h" |
4811
d79939f20c45
Working on Cocoa implementation.
Eli Gottlieb <eligottlieb@gmail.com>
parents:
3688
diff
changeset
|
33 |
#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
|
34 |
#include "SDL_cocoamouse.h" |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
35 |
|
5398
83816c8a2b58
Restore the windowed position and size when coming back from fullscreen.
Sam Lantinga <slouken@libsdl.org>
parents:
5396
diff
changeset
|
36 |
|
83816c8a2b58
Restore the windowed position and size when coming back from fullscreen.
Sam Lantinga <slouken@libsdl.org>
parents:
5396
diff
changeset
|
37 |
static Uint32 s_moveHack; |
83816c8a2b58
Restore the windowed position and size when coming back from fullscreen.
Sam Lantinga <slouken@libsdl.org>
parents:
5396
diff
changeset
|
38 |
|
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
39 |
static __inline__ void ConvertNSRect(NSRect *r) |
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 |
r->origin.y = CGDisplayPixelsHigh(kCGDirectMainDisplay) - r->origin.y - r->size.height; |
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 |
|
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
44 |
@implementation Cocoa_WindowListener |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
45 |
|
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
46 |
- (void)listen:(SDL_WindowData *)data |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
47 |
{ |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
48 |
NSNotificationCenter *center; |
5371
fc3d3d580777
Fixed the responder chain for event handling, the listener fully handles mouse events - even in fullscreen mode.
Sam Lantinga <slouken@libsdl.org>
parents:
5367
diff
changeset
|
49 |
NSWindow *window = data->nswindow; |
fc3d3d580777
Fixed the responder chain for event handling, the listener fully handles mouse events - even in fullscreen mode.
Sam Lantinga <slouken@libsdl.org>
parents:
5367
diff
changeset
|
50 |
NSView *view = [window contentView]; |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
51 |
|
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
52 |
_data = data; |
7087
5639ac726076
Fix Mac crash when creating fullscreen window introduced in 9d43403e9fc5.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7085
diff
changeset
|
53 |
observingVisible = YES; |
5639ac726076
Fix Mac crash when creating fullscreen window introduced in 9d43403e9fc5.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7085
diff
changeset
|
54 |
wasVisible = [window isVisible]; |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
55 |
|
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
56 |
center = [NSNotificationCenter defaultCenter]; |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
57 |
|
5374
dacb4f5e0dd3
We still want the delegate functionality for windowShouldClose()
Sam Lantinga <slouken@libsdl.org>
parents:
5371
diff
changeset
|
58 |
if ([window delegate] != nil) { |
dacb4f5e0dd3
We still want the delegate functionality for windowShouldClose()
Sam Lantinga <slouken@libsdl.org>
parents:
5371
diff
changeset
|
59 |
[center addObserver:self selector:@selector(windowDidExpose:) name:NSWindowDidExposeNotification object:window]; |
dacb4f5e0dd3
We still want the delegate functionality for windowShouldClose()
Sam Lantinga <slouken@libsdl.org>
parents:
5371
diff
changeset
|
60 |
[center addObserver:self selector:@selector(windowDidMove:) name:NSWindowDidMoveNotification object:window]; |
dacb4f5e0dd3
We still want the delegate functionality for windowShouldClose()
Sam Lantinga <slouken@libsdl.org>
parents:
5371
diff
changeset
|
61 |
[center addObserver:self selector:@selector(windowDidResize:) name:NSWindowDidResizeNotification object:window]; |
dacb4f5e0dd3
We still want the delegate functionality for windowShouldClose()
Sam Lantinga <slouken@libsdl.org>
parents:
5371
diff
changeset
|
62 |
[center addObserver:self selector:@selector(windowDidMiniaturize:) name:NSWindowDidMiniaturizeNotification object:window]; |
dacb4f5e0dd3
We still want the delegate functionality for windowShouldClose()
Sam Lantinga <slouken@libsdl.org>
parents:
5371
diff
changeset
|
63 |
[center addObserver:self selector:@selector(windowDidDeminiaturize:) name:NSWindowDidDeminiaturizeNotification object:window]; |
dacb4f5e0dd3
We still want the delegate functionality for windowShouldClose()
Sam Lantinga <slouken@libsdl.org>
parents:
5371
diff
changeset
|
64 |
[center addObserver:self selector:@selector(windowDidBecomeKey:) name:NSWindowDidBecomeKeyNotification object:window]; |
dacb4f5e0dd3
We still want the delegate functionality for windowShouldClose()
Sam Lantinga <slouken@libsdl.org>
parents:
5371
diff
changeset
|
65 |
[center addObserver:self selector:@selector(windowDidResignKey:) name:NSWindowDidResignKeyNotification object:window]; |
dacb4f5e0dd3
We still want the delegate functionality for windowShouldClose()
Sam Lantinga <slouken@libsdl.org>
parents:
5371
diff
changeset
|
66 |
} else { |
dacb4f5e0dd3
We still want the delegate functionality for windowShouldClose()
Sam Lantinga <slouken@libsdl.org>
parents:
5371
diff
changeset
|
67 |
[window setDelegate:self]; |
dacb4f5e0dd3
We still want the delegate functionality for windowShouldClose()
Sam Lantinga <slouken@libsdl.org>
parents:
5371
diff
changeset
|
68 |
} |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
69 |
|
7191
75360622e65f
File style cleanup for the SDL 2.0 release
Sam Lantinga <slouken@libsdl.org>
parents:
7158
diff
changeset
|
70 |
/* Haven't found a delegate / notification that triggers when the window is |
75360622e65f
File style cleanup for the SDL 2.0 release
Sam Lantinga <slouken@libsdl.org>
parents:
7158
diff
changeset
|
71 |
* ordered out (is not visible any more). You can be ordered out without |
75360622e65f
File style cleanup for the SDL 2.0 release
Sam Lantinga <slouken@libsdl.org>
parents:
7158
diff
changeset
|
72 |
* minimizing, so DidMiniaturize doesn't work. (e.g. -[NSWindow orderOut:]) |
75360622e65f
File style cleanup for the SDL 2.0 release
Sam Lantinga <slouken@libsdl.org>
parents:
7158
diff
changeset
|
73 |
*/ |
7084
9d43403e9fc5
Properly reflect hidden/shown windows on OSX.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7037
diff
changeset
|
74 |
[window addObserver:self |
9d43403e9fc5
Properly reflect hidden/shown windows on OSX.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7037
diff
changeset
|
75 |
forKeyPath:@"visible" |
9d43403e9fc5
Properly reflect hidden/shown windows on OSX.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7037
diff
changeset
|
76 |
options:NSKeyValueObservingOptionNew |
9d43403e9fc5
Properly reflect hidden/shown windows on OSX.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7037
diff
changeset
|
77 |
context:NULL]; |
9d43403e9fc5
Properly reflect hidden/shown windows on OSX.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7037
diff
changeset
|
78 |
|
5371
fc3d3d580777
Fixed the responder chain for event handling, the listener fully handles mouse events - even in fullscreen mode.
Sam Lantinga <slouken@libsdl.org>
parents:
5367
diff
changeset
|
79 |
[window setNextResponder:self]; |
fc3d3d580777
Fixed the responder chain for event handling, the listener fully handles mouse events - even in fullscreen mode.
Sam Lantinga <slouken@libsdl.org>
parents:
5367
diff
changeset
|
80 |
[window setAcceptsMouseMovedEvents:YES]; |
fc3d3d580777
Fixed the responder chain for event handling, the listener fully handles mouse events - even in fullscreen mode.
Sam Lantinga <slouken@libsdl.org>
parents:
5367
diff
changeset
|
81 |
|
fc3d3d580777
Fixed the responder chain for event handling, the listener fully handles mouse events - even in fullscreen mode.
Sam Lantinga <slouken@libsdl.org>
parents:
5367
diff
changeset
|
82 |
[view setNextResponder:self]; |
6108
f3c34d321289
Don't call -[NSView setAcceptsTouchEvents] if the OS doesn't provide it.
Ryan C. Gordon <icculus@icculus.org>
parents:
6044
diff
changeset
|
83 |
|
f3c34d321289
Don't call -[NSView setAcceptsTouchEvents] if the OS doesn't provide it.
Ryan C. Gordon <icculus@icculus.org>
parents:
6044
diff
changeset
|
84 |
if ([view respondsToSelector:@selector(setAcceptsTouchEvents:)]) { |
f3c34d321289
Don't call -[NSView setAcceptsTouchEvents] if the OS doesn't provide it.
Ryan C. Gordon <icculus@icculus.org>
parents:
6044
diff
changeset
|
85 |
[view setAcceptsTouchEvents:YES]; |
f3c34d321289
Don't call -[NSView setAcceptsTouchEvents] if the OS doesn't provide it.
Ryan C. Gordon <icculus@icculus.org>
parents:
6044
diff
changeset
|
86 |
} |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
87 |
} |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
88 |
|
7084
9d43403e9fc5
Properly reflect hidden/shown windows on OSX.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7037
diff
changeset
|
89 |
- (void)observeValueForKeyPath:(NSString *)keyPath |
9d43403e9fc5
Properly reflect hidden/shown windows on OSX.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7037
diff
changeset
|
90 |
ofObject:(id)object |
9d43403e9fc5
Properly reflect hidden/shown windows on OSX.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7037
diff
changeset
|
91 |
change:(NSDictionary *)change |
9d43403e9fc5
Properly reflect hidden/shown windows on OSX.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7037
diff
changeset
|
92 |
context:(void *)context |
9d43403e9fc5
Properly reflect hidden/shown windows on OSX.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7037
diff
changeset
|
93 |
{ |
7087
5639ac726076
Fix Mac crash when creating fullscreen window introduced in 9d43403e9fc5.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7085
diff
changeset
|
94 |
if (!observingVisible) { |
5639ac726076
Fix Mac crash when creating fullscreen window introduced in 9d43403e9fc5.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7085
diff
changeset
|
95 |
return; |
5639ac726076
Fix Mac crash when creating fullscreen window introduced in 9d43403e9fc5.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7085
diff
changeset
|
96 |
} |
5639ac726076
Fix Mac crash when creating fullscreen window introduced in 9d43403e9fc5.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7085
diff
changeset
|
97 |
|
7084
9d43403e9fc5
Properly reflect hidden/shown windows on OSX.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7037
diff
changeset
|
98 |
if (object == _data->nswindow && [keyPath isEqualToString:@"visible"]) { |
9d43403e9fc5
Properly reflect hidden/shown windows on OSX.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7037
diff
changeset
|
99 |
int newVisibility = [[change objectForKey:@"new"] intValue]; |
9d43403e9fc5
Properly reflect hidden/shown windows on OSX.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7037
diff
changeset
|
100 |
if (newVisibility) { |
9d43403e9fc5
Properly reflect hidden/shown windows on OSX.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7037
diff
changeset
|
101 |
SDL_SendWindowEvent(_data->window, SDL_WINDOWEVENT_SHOWN, 0, 0); |
9d43403e9fc5
Properly reflect hidden/shown windows on OSX.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7037
diff
changeset
|
102 |
} else { |
9d43403e9fc5
Properly reflect hidden/shown windows on OSX.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7037
diff
changeset
|
103 |
SDL_SendWindowEvent(_data->window, SDL_WINDOWEVENT_HIDDEN, 0, 0); |
9d43403e9fc5
Properly reflect hidden/shown windows on OSX.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7037
diff
changeset
|
104 |
} |
9d43403e9fc5
Properly reflect hidden/shown windows on OSX.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7037
diff
changeset
|
105 |
} |
9d43403e9fc5
Properly reflect hidden/shown windows on OSX.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7037
diff
changeset
|
106 |
} |
9d43403e9fc5
Properly reflect hidden/shown windows on OSX.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7037
diff
changeset
|
107 |
|
7087
5639ac726076
Fix Mac crash when creating fullscreen window introduced in 9d43403e9fc5.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7085
diff
changeset
|
108 |
-(void) pauseVisibleObservation |
5639ac726076
Fix Mac crash when creating fullscreen window introduced in 9d43403e9fc5.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7085
diff
changeset
|
109 |
{ |
5639ac726076
Fix Mac crash when creating fullscreen window introduced in 9d43403e9fc5.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7085
diff
changeset
|
110 |
observingVisible = NO; |
5639ac726076
Fix Mac crash when creating fullscreen window introduced in 9d43403e9fc5.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7085
diff
changeset
|
111 |
wasVisible = [_data->nswindow isVisible]; |
5639ac726076
Fix Mac crash when creating fullscreen window introduced in 9d43403e9fc5.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7085
diff
changeset
|
112 |
} |
5639ac726076
Fix Mac crash when creating fullscreen window introduced in 9d43403e9fc5.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7085
diff
changeset
|
113 |
|
5639ac726076
Fix Mac crash when creating fullscreen window introduced in 9d43403e9fc5.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7085
diff
changeset
|
114 |
-(void) resumeVisibleObservation |
5639ac726076
Fix Mac crash when creating fullscreen window introduced in 9d43403e9fc5.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7085
diff
changeset
|
115 |
{ |
5639ac726076
Fix Mac crash when creating fullscreen window introduced in 9d43403e9fc5.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7085
diff
changeset
|
116 |
BOOL isVisible = [_data->nswindow isVisible]; |
5639ac726076
Fix Mac crash when creating fullscreen window introduced in 9d43403e9fc5.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7085
diff
changeset
|
117 |
observingVisible = YES; |
5639ac726076
Fix Mac crash when creating fullscreen window introduced in 9d43403e9fc5.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7085
diff
changeset
|
118 |
if (wasVisible != isVisible) { |
5639ac726076
Fix Mac crash when creating fullscreen window introduced in 9d43403e9fc5.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7085
diff
changeset
|
119 |
if (isVisible) { |
5639ac726076
Fix Mac crash when creating fullscreen window introduced in 9d43403e9fc5.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7085
diff
changeset
|
120 |
SDL_SendWindowEvent(_data->window, SDL_WINDOWEVENT_SHOWN, 0, 0); |
5639ac726076
Fix Mac crash when creating fullscreen window introduced in 9d43403e9fc5.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7085
diff
changeset
|
121 |
} else { |
5639ac726076
Fix Mac crash when creating fullscreen window introduced in 9d43403e9fc5.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7085
diff
changeset
|
122 |
SDL_SendWindowEvent(_data->window, SDL_WINDOWEVENT_HIDDEN, 0, 0); |
5639ac726076
Fix Mac crash when creating fullscreen window introduced in 9d43403e9fc5.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7085
diff
changeset
|
123 |
} |
5639ac726076
Fix Mac crash when creating fullscreen window introduced in 9d43403e9fc5.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7085
diff
changeset
|
124 |
|
5639ac726076
Fix Mac crash when creating fullscreen window introduced in 9d43403e9fc5.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7085
diff
changeset
|
125 |
wasVisible = isVisible; |
5639ac726076
Fix Mac crash when creating fullscreen window introduced in 9d43403e9fc5.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7085
diff
changeset
|
126 |
} |
5639ac726076
Fix Mac crash when creating fullscreen window introduced in 9d43403e9fc5.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7085
diff
changeset
|
127 |
} |
5639ac726076
Fix Mac crash when creating fullscreen window introduced in 9d43403e9fc5.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7085
diff
changeset
|
128 |
|
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
129 |
- (void)close |
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 |
NSNotificationCenter *center; |
5371
fc3d3d580777
Fixed the responder chain for event handling, the listener fully handles mouse events - even in fullscreen mode.
Sam Lantinga <slouken@libsdl.org>
parents:
5367
diff
changeset
|
132 |
NSWindow *window = _data->nswindow; |
fc3d3d580777
Fixed the responder chain for event handling, the listener fully handles mouse events - even in fullscreen mode.
Sam Lantinga <slouken@libsdl.org>
parents:
5367
diff
changeset
|
133 |
NSView *view = [window contentView]; |
7534
f0f5143b27cf
Cocoa: Make the next-highest window gain focus when a window is closing.
Ryan C. Gordon <icculus@icculus.org>
parents:
7507
diff
changeset
|
134 |
NSArray *windows = nil; |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
135 |
|
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
136 |
center = [NSNotificationCenter defaultCenter]; |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
137 |
|
5374
dacb4f5e0dd3
We still want the delegate functionality for windowShouldClose()
Sam Lantinga <slouken@libsdl.org>
parents:
5371
diff
changeset
|
138 |
if ([window delegate] != self) { |
dacb4f5e0dd3
We still want the delegate functionality for windowShouldClose()
Sam Lantinga <slouken@libsdl.org>
parents:
5371
diff
changeset
|
139 |
[center removeObserver:self name:NSWindowDidExposeNotification object:window]; |
dacb4f5e0dd3
We still want the delegate functionality for windowShouldClose()
Sam Lantinga <slouken@libsdl.org>
parents:
5371
diff
changeset
|
140 |
[center removeObserver:self name:NSWindowDidMoveNotification object:window]; |
dacb4f5e0dd3
We still want the delegate functionality for windowShouldClose()
Sam Lantinga <slouken@libsdl.org>
parents:
5371
diff
changeset
|
141 |
[center removeObserver:self name:NSWindowDidResizeNotification object:window]; |
dacb4f5e0dd3
We still want the delegate functionality for windowShouldClose()
Sam Lantinga <slouken@libsdl.org>
parents:
5371
diff
changeset
|
142 |
[center removeObserver:self name:NSWindowDidMiniaturizeNotification object:window]; |
dacb4f5e0dd3
We still want the delegate functionality for windowShouldClose()
Sam Lantinga <slouken@libsdl.org>
parents:
5371
diff
changeset
|
143 |
[center removeObserver:self name:NSWindowDidDeminiaturizeNotification object:window]; |
dacb4f5e0dd3
We still want the delegate functionality for windowShouldClose()
Sam Lantinga <slouken@libsdl.org>
parents:
5371
diff
changeset
|
144 |
[center removeObserver:self name:NSWindowDidBecomeKeyNotification object:window]; |
dacb4f5e0dd3
We still want the delegate functionality for windowShouldClose()
Sam Lantinga <slouken@libsdl.org>
parents:
5371
diff
changeset
|
145 |
[center removeObserver:self name:NSWindowDidResignKeyNotification object:window]; |
dacb4f5e0dd3
We still want the delegate functionality for windowShouldClose()
Sam Lantinga <slouken@libsdl.org>
parents:
5371
diff
changeset
|
146 |
} else { |
dacb4f5e0dd3
We still want the delegate functionality for windowShouldClose()
Sam Lantinga <slouken@libsdl.org>
parents:
5371
diff
changeset
|
147 |
[window setDelegate:nil]; |
dacb4f5e0dd3
We still want the delegate functionality for windowShouldClose()
Sam Lantinga <slouken@libsdl.org>
parents:
5371
diff
changeset
|
148 |
} |
5371
fc3d3d580777
Fixed the responder chain for event handling, the listener fully handles mouse events - even in fullscreen mode.
Sam Lantinga <slouken@libsdl.org>
parents:
5367
diff
changeset
|
149 |
|
7084
9d43403e9fc5
Properly reflect hidden/shown windows on OSX.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7037
diff
changeset
|
150 |
[window removeObserver:self |
9d43403e9fc5
Properly reflect hidden/shown windows on OSX.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7037
diff
changeset
|
151 |
forKeyPath:@"visible"]; |
9d43403e9fc5
Properly reflect hidden/shown windows on OSX.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7037
diff
changeset
|
152 |
|
5374
dacb4f5e0dd3
We still want the delegate functionality for windowShouldClose()
Sam Lantinga <slouken@libsdl.org>
parents:
5371
diff
changeset
|
153 |
if ([window nextResponder] == self) { |
dacb4f5e0dd3
We still want the delegate functionality for windowShouldClose()
Sam Lantinga <slouken@libsdl.org>
parents:
5371
diff
changeset
|
154 |
[window setNextResponder:nil]; |
dacb4f5e0dd3
We still want the delegate functionality for windowShouldClose()
Sam Lantinga <slouken@libsdl.org>
parents:
5371
diff
changeset
|
155 |
} |
dacb4f5e0dd3
We still want the delegate functionality for windowShouldClose()
Sam Lantinga <slouken@libsdl.org>
parents:
5371
diff
changeset
|
156 |
if ([view nextResponder] == self) { |
dacb4f5e0dd3
We still want the delegate functionality for windowShouldClose()
Sam Lantinga <slouken@libsdl.org>
parents:
5371
diff
changeset
|
157 |
[view setNextResponder:nil]; |
dacb4f5e0dd3
We still want the delegate functionality for windowShouldClose()
Sam Lantinga <slouken@libsdl.org>
parents:
5371
diff
changeset
|
158 |
} |
7534
f0f5143b27cf
Cocoa: Make the next-highest window gain focus when a window is closing.
Ryan C. Gordon <icculus@icculus.org>
parents:
7507
diff
changeset
|
159 |
|
f0f5143b27cf
Cocoa: Make the next-highest window gain focus when a window is closing.
Ryan C. Gordon <icculus@icculus.org>
parents:
7507
diff
changeset
|
160 |
/* Make the next window in the z-order Key. If we weren't the foreground |
7535
c515121a3df7
Added a FIXME discussion to last commit.
Ryan C. Gordon <icculus@icculus.org>
parents:
7534
diff
changeset
|
161 |
when closed, this is a no-op. |
c515121a3df7
Added a FIXME discussion to last commit.
Ryan C. Gordon <icculus@icculus.org>
parents:
7534
diff
changeset
|
162 |
!!! FIXME: Note that this is a hack, and there are corner cases where |
c515121a3df7
Added a FIXME discussion to last commit.
Ryan C. Gordon <icculus@icculus.org>
parents:
7534
diff
changeset
|
163 |
!!! FIXME: this fails (such as the About box). The typical nib+RunLoop |
c515121a3df7
Added a FIXME discussion to last commit.
Ryan C. Gordon <icculus@icculus.org>
parents:
7534
diff
changeset
|
164 |
!!! FIXME: handles this for Cocoa apps, but we bypass all that in SDL. |
c515121a3df7
Added a FIXME discussion to last commit.
Ryan C. Gordon <icculus@icculus.org>
parents:
7534
diff
changeset
|
165 |
!!! FIXME: We should remove this code when we find a better way to |
c515121a3df7
Added a FIXME discussion to last commit.
Ryan C. Gordon <icculus@icculus.org>
parents:
7534
diff
changeset
|
166 |
!!! FIXME: have the system do this for us. See discussion in |
c515121a3df7
Added a FIXME discussion to last commit.
Ryan C. Gordon <icculus@icculus.org>
parents:
7534
diff
changeset
|
167 |
!!! FIXME: http://bugzilla.libsdl.org/show_bug.cgi?id=1825 |
c515121a3df7
Added a FIXME discussion to last commit.
Ryan C. Gordon <icculus@icculus.org>
parents:
7534
diff
changeset
|
168 |
*/ |
7534
f0f5143b27cf
Cocoa: Make the next-highest window gain focus when a window is closing.
Ryan C. Gordon <icculus@icculus.org>
parents:
7507
diff
changeset
|
169 |
windows = [NSApp orderedWindows]; |
f0f5143b27cf
Cocoa: Make the next-highest window gain focus when a window is closing.
Ryan C. Gordon <icculus@icculus.org>
parents:
7507
diff
changeset
|
170 |
if ([windows count] > 0) { |
f0f5143b27cf
Cocoa: Make the next-highest window gain focus when a window is closing.
Ryan C. Gordon <icculus@icculus.org>
parents:
7507
diff
changeset
|
171 |
NSWindow *win = (NSWindow *) [windows objectAtIndex:0]; |
f0f5143b27cf
Cocoa: Make the next-highest window gain focus when a window is closing.
Ryan C. Gordon <icculus@icculus.org>
parents:
7507
diff
changeset
|
172 |
[win makeKeyAndOrderFront:self]; |
f0f5143b27cf
Cocoa: Make the next-highest window gain focus when a window is closing.
Ryan C. Gordon <icculus@icculus.org>
parents:
7507
diff
changeset
|
173 |
} |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
174 |
} |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
175 |
|
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
176 |
- (BOOL)windowShouldClose:(id)sender |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
177 |
{ |
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
|
178 |
SDL_SendWindowEvent(_data->window, SDL_WINDOWEVENT_CLOSE, 0, 0); |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
179 |
return NO; |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
180 |
} |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
181 |
|
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
182 |
- (void)windowDidExpose:(NSNotification *)aNotification |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
183 |
{ |
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
|
184 |
SDL_SendWindowEvent(_data->window, SDL_WINDOWEVENT_EXPOSED, 0, 0); |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
185 |
} |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
186 |
|
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
187 |
- (void)windowDidMove:(NSNotification *)aNotification |
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 |
int x, y; |
5564
7ed38a8ad304
Cocoa: Update the current GL context when its window moves or resizes.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
190 |
SDL_VideoDevice *device = SDL_GetVideoDevice(); |
5398
83816c8a2b58
Restore the windowed position and size when coming back from fullscreen.
Sam Lantinga <slouken@libsdl.org>
parents:
5396
diff
changeset
|
191 |
SDL_Window *window = _data->window; |
83816c8a2b58
Restore the windowed position and size when coming back from fullscreen.
Sam Lantinga <slouken@libsdl.org>
parents:
5396
diff
changeset
|
192 |
NSWindow *nswindow = _data->nswindow; |
83816c8a2b58
Restore the windowed position and size when coming back from fullscreen.
Sam Lantinga <slouken@libsdl.org>
parents:
5396
diff
changeset
|
193 |
NSRect rect = [nswindow contentRectForFrameRect:[nswindow frame]]; |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
194 |
ConvertNSRect(&rect); |
5398
83816c8a2b58
Restore the windowed position and size when coming back from fullscreen.
Sam Lantinga <slouken@libsdl.org>
parents:
5396
diff
changeset
|
195 |
|
83816c8a2b58
Restore the windowed position and size when coming back from fullscreen.
Sam Lantinga <slouken@libsdl.org>
parents:
5396
diff
changeset
|
196 |
if (s_moveHack) { |
83816c8a2b58
Restore the windowed position and size when coming back from fullscreen.
Sam Lantinga <slouken@libsdl.org>
parents:
5396
diff
changeset
|
197 |
SDL_bool blockMove = ((SDL_GetTicks() - s_moveHack) < 500); |
83816c8a2b58
Restore the windowed position and size when coming back from fullscreen.
Sam Lantinga <slouken@libsdl.org>
parents:
5396
diff
changeset
|
198 |
|
83816c8a2b58
Restore the windowed position and size when coming back from fullscreen.
Sam Lantinga <slouken@libsdl.org>
parents:
5396
diff
changeset
|
199 |
s_moveHack = 0; |
83816c8a2b58
Restore the windowed position and size when coming back from fullscreen.
Sam Lantinga <slouken@libsdl.org>
parents:
5396
diff
changeset
|
200 |
|
83816c8a2b58
Restore the windowed position and size when coming back from fullscreen.
Sam Lantinga <slouken@libsdl.org>
parents:
5396
diff
changeset
|
201 |
if (blockMove) { |
83816c8a2b58
Restore the windowed position and size when coming back from fullscreen.
Sam Lantinga <slouken@libsdl.org>
parents:
5396
diff
changeset
|
202 |
/* Cocoa is adjusting the window in response to a mode change */ |
83816c8a2b58
Restore the windowed position and size when coming back from fullscreen.
Sam Lantinga <slouken@libsdl.org>
parents:
5396
diff
changeset
|
203 |
rect.origin.x = window->x; |
83816c8a2b58
Restore the windowed position and size when coming back from fullscreen.
Sam Lantinga <slouken@libsdl.org>
parents:
5396
diff
changeset
|
204 |
rect.origin.y = window->y; |
83816c8a2b58
Restore the windowed position and size when coming back from fullscreen.
Sam Lantinga <slouken@libsdl.org>
parents:
5396
diff
changeset
|
205 |
ConvertNSRect(&rect); |
83816c8a2b58
Restore the windowed position and size when coming back from fullscreen.
Sam Lantinga <slouken@libsdl.org>
parents:
5396
diff
changeset
|
206 |
[nswindow setFrameOrigin:rect.origin]; |
83816c8a2b58
Restore the windowed position and size when coming back from fullscreen.
Sam Lantinga <slouken@libsdl.org>
parents:
5396
diff
changeset
|
207 |
return; |
83816c8a2b58
Restore the windowed position and size when coming back from fullscreen.
Sam Lantinga <slouken@libsdl.org>
parents:
5396
diff
changeset
|
208 |
} |
83816c8a2b58
Restore the windowed position and size when coming back from fullscreen.
Sam Lantinga <slouken@libsdl.org>
parents:
5396
diff
changeset
|
209 |
} |
83816c8a2b58
Restore the windowed position and size when coming back from fullscreen.
Sam Lantinga <slouken@libsdl.org>
parents:
5396
diff
changeset
|
210 |
|
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
|
211 |
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
|
212 |
y = (int)rect.origin.y; |
5564
7ed38a8ad304
Cocoa: Update the current GL context when its window moves or resizes.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
213 |
|
7ed38a8ad304
Cocoa: Update the current GL context when its window moves or resizes.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
214 |
if (window == device->current_glwin) { |
7ed38a8ad304
Cocoa: Update the current GL context when its window moves or resizes.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
215 |
[((NSOpenGLContext *) device->current_glctx) update]; |
7ed38a8ad304
Cocoa: Update the current GL context when its window moves or resizes.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
216 |
} |
7ed38a8ad304
Cocoa: Update the current GL context when its window moves or resizes.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
217 |
|
5398
83816c8a2b58
Restore the windowed position and size when coming back from fullscreen.
Sam Lantinga <slouken@libsdl.org>
parents:
5396
diff
changeset
|
218 |
SDL_SendWindowEvent(window, SDL_WINDOWEVENT_MOVED, x, y); |
1933
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 |
|
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
221 |
- (void)windowDidResize:(NSNotification *)aNotification |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
222 |
{ |
5564
7ed38a8ad304
Cocoa: Update the current GL context when its window moves or resizes.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
223 |
SDL_VideoDevice *device = SDL_GetVideoDevice(); |
6231
5eecf59b698f
Fixed bug 1372 - OSX Window Maximize/Resize Doesn't Update Window Position
Sam Lantinga <slouken@libsdl.org>
parents:
6185
diff
changeset
|
224 |
int x, y, w, h; |
3688
6512cba48440
Fixed Cocoa and OpenGL builds
Sam Lantinga <slouken@libsdl.org>
parents:
3685
diff
changeset
|
225 |
NSRect rect = [_data->nswindow contentRectForFrameRect:[_data->nswindow frame]]; |
6231
5eecf59b698f
Fixed bug 1372 - OSX Window Maximize/Resize Doesn't Update Window Position
Sam Lantinga <slouken@libsdl.org>
parents:
6185
diff
changeset
|
226 |
ConvertNSRect(&rect); |
5eecf59b698f
Fixed bug 1372 - OSX Window Maximize/Resize Doesn't Update Window Position
Sam Lantinga <slouken@libsdl.org>
parents:
6185
diff
changeset
|
227 |
x = (int)rect.origin.x; |
5eecf59b698f
Fixed bug 1372 - OSX Window Maximize/Resize Doesn't Update Window Position
Sam Lantinga <slouken@libsdl.org>
parents:
6185
diff
changeset
|
228 |
y = (int)rect.origin.y; |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
229 |
w = (int)rect.size.width; |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
230 |
h = (int)rect.size.height; |
4937
24d44c7c4c63
Don't crash when resizing non-shaped windows
Sam Lantinga <slouken@libsdl.org>
parents:
4927
diff
changeset
|
231 |
if (SDL_IsShapedWindow(_data->window)) |
24d44c7c4c63
Don't crash when resizing non-shaped windows
Sam Lantinga <slouken@libsdl.org>
parents:
4927
diff
changeset
|
232 |
Cocoa_ResizeWindowShape(_data->window); |
5564
7ed38a8ad304
Cocoa: Update the current GL context when its window moves or resizes.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
233 |
|
7ed38a8ad304
Cocoa: Update the current GL context when its window moves or resizes.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
234 |
if (_data->window == device->current_glwin) { |
7ed38a8ad304
Cocoa: Update the current GL context when its window moves or resizes.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
235 |
[((NSOpenGLContext *) device->current_glctx) update]; |
7ed38a8ad304
Cocoa: Update the current GL context when its window moves or resizes.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
236 |
} |
7ed38a8ad304
Cocoa: Update the current GL context when its window moves or resizes.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
237 |
|
6231
5eecf59b698f
Fixed bug 1372 - OSX Window Maximize/Resize Doesn't Update Window Position
Sam Lantinga <slouken@libsdl.org>
parents:
6185
diff
changeset
|
238 |
/* The window can move during a resize event, such as when maximizing |
5eecf59b698f
Fixed bug 1372 - OSX Window Maximize/Resize Doesn't Update Window Position
Sam Lantinga <slouken@libsdl.org>
parents:
6185
diff
changeset
|
239 |
or resizing from a corner */ |
5eecf59b698f
Fixed bug 1372 - OSX Window Maximize/Resize Doesn't Update Window Position
Sam Lantinga <slouken@libsdl.org>
parents:
6185
diff
changeset
|
240 |
SDL_SendWindowEvent(_data->window, SDL_WINDOWEVENT_MOVED, x, 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
|
241 |
SDL_SendWindowEvent(_data->window, SDL_WINDOWEVENT_RESIZED, w, h); |
7566
b14d00c30095
Some fixes for SDL_MaximizeWindow().
Ryan C. Gordon <icculus@icculus.org>
parents:
7535
diff
changeset
|
242 |
|
b14d00c30095
Some fixes for SDL_MaximizeWindow().
Ryan C. Gordon <icculus@icculus.org>
parents:
7535
diff
changeset
|
243 |
const BOOL zoomed = [_data->nswindow isZoomed]; |
b14d00c30095
Some fixes for SDL_MaximizeWindow().
Ryan C. Gordon <icculus@icculus.org>
parents:
7535
diff
changeset
|
244 |
if (!zoomed) { |
b14d00c30095
Some fixes for SDL_MaximizeWindow().
Ryan C. Gordon <icculus@icculus.org>
parents:
7535
diff
changeset
|
245 |
SDL_SendWindowEvent(_data->window, SDL_WINDOWEVENT_RESTORED, 0, 0); |
b14d00c30095
Some fixes for SDL_MaximizeWindow().
Ryan C. Gordon <icculus@icculus.org>
parents:
7535
diff
changeset
|
246 |
} else if (zoomed) { |
b14d00c30095
Some fixes for SDL_MaximizeWindow().
Ryan C. Gordon <icculus@icculus.org>
parents:
7535
diff
changeset
|
247 |
SDL_SendWindowEvent(_data->window, SDL_WINDOWEVENT_MAXIMIZED, 0, 0); |
b14d00c30095
Some fixes for SDL_MaximizeWindow().
Ryan C. Gordon <icculus@icculus.org>
parents:
7535
diff
changeset
|
248 |
} |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
249 |
} |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
250 |
|
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
251 |
- (void)windowDidMiniaturize:(NSNotification *)aNotification |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
252 |
{ |
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
|
253 |
SDL_SendWindowEvent(_data->window, SDL_WINDOWEVENT_MINIMIZED, 0, 0); |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
254 |
} |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
255 |
|
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
256 |
- (void)windowDidDeminiaturize:(NSNotification *)aNotification |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
257 |
{ |
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
|
258 |
SDL_SendWindowEvent(_data->window, SDL_WINDOWEVENT_RESTORED, 0, 0); |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
259 |
} |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
260 |
|
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
261 |
- (void)windowDidBecomeKey:(NSNotification *)aNotification |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
262 |
{ |
5367
71fe70373e58
Fixed bug 1105 (SDL_GetMouseState returns wrong location upon window re-activation)
Sam Lantinga <slouken@libsdl.org>
parents:
5361
diff
changeset
|
263 |
SDL_Window *window = _data->window; |
7271
963d2ba35cfe
Mac: Fix incorrect relative jump on focus / start.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7270
diff
changeset
|
264 |
SDL_Mouse *mouse = SDL_GetMouse(); |
5367
71fe70373e58
Fixed bug 1105 (SDL_GetMouseState returns wrong location upon window re-activation)
Sam Lantinga <slouken@libsdl.org>
parents:
5361
diff
changeset
|
265 |
|
2059
4685ccd33d0e
Fixed mouse enter/leave events for a single window.
Sam Lantinga <slouken@libsdl.org>
parents:
1973
diff
changeset
|
266 |
/* We're going to get keyboard events, since we're key. */ |
5367
71fe70373e58
Fixed bug 1105 (SDL_GetMouseState returns wrong location upon window re-activation)
Sam Lantinga <slouken@libsdl.org>
parents:
5361
diff
changeset
|
267 |
SDL_SetKeyboardFocus(window); |
71fe70373e58
Fixed bug 1105 (SDL_GetMouseState returns wrong location upon window re-activation)
Sam Lantinga <slouken@libsdl.org>
parents:
5361
diff
changeset
|
268 |
|
71fe70373e58
Fixed bug 1105 (SDL_GetMouseState returns wrong location upon window re-activation)
Sam Lantinga <slouken@libsdl.org>
parents:
5361
diff
changeset
|
269 |
/* If we just gained focus we need the updated mouse position */ |
7271
963d2ba35cfe
Mac: Fix incorrect relative jump on focus / start.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7270
diff
changeset
|
270 |
if (!mouse->relative_mode) { |
5367
71fe70373e58
Fixed bug 1105 (SDL_GetMouseState returns wrong location upon window re-activation)
Sam Lantinga <slouken@libsdl.org>
parents:
5361
diff
changeset
|
271 |
NSPoint point; |
5396
109b7c071f70
Tracking rectangles had some problems, it's easier to track things directly. (fixes bug 1149, 1147, 1146)
Sam Lantinga <slouken@libsdl.org>
parents:
5388
diff
changeset
|
272 |
int x, y; |
109b7c071f70
Tracking rectangles had some problems, it's easier to track things directly. (fixes bug 1149, 1147, 1146)
Sam Lantinga <slouken@libsdl.org>
parents:
5388
diff
changeset
|
273 |
|
109b7c071f70
Tracking rectangles had some problems, it's easier to track things directly. (fixes bug 1149, 1147, 1146)
Sam Lantinga <slouken@libsdl.org>
parents:
5388
diff
changeset
|
274 |
point = [_data->nswindow mouseLocationOutsideOfEventStream]; |
109b7c071f70
Tracking rectangles had some problems, it's easier to track things directly. (fixes bug 1149, 1147, 1146)
Sam Lantinga <slouken@libsdl.org>
parents:
5388
diff
changeset
|
275 |
x = (int)point.x; |
109b7c071f70
Tracking rectangles had some problems, it's easier to track things directly. (fixes bug 1149, 1147, 1146)
Sam Lantinga <slouken@libsdl.org>
parents:
5388
diff
changeset
|
276 |
y = (int)(window->h - point.y); |
109b7c071f70
Tracking rectangles had some problems, it's easier to track things directly. (fixes bug 1149, 1147, 1146)
Sam Lantinga <slouken@libsdl.org>
parents:
5388
diff
changeset
|
277 |
|
109b7c071f70
Tracking rectangles had some problems, it's easier to track things directly. (fixes bug 1149, 1147, 1146)
Sam Lantinga <slouken@libsdl.org>
parents:
5388
diff
changeset
|
278 |
if (x >= 0 && x < window->w && y >= 0 && y < window->h) { |
6950
1ddb72193079
Added a mouse ID to the mouse events, which set to the special value SDL_TOUCH_MOUSEID for mouse events simulated by touch input.
Sam Lantinga <slouken@libsdl.org>
parents:
6885
diff
changeset
|
279 |
SDL_SendMouseMotion(window, 0, 0, x, y); |
5396
109b7c071f70
Tracking rectangles had some problems, it's easier to track things directly. (fixes bug 1149, 1147, 1146)
Sam Lantinga <slouken@libsdl.org>
parents:
5388
diff
changeset
|
280 |
} |
5367
71fe70373e58
Fixed bug 1105 (SDL_GetMouseState returns wrong location upon window re-activation)
Sam Lantinga <slouken@libsdl.org>
parents:
5361
diff
changeset
|
281 |
} |
1962
c92e5f3e68d9
Hack to stop the beeping
Sam Lantinga <slouken@libsdl.org>
parents:
1959
diff
changeset
|
282 |
|
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
|
283 |
/* 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
|
284 |
Cocoa_CheckClipboardUpdate(_data->videodata); |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
285 |
} |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
286 |
|
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
287 |
- (void)windowDidResignKey:(NSNotification *)aNotification |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
288 |
{ |
2059
4685ccd33d0e
Fixed mouse enter/leave events for a single window.
Sam Lantinga <slouken@libsdl.org>
parents:
1973
diff
changeset
|
289 |
/* 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
|
290 |
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
|
291 |
SDL_SetMouseFocus(NULL); |
2059
4685ccd33d0e
Fixed mouse enter/leave events for a single window.
Sam Lantinga <slouken@libsdl.org>
parents:
1973
diff
changeset
|
292 |
} |
4685ccd33d0e
Fixed mouse enter/leave events for a single window.
Sam Lantinga <slouken@libsdl.org>
parents:
1973
diff
changeset
|
293 |
|
4685ccd33d0e
Fixed mouse enter/leave events for a single window.
Sam Lantinga <slouken@libsdl.org>
parents:
1973
diff
changeset
|
294 |
/* 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
|
295 |
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
|
296 |
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
|
297 |
} |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
298 |
} |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
299 |
|
7191
75360622e65f
File style cleanup for the SDL 2.0 release
Sam Lantinga <slouken@libsdl.org>
parents:
7158
diff
changeset
|
300 |
/* We'll respond to key events by doing nothing so we don't beep. |
75360622e65f
File style cleanup for the SDL 2.0 release
Sam Lantinga <slouken@libsdl.org>
parents:
7158
diff
changeset
|
301 |
* We could handle key messages here, but we lose some in the NSApp dispatch, |
75360622e65f
File style cleanup for the SDL 2.0 release
Sam Lantinga <slouken@libsdl.org>
parents:
7158
diff
changeset
|
302 |
* where they get converted to action messages, etc. |
75360622e65f
File style cleanup for the SDL 2.0 release
Sam Lantinga <slouken@libsdl.org>
parents:
7158
diff
changeset
|
303 |
*/ |
6514
e94c2eaaa1ab
Fixed beeping introduced when we started passing key events through the responder chain.
Sam Lantinga <slouken@libsdl.org>
parents:
6489
diff
changeset
|
304 |
- (void)flagsChanged:(NSEvent *)theEvent |
e94c2eaaa1ab
Fixed beeping introduced when we started passing key events through the responder chain.
Sam Lantinga <slouken@libsdl.org>
parents:
6489
diff
changeset
|
305 |
{ |
7191
75360622e65f
File style cleanup for the SDL 2.0 release
Sam Lantinga <slouken@libsdl.org>
parents:
7158
diff
changeset
|
306 |
/*Cocoa_HandleKeyEvent(SDL_GetVideoDevice(), theEvent);*/ |
6514
e94c2eaaa1ab
Fixed beeping introduced when we started passing key events through the responder chain.
Sam Lantinga <slouken@libsdl.org>
parents:
6489
diff
changeset
|
307 |
} |
e94c2eaaa1ab
Fixed beeping introduced when we started passing key events through the responder chain.
Sam Lantinga <slouken@libsdl.org>
parents:
6489
diff
changeset
|
308 |
- (void)keyDown:(NSEvent *)theEvent |
e94c2eaaa1ab
Fixed beeping introduced when we started passing key events through the responder chain.
Sam Lantinga <slouken@libsdl.org>
parents:
6489
diff
changeset
|
309 |
{ |
7191
75360622e65f
File style cleanup for the SDL 2.0 release
Sam Lantinga <slouken@libsdl.org>
parents:
7158
diff
changeset
|
310 |
/*Cocoa_HandleKeyEvent(SDL_GetVideoDevice(), theEvent);*/ |
6514
e94c2eaaa1ab
Fixed beeping introduced when we started passing key events through the responder chain.
Sam Lantinga <slouken@libsdl.org>
parents:
6489
diff
changeset
|
311 |
} |
e94c2eaaa1ab
Fixed beeping introduced when we started passing key events through the responder chain.
Sam Lantinga <slouken@libsdl.org>
parents:
6489
diff
changeset
|
312 |
- (void)keyUp:(NSEvent *)theEvent |
e94c2eaaa1ab
Fixed beeping introduced when we started passing key events through the responder chain.
Sam Lantinga <slouken@libsdl.org>
parents:
6489
diff
changeset
|
313 |
{ |
7191
75360622e65f
File style cleanup for the SDL 2.0 release
Sam Lantinga <slouken@libsdl.org>
parents:
7158
diff
changeset
|
314 |
/*Cocoa_HandleKeyEvent(SDL_GetVideoDevice(), theEvent);*/ |
6514
e94c2eaaa1ab
Fixed beeping introduced when we started passing key events through the responder chain.
Sam Lantinga <slouken@libsdl.org>
parents:
6489
diff
changeset
|
315 |
} |
e94c2eaaa1ab
Fixed beeping introduced when we started passing key events through the responder chain.
Sam Lantinga <slouken@libsdl.org>
parents:
6489
diff
changeset
|
316 |
|
7191
75360622e65f
File style cleanup for the SDL 2.0 release
Sam Lantinga <slouken@libsdl.org>
parents:
7158
diff
changeset
|
317 |
/* We'll respond to selectors by doing nothing so we don't beep. |
75360622e65f
File style cleanup for the SDL 2.0 release
Sam Lantinga <slouken@libsdl.org>
parents:
7158
diff
changeset
|
318 |
* The escape key gets converted to a "cancel" selector, etc. |
75360622e65f
File style cleanup for the SDL 2.0 release
Sam Lantinga <slouken@libsdl.org>
parents:
7158
diff
changeset
|
319 |
*/ |
6514
e94c2eaaa1ab
Fixed beeping introduced when we started passing key events through the responder chain.
Sam Lantinga <slouken@libsdl.org>
parents:
6489
diff
changeset
|
320 |
- (void)doCommandBySelector:(SEL)aSelector |
e94c2eaaa1ab
Fixed beeping introduced when we started passing key events through the responder chain.
Sam Lantinga <slouken@libsdl.org>
parents:
6489
diff
changeset
|
321 |
{ |
7191
75360622e65f
File style cleanup for the SDL 2.0 release
Sam Lantinga <slouken@libsdl.org>
parents:
7158
diff
changeset
|
322 |
/*NSLog(@"doCommandBySelector: %@\n", NSStringFromSelector(aSelector));*/ |
6514
e94c2eaaa1ab
Fixed beeping introduced when we started passing key events through the responder chain.
Sam Lantinga <slouken@libsdl.org>
parents:
6489
diff
changeset
|
323 |
} |
e94c2eaaa1ab
Fixed beeping introduced when we started passing key events through the responder chain.
Sam Lantinga <slouken@libsdl.org>
parents:
6489
diff
changeset
|
324 |
|
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
325 |
- (void)mouseDown:(NSEvent *)theEvent |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
326 |
{ |
1959
25d6537feea4
Implemented Cocoa key event handling.
Sam Lantinga <slouken@libsdl.org>
parents:
1958
diff
changeset
|
327 |
int button; |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
328 |
|
1959
25d6537feea4
Implemented Cocoa key event handling.
Sam Lantinga <slouken@libsdl.org>
parents:
1958
diff
changeset
|
329 |
switch ([theEvent buttonNumber]) { |
25d6537feea4
Implemented Cocoa key event handling.
Sam Lantinga <slouken@libsdl.org>
parents:
1958
diff
changeset
|
330 |
case 0: |
25d6537feea4
Implemented Cocoa key event handling.
Sam Lantinga <slouken@libsdl.org>
parents:
1958
diff
changeset
|
331 |
button = SDL_BUTTON_LEFT; |
25d6537feea4
Implemented Cocoa key event handling.
Sam Lantinga <slouken@libsdl.org>
parents:
1958
diff
changeset
|
332 |
break; |
25d6537feea4
Implemented Cocoa key event handling.
Sam Lantinga <slouken@libsdl.org>
parents:
1958
diff
changeset
|
333 |
case 1: |
25d6537feea4
Implemented Cocoa key event handling.
Sam Lantinga <slouken@libsdl.org>
parents:
1958
diff
changeset
|
334 |
button = SDL_BUTTON_RIGHT; |
25d6537feea4
Implemented Cocoa key event handling.
Sam Lantinga <slouken@libsdl.org>
parents:
1958
diff
changeset
|
335 |
break; |
25d6537feea4
Implemented Cocoa key event handling.
Sam Lantinga <slouken@libsdl.org>
parents:
1958
diff
changeset
|
336 |
case 2: |
25d6537feea4
Implemented Cocoa key event handling.
Sam Lantinga <slouken@libsdl.org>
parents:
1958
diff
changeset
|
337 |
button = SDL_BUTTON_MIDDLE; |
25d6537feea4
Implemented Cocoa key event handling.
Sam Lantinga <slouken@libsdl.org>
parents:
1958
diff
changeset
|
338 |
break; |
25d6537feea4
Implemented Cocoa key event handling.
Sam Lantinga <slouken@libsdl.org>
parents:
1958
diff
changeset
|
339 |
default: |
5061
9e9940eae455
Fixed mouse button index for additional mouse buttons
Sam Lantinga <slouken@libsdl.org>
parents:
5059
diff
changeset
|
340 |
button = [theEvent buttonNumber] + 1; |
1959
25d6537feea4
Implemented Cocoa key event handling.
Sam Lantinga <slouken@libsdl.org>
parents:
1958
diff
changeset
|
341 |
break; |
25d6537feea4
Implemented Cocoa key event handling.
Sam Lantinga <slouken@libsdl.org>
parents:
1958
diff
changeset
|
342 |
} |
6950
1ddb72193079
Added a mouse ID to the mouse events, which set to the special value SDL_TOUCH_MOUSEID for mouse events simulated by touch input.
Sam Lantinga <slouken@libsdl.org>
parents:
6885
diff
changeset
|
343 |
SDL_SendMouseButton(_data->window, 0, SDL_PRESSED, button); |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
344 |
} |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
345 |
|
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
346 |
- (void)rightMouseDown:(NSEvent *)theEvent |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
347 |
{ |
1959
25d6537feea4
Implemented Cocoa key event handling.
Sam Lantinga <slouken@libsdl.org>
parents:
1958
diff
changeset
|
348 |
[self mouseDown:theEvent]; |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
349 |
} |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
350 |
|
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
351 |
- (void)otherMouseDown:(NSEvent *)theEvent |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
352 |
{ |
1959
25d6537feea4
Implemented Cocoa key event handling.
Sam Lantinga <slouken@libsdl.org>
parents:
1958
diff
changeset
|
353 |
[self mouseDown:theEvent]; |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
354 |
} |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
355 |
|
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
356 |
- (void)mouseUp:(NSEvent *)theEvent |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
357 |
{ |
1959
25d6537feea4
Implemented Cocoa key event handling.
Sam Lantinga <slouken@libsdl.org>
parents:
1958
diff
changeset
|
358 |
int button; |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
359 |
|
1959
25d6537feea4
Implemented Cocoa key event handling.
Sam Lantinga <slouken@libsdl.org>
parents:
1958
diff
changeset
|
360 |
switch ([theEvent buttonNumber]) { |
25d6537feea4
Implemented Cocoa key event handling.
Sam Lantinga <slouken@libsdl.org>
parents:
1958
diff
changeset
|
361 |
case 0: |
25d6537feea4
Implemented Cocoa key event handling.
Sam Lantinga <slouken@libsdl.org>
parents:
1958
diff
changeset
|
362 |
button = SDL_BUTTON_LEFT; |
25d6537feea4
Implemented Cocoa key event handling.
Sam Lantinga <slouken@libsdl.org>
parents:
1958
diff
changeset
|
363 |
break; |
25d6537feea4
Implemented Cocoa key event handling.
Sam Lantinga <slouken@libsdl.org>
parents:
1958
diff
changeset
|
364 |
case 1: |
25d6537feea4
Implemented Cocoa key event handling.
Sam Lantinga <slouken@libsdl.org>
parents:
1958
diff
changeset
|
365 |
button = SDL_BUTTON_RIGHT; |
25d6537feea4
Implemented Cocoa key event handling.
Sam Lantinga <slouken@libsdl.org>
parents:
1958
diff
changeset
|
366 |
break; |
25d6537feea4
Implemented Cocoa key event handling.
Sam Lantinga <slouken@libsdl.org>
parents:
1958
diff
changeset
|
367 |
case 2: |
25d6537feea4
Implemented Cocoa key event handling.
Sam Lantinga <slouken@libsdl.org>
parents:
1958
diff
changeset
|
368 |
button = SDL_BUTTON_MIDDLE; |
25d6537feea4
Implemented Cocoa key event handling.
Sam Lantinga <slouken@libsdl.org>
parents:
1958
diff
changeset
|
369 |
break; |
25d6537feea4
Implemented Cocoa key event handling.
Sam Lantinga <slouken@libsdl.org>
parents:
1958
diff
changeset
|
370 |
default: |
5061
9e9940eae455
Fixed mouse button index for additional mouse buttons
Sam Lantinga <slouken@libsdl.org>
parents:
5059
diff
changeset
|
371 |
button = [theEvent buttonNumber] + 1; |
1959
25d6537feea4
Implemented Cocoa key event handling.
Sam Lantinga <slouken@libsdl.org>
parents:
1958
diff
changeset
|
372 |
break; |
25d6537feea4
Implemented Cocoa key event handling.
Sam Lantinga <slouken@libsdl.org>
parents:
1958
diff
changeset
|
373 |
} |
6950
1ddb72193079
Added a mouse ID to the mouse events, which set to the special value SDL_TOUCH_MOUSEID for mouse events simulated by touch input.
Sam Lantinga <slouken@libsdl.org>
parents:
6885
diff
changeset
|
374 |
SDL_SendMouseButton(_data->window, 0, SDL_RELEASED, button); |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
375 |
} |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
376 |
|
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
377 |
- (void)rightMouseUp:(NSEvent *)theEvent |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
378 |
{ |
1959
25d6537feea4
Implemented Cocoa key event handling.
Sam Lantinga <slouken@libsdl.org>
parents:
1958
diff
changeset
|
379 |
[self mouseUp:theEvent]; |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
380 |
} |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
381 |
|
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
382 |
- (void)otherMouseUp:(NSEvent *)theEvent |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
383 |
{ |
1959
25d6537feea4
Implemented Cocoa key event handling.
Sam Lantinga <slouken@libsdl.org>
parents:
1958
diff
changeset
|
384 |
[self mouseUp:theEvent]; |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
385 |
} |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
386 |
|
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
387 |
- (void)mouseMoved:(NSEvent *)theEvent |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
388 |
{ |
5406
1517da4ab6b1
Implemented mouse relative mode on Mac OS X.
Sam Lantinga <slouken@libsdl.org>
parents:
5404
diff
changeset
|
389 |
SDL_Mouse *mouse = SDL_GetMouse(); |
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
|
390 |
SDL_Window *window = _data->window; |
5396
109b7c071f70
Tracking rectangles had some problems, it's easier to track things directly. (fixes bug 1149, 1147, 1146)
Sam Lantinga <slouken@libsdl.org>
parents:
5388
diff
changeset
|
391 |
NSPoint point; |
109b7c071f70
Tracking rectangles had some problems, it's easier to track things directly. (fixes bug 1149, 1147, 1146)
Sam Lantinga <slouken@libsdl.org>
parents:
5388
diff
changeset
|
392 |
int x, y; |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
393 |
|
5406
1517da4ab6b1
Implemented mouse relative mode on Mac OS X.
Sam Lantinga <slouken@libsdl.org>
parents:
5404
diff
changeset
|
394 |
if (mouse->relative_mode) { |
5059
00d1fef487c5
Fix double mouse motion in OS X
Jjgod Jiang <gzjjgod@gmail.com>
parents:
5057
diff
changeset
|
395 |
return; |
5371
fc3d3d580777
Fixed the responder chain for event handling, the listener fully handles mouse events - even in fullscreen mode.
Sam Lantinga <slouken@libsdl.org>
parents:
5367
diff
changeset
|
396 |
} |
5059
00d1fef487c5
Fix double mouse motion in OS X
Jjgod Jiang <gzjjgod@gmail.com>
parents:
5057
diff
changeset
|
397 |
|
5396
109b7c071f70
Tracking rectangles had some problems, it's easier to track things directly. (fixes bug 1149, 1147, 1146)
Sam Lantinga <slouken@libsdl.org>
parents:
5388
diff
changeset
|
398 |
point = [theEvent locationInWindow]; |
109b7c071f70
Tracking rectangles had some problems, it's easier to track things directly. (fixes bug 1149, 1147, 1146)
Sam Lantinga <slouken@libsdl.org>
parents:
5388
diff
changeset
|
399 |
x = (int)point.x; |
109b7c071f70
Tracking rectangles had some problems, it's easier to track things directly. (fixes bug 1149, 1147, 1146)
Sam Lantinga <slouken@libsdl.org>
parents:
5388
diff
changeset
|
400 |
y = (int)(window->h - point.y); |
5371
fc3d3d580777
Fixed the responder chain for event handling, the listener fully handles mouse events - even in fullscreen mode.
Sam Lantinga <slouken@libsdl.org>
parents:
5367
diff
changeset
|
401 |
|
5396
109b7c071f70
Tracking rectangles had some problems, it's easier to track things directly. (fixes bug 1149, 1147, 1146)
Sam Lantinga <slouken@libsdl.org>
parents:
5388
diff
changeset
|
402 |
if (x < 0 || x >= window->w || y < 0 || y >= window->h) { |
6666
018f8019ce36
Reset the mouse button state when losing mouse focus.
Sam Lantinga <slouken@libsdl.org>
parents:
6662
diff
changeset
|
403 |
if (window->flags & SDL_WINDOW_INPUT_GRABBED) { |
018f8019ce36
Reset the mouse button state when losing mouse focus.
Sam Lantinga <slouken@libsdl.org>
parents:
6662
diff
changeset
|
404 |
CGPoint cgpoint; |
018f8019ce36
Reset the mouse button state when losing mouse focus.
Sam Lantinga <slouken@libsdl.org>
parents:
6662
diff
changeset
|
405 |
|
018f8019ce36
Reset the mouse button state when losing mouse focus.
Sam Lantinga <slouken@libsdl.org>
parents:
6662
diff
changeset
|
406 |
if (x < 0) { |
018f8019ce36
Reset the mouse button state when losing mouse focus.
Sam Lantinga <slouken@libsdl.org>
parents:
6662
diff
changeset
|
407 |
x = 0; |
018f8019ce36
Reset the mouse button state when losing mouse focus.
Sam Lantinga <slouken@libsdl.org>
parents:
6662
diff
changeset
|
408 |
} else if (x >= window->w) { |
018f8019ce36
Reset the mouse button state when losing mouse focus.
Sam Lantinga <slouken@libsdl.org>
parents:
6662
diff
changeset
|
409 |
x = window->w - 1; |
018f8019ce36
Reset the mouse button state when losing mouse focus.
Sam Lantinga <slouken@libsdl.org>
parents:
6662
diff
changeset
|
410 |
} |
018f8019ce36
Reset the mouse button state when losing mouse focus.
Sam Lantinga <slouken@libsdl.org>
parents:
6662
diff
changeset
|
411 |
if (y < 0) { |
018f8019ce36
Reset the mouse button state when losing mouse focus.
Sam Lantinga <slouken@libsdl.org>
parents:
6662
diff
changeset
|
412 |
y = 0; |
018f8019ce36
Reset the mouse button state when losing mouse focus.
Sam Lantinga <slouken@libsdl.org>
parents:
6662
diff
changeset
|
413 |
} else if (y >= window->h) { |
018f8019ce36
Reset the mouse button state when losing mouse focus.
Sam Lantinga <slouken@libsdl.org>
parents:
6662
diff
changeset
|
414 |
y = window->h - 1; |
018f8019ce36
Reset the mouse button state when losing mouse focus.
Sam Lantinga <slouken@libsdl.org>
parents:
6662
diff
changeset
|
415 |
} |
018f8019ce36
Reset the mouse button state when losing mouse focus.
Sam Lantinga <slouken@libsdl.org>
parents:
6662
diff
changeset
|
416 |
|
018f8019ce36
Reset the mouse button state when losing mouse focus.
Sam Lantinga <slouken@libsdl.org>
parents:
6662
diff
changeset
|
417 |
cgpoint.x = window->x + x; |
018f8019ce36
Reset the mouse button state when losing mouse focus.
Sam Lantinga <slouken@libsdl.org>
parents:
6662
diff
changeset
|
418 |
cgpoint.y = window->y + y; |
7098
f4b2c6fb0258
Mac: Make mouse movement smooth at edge of window when grabbed.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7087
diff
changeset
|
419 |
|
7113
7b4b596b3cfb
Mac: Don't supress mousemoves after warp.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7098
diff
changeset
|
420 |
/* According to the docs, this was deprecated in 10.6, but it's still |
7b4b596b3cfb
Mac: Don't supress mousemoves after warp.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7098
diff
changeset
|
421 |
* around. The substitute requires a CGEventSource, but I'm not entirely |
7b4b596b3cfb
Mac: Don't supress mousemoves after warp.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7098
diff
changeset
|
422 |
* sure how we'd procure the right one for this event. |
7098
f4b2c6fb0258
Mac: Make mouse movement smooth at edge of window when grabbed.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7087
diff
changeset
|
423 |
*/ |
7113
7b4b596b3cfb
Mac: Don't supress mousemoves after warp.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7098
diff
changeset
|
424 |
CGSetLocalEventsSuppressionInterval(0.0); |
6666
018f8019ce36
Reset the mouse button state when losing mouse focus.
Sam Lantinga <slouken@libsdl.org>
parents:
6662
diff
changeset
|
425 |
CGDisplayMoveCursorToPoint(kCGDirectMainDisplay, cgpoint); |
7113
7b4b596b3cfb
Mac: Don't supress mousemoves after warp.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7098
diff
changeset
|
426 |
CGSetLocalEventsSuppressionInterval(0.25); |
5396
109b7c071f70
Tracking rectangles had some problems, it's easier to track things directly. (fixes bug 1149, 1147, 1146)
Sam Lantinga <slouken@libsdl.org>
parents:
5388
diff
changeset
|
427 |
} |
2059
4685ccd33d0e
Fixed mouse enter/leave events for a single window.
Sam Lantinga <slouken@libsdl.org>
parents:
1973
diff
changeset
|
428 |
} |
6950
1ddb72193079
Added a mouse ID to the mouse events, which set to the special value SDL_TOUCH_MOUSEID for mouse events simulated by touch input.
Sam Lantinga <slouken@libsdl.org>
parents:
6885
diff
changeset
|
429 |
SDL_SendMouseMotion(window, 0, 0, x, y); |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
430 |
} |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
431 |
|
1957
c7803e4c21d3
Implemented Cocoa mouse wheel events
Sam Lantinga <slouken@libsdl.org>
parents:
1956
diff
changeset
|
432 |
- (void)mouseDragged:(NSEvent *)theEvent |
c7803e4c21d3
Implemented Cocoa mouse wheel events
Sam Lantinga <slouken@libsdl.org>
parents:
1956
diff
changeset
|
433 |
{ |
c7803e4c21d3
Implemented Cocoa mouse wheel events
Sam Lantinga <slouken@libsdl.org>
parents:
1956
diff
changeset
|
434 |
[self mouseMoved:theEvent]; |
c7803e4c21d3
Implemented Cocoa mouse wheel events
Sam Lantinga <slouken@libsdl.org>
parents:
1956
diff
changeset
|
435 |
} |
c7803e4c21d3
Implemented Cocoa mouse wheel events
Sam Lantinga <slouken@libsdl.org>
parents:
1956
diff
changeset
|
436 |
|
1958
5fc6fb0fb605
Added right/other drag code for Cocoa windows
Sam Lantinga <slouken@libsdl.org>
parents:
1957
diff
changeset
|
437 |
- (void)rightMouseDragged:(NSEvent *)theEvent |
5fc6fb0fb605
Added right/other drag code for Cocoa windows
Sam Lantinga <slouken@libsdl.org>
parents:
1957
diff
changeset
|
438 |
{ |
5fc6fb0fb605
Added right/other drag code for Cocoa windows
Sam Lantinga <slouken@libsdl.org>
parents:
1957
diff
changeset
|
439 |
[self mouseMoved:theEvent]; |
5fc6fb0fb605
Added right/other drag code for Cocoa windows
Sam Lantinga <slouken@libsdl.org>
parents:
1957
diff
changeset
|
440 |
} |
5fc6fb0fb605
Added right/other drag code for Cocoa windows
Sam Lantinga <slouken@libsdl.org>
parents:
1957
diff
changeset
|
441 |
|
5fc6fb0fb605
Added right/other drag code for Cocoa windows
Sam Lantinga <slouken@libsdl.org>
parents:
1957
diff
changeset
|
442 |
- (void)otherMouseDragged:(NSEvent *)theEvent |
5fc6fb0fb605
Added right/other drag code for Cocoa windows
Sam Lantinga <slouken@libsdl.org>
parents:
1957
diff
changeset
|
443 |
{ |
5fc6fb0fb605
Added right/other drag code for Cocoa windows
Sam Lantinga <slouken@libsdl.org>
parents:
1957
diff
changeset
|
444 |
[self mouseMoved:theEvent]; |
5fc6fb0fb605
Added right/other drag code for Cocoa windows
Sam Lantinga <slouken@libsdl.org>
parents:
1957
diff
changeset
|
445 |
} |
5fc6fb0fb605
Added right/other drag code for Cocoa windows
Sam Lantinga <slouken@libsdl.org>
parents:
1957
diff
changeset
|
446 |
|
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
447 |
- (void)scrollWheel:(NSEvent *)theEvent |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
448 |
{ |
5057
bdff53ed6c8b
Fix mouse wheel events in fullscreen mode for OS X
Jjgod Jiang <gzjjgod@gmail.com>
parents:
5056
diff
changeset
|
449 |
Cocoa_HandleMouseWheel(_data->window, theEvent); |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
450 |
} |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
451 |
|
4673
c17ac64abb70
Fixed the code so we receive Cocoa touch events
Sam Lantinga <slouken@libsdl.org>
parents:
4503
diff
changeset
|
452 |
- (void)touchesBeganWithEvent:(NSEvent *) theEvent |
c17ac64abb70
Fixed the code so we receive Cocoa touch events
Sam Lantinga <slouken@libsdl.org>
parents:
4503
diff
changeset
|
453 |
{ |
c17ac64abb70
Fixed the code so we receive Cocoa touch events
Sam Lantinga <slouken@libsdl.org>
parents:
4503
diff
changeset
|
454 |
[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
|
455 |
} |
c17ac64abb70
Fixed the code so we receive Cocoa touch events
Sam Lantinga <slouken@libsdl.org>
parents:
4503
diff
changeset
|
456 |
|
c17ac64abb70
Fixed the code so we receive Cocoa touch events
Sam Lantinga <slouken@libsdl.org>
parents:
4503
diff
changeset
|
457 |
- (void)touchesMovedWithEvent:(NSEvent *) theEvent |
c17ac64abb70
Fixed the code so we receive Cocoa touch events
Sam Lantinga <slouken@libsdl.org>
parents:
4503
diff
changeset
|
458 |
{ |
c17ac64abb70
Fixed the code so we receive Cocoa touch events
Sam Lantinga <slouken@libsdl.org>
parents:
4503
diff
changeset
|
459 |
[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
|
460 |
} |
c17ac64abb70
Fixed the code so we receive Cocoa touch events
Sam Lantinga <slouken@libsdl.org>
parents:
4503
diff
changeset
|
461 |
|
c17ac64abb70
Fixed the code so we receive Cocoa touch events
Sam Lantinga <slouken@libsdl.org>
parents:
4503
diff
changeset
|
462 |
- (void)touchesEndedWithEvent:(NSEvent *) theEvent |
c17ac64abb70
Fixed the code so we receive Cocoa touch events
Sam Lantinga <slouken@libsdl.org>
parents:
4503
diff
changeset
|
463 |
{ |
c17ac64abb70
Fixed the code so we receive Cocoa touch events
Sam Lantinga <slouken@libsdl.org>
parents:
4503
diff
changeset
|
464 |
[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
|
465 |
} |
c17ac64abb70
Fixed the code so we receive Cocoa touch events
Sam Lantinga <slouken@libsdl.org>
parents:
4503
diff
changeset
|
466 |
|
c17ac64abb70
Fixed the code so we receive Cocoa touch events
Sam Lantinga <slouken@libsdl.org>
parents:
4503
diff
changeset
|
467 |
- (void)touchesCancelledWithEvent:(NSEvent *) theEvent |
c17ac64abb70
Fixed the code so we receive Cocoa touch events
Sam Lantinga <slouken@libsdl.org>
parents:
4503
diff
changeset
|
468 |
{ |
c17ac64abb70
Fixed the code so we receive Cocoa touch events
Sam Lantinga <slouken@libsdl.org>
parents:
4503
diff
changeset
|
469 |
[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
|
470 |
} |
c17ac64abb70
Fixed the code so we receive Cocoa touch events
Sam Lantinga <slouken@libsdl.org>
parents:
4503
diff
changeset
|
471 |
|
c17ac64abb70
Fixed the code so we receive Cocoa touch events
Sam Lantinga <slouken@libsdl.org>
parents:
4503
diff
changeset
|
472 |
- (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
|
473 |
{ |
4680
229529693289
Fixed sending motion and finger up events
Sam Lantinga <slouken@libsdl.org>
parents:
4679
diff
changeset
|
474 |
NSSet *touches = 0; |
229529693289
Fixed sending motion and finger up events
Sam Lantinga <slouken@libsdl.org>
parents:
4679
diff
changeset
|
475 |
NSEnumerator *enumerator; |
229529693289
Fixed sending motion and finger up events
Sam Lantinga <slouken@libsdl.org>
parents:
4679
diff
changeset
|
476 |
NSTouch *touch; |
1957
c7803e4c21d3
Implemented Cocoa mouse wheel events
Sam Lantinga <slouken@libsdl.org>
parents:
1956
diff
changeset
|
477 |
|
4680
229529693289
Fixed sending motion and finger up events
Sam Lantinga <slouken@libsdl.org>
parents:
4679
diff
changeset
|
478 |
switch (type) { |
229529693289
Fixed sending motion and finger up events
Sam Lantinga <slouken@libsdl.org>
parents:
4679
diff
changeset
|
479 |
case COCOA_TOUCH_DOWN: |
229529693289
Fixed sending motion and finger up events
Sam Lantinga <slouken@libsdl.org>
parents:
4679
diff
changeset
|
480 |
touches = [event touchesMatchingPhase:NSTouchPhaseBegan inView:nil]; |
229529693289
Fixed sending motion and finger up events
Sam Lantinga <slouken@libsdl.org>
parents:
4679
diff
changeset
|
481 |
break; |
229529693289
Fixed sending motion and finger up events
Sam Lantinga <slouken@libsdl.org>
parents:
4679
diff
changeset
|
482 |
case COCOA_TOUCH_UP: |
229529693289
Fixed sending motion and finger up events
Sam Lantinga <slouken@libsdl.org>
parents:
4679
diff
changeset
|
483 |
case COCOA_TOUCH_CANCELLED: |
229529693289
Fixed sending motion and finger up events
Sam Lantinga <slouken@libsdl.org>
parents:
4679
diff
changeset
|
484 |
touches = [event touchesMatchingPhase:NSTouchPhaseEnded inView:nil]; |
229529693289
Fixed sending motion and finger up events
Sam Lantinga <slouken@libsdl.org>
parents:
4679
diff
changeset
|
485 |
break; |
229529693289
Fixed sending motion and finger up events
Sam Lantinga <slouken@libsdl.org>
parents:
4679
diff
changeset
|
486 |
case COCOA_TOUCH_MOVE: |
229529693289
Fixed sending motion and finger up events
Sam Lantinga <slouken@libsdl.org>
parents:
4679
diff
changeset
|
487 |
touches = [event touchesMatchingPhase:NSTouchPhaseMoved inView:nil]; |
229529693289
Fixed sending motion and finger up events
Sam Lantinga <slouken@libsdl.org>
parents:
4679
diff
changeset
|
488 |
break; |
229529693289
Fixed sending motion and finger up events
Sam Lantinga <slouken@libsdl.org>
parents:
4679
diff
changeset
|
489 |
} |
229529693289
Fixed sending motion and finger up events
Sam Lantinga <slouken@libsdl.org>
parents:
4679
diff
changeset
|
490 |
|
229529693289
Fixed sending motion and finger up events
Sam Lantinga <slouken@libsdl.org>
parents:
4679
diff
changeset
|
491 |
enumerator = [touches objectEnumerator]; |
229529693289
Fixed sending motion and finger up events
Sam Lantinga <slouken@libsdl.org>
parents:
4679
diff
changeset
|
492 |
touch = (NSTouch*)[enumerator nextObject]; |
4673
c17ac64abb70
Fixed the code so we receive Cocoa touch events
Sam Lantinga <slouken@libsdl.org>
parents:
4503
diff
changeset
|
493 |
while (touch) { |
6953
b83579d7d19a
Fix compiler warning in Cocoa touch code
Sam Lantinga <slouken@libsdl.org>
parents:
6951
diff
changeset
|
494 |
const SDL_TouchID touchId = (SDL_TouchID)(intptr_t)[touch device]; |
4673
c17ac64abb70
Fixed the code so we receive Cocoa touch events
Sam Lantinga <slouken@libsdl.org>
parents:
4503
diff
changeset
|
495 |
if (!SDL_GetTouch(touchId)) { |
6951 | 496 |
if (SDL_AddTouch(touchId, "") < 0) { |
4680
229529693289
Fixed sending motion and finger up events
Sam Lantinga <slouken@libsdl.org>
parents:
4679
diff
changeset
|
497 |
return; |
4673
c17ac64abb70
Fixed the code so we receive Cocoa touch events
Sam Lantinga <slouken@libsdl.org>
parents:
4503
diff
changeset
|
498 |
} |
7191
75360622e65f
File style cleanup for the SDL 2.0 release
Sam Lantinga <slouken@libsdl.org>
parents:
7158
diff
changeset
|
499 |
} |
4687
257bdf117af8
Fixed so the origin of the touch events is the upper left.
Sam Lantinga <slouken@libsdl.org>
parents:
4680
diff
changeset
|
500 |
|
6953
b83579d7d19a
Fix compiler warning in Cocoa touch code
Sam Lantinga <slouken@libsdl.org>
parents:
6951
diff
changeset
|
501 |
const SDL_FingerID fingerId = (SDL_FingerID)(intptr_t)[touch identity]; |
4673
c17ac64abb70
Fixed the code so we receive Cocoa touch events
Sam Lantinga <slouken@libsdl.org>
parents:
4503
diff
changeset
|
502 |
float x = [touch normalizedPosition].x; |
c17ac64abb70
Fixed the code so we receive Cocoa touch events
Sam Lantinga <slouken@libsdl.org>
parents:
4503
diff
changeset
|
503 |
float y = [touch normalizedPosition].y; |
5261
595814f561f7
There is only one width and height for the window. If those are changed during the course of a fullscreen mode change, then they'll stay that size when returning to windowed mode.
Sam Lantinga <slouken@libsdl.org>
parents:
5253
diff
changeset
|
504 |
/* Make the origin the upper left instead of the lower left */ |
595814f561f7
There is only one width and height for the window. If those are changed during the course of a fullscreen mode change, then they'll stay that size when returning to windowed mode.
Sam Lantinga <slouken@libsdl.org>
parents:
5253
diff
changeset
|
505 |
y = 1.0f - y; |
4687
257bdf117af8
Fixed so the origin of the touch events is the upper left.
Sam Lantinga <slouken@libsdl.org>
parents:
4680
diff
changeset
|
506 |
|
4673
c17ac64abb70
Fixed the code so we receive Cocoa touch events
Sam Lantinga <slouken@libsdl.org>
parents:
4503
diff
changeset
|
507 |
switch (type) { |
c17ac64abb70
Fixed the code so we receive Cocoa touch events
Sam Lantinga <slouken@libsdl.org>
parents:
4503
diff
changeset
|
508 |
case COCOA_TOUCH_DOWN: |
6951 | 509 |
SDL_SendTouch(touchId, fingerId, SDL_TRUE, x, y, 1.0f); |
4673
c17ac64abb70
Fixed the code so we receive Cocoa touch events
Sam Lantinga <slouken@libsdl.org>
parents:
4503
diff
changeset
|
510 |
break; |
c17ac64abb70
Fixed the code so we receive Cocoa touch events
Sam Lantinga <slouken@libsdl.org>
parents:
4503
diff
changeset
|
511 |
case COCOA_TOUCH_UP: |
c17ac64abb70
Fixed the code so we receive Cocoa touch events
Sam Lantinga <slouken@libsdl.org>
parents:
4503
diff
changeset
|
512 |
case COCOA_TOUCH_CANCELLED: |
6951 | 513 |
SDL_SendTouch(touchId, fingerId, SDL_FALSE, x, y, 1.0f); |
4673
c17ac64abb70
Fixed the code so we receive Cocoa touch events
Sam Lantinga <slouken@libsdl.org>
parents:
4503
diff
changeset
|
514 |
break; |
c17ac64abb70
Fixed the code so we receive Cocoa touch events
Sam Lantinga <slouken@libsdl.org>
parents:
4503
diff
changeset
|
515 |
case COCOA_TOUCH_MOVE: |
6951 | 516 |
SDL_SendTouchMotion(touchId, fingerId, x, y, 1.0f); |
4673
c17ac64abb70
Fixed the code so we receive Cocoa touch events
Sam Lantinga <slouken@libsdl.org>
parents:
4503
diff
changeset
|
517 |
break; |
c17ac64abb70
Fixed the code so we receive Cocoa touch events
Sam Lantinga <slouken@libsdl.org>
parents:
4503
diff
changeset
|
518 |
} |
6951 | 519 |
|
4673
c17ac64abb70
Fixed the code so we receive Cocoa touch events
Sam Lantinga <slouken@libsdl.org>
parents:
4503
diff
changeset
|
520 |
touch = (NSTouch*)[enumerator nextObject]; |
c17ac64abb70
Fixed the code so we receive Cocoa touch events
Sam Lantinga <slouken@libsdl.org>
parents:
4503
diff
changeset
|
521 |
} |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
522 |
} |
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 |
@end |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
525 |
|
1973
81255f93dfcd
Fixed fullscreen modes with Cocoa video driver.
Sam Lantinga <slouken@libsdl.org>
parents:
1962
diff
changeset
|
526 |
@interface SDLWindow : NSWindow |
81255f93dfcd
Fixed fullscreen modes with Cocoa video driver.
Sam Lantinga <slouken@libsdl.org>
parents:
1962
diff
changeset
|
527 |
/* These are needed for borderless/fullscreen windows */ |
81255f93dfcd
Fixed fullscreen modes with Cocoa video driver.
Sam Lantinga <slouken@libsdl.org>
parents:
1962
diff
changeset
|
528 |
- (BOOL)canBecomeKeyWindow; |
81255f93dfcd
Fixed fullscreen modes with Cocoa video driver.
Sam Lantinga <slouken@libsdl.org>
parents:
1962
diff
changeset
|
529 |
- (BOOL)canBecomeMainWindow; |
81255f93dfcd
Fixed fullscreen modes with Cocoa video driver.
Sam Lantinga <slouken@libsdl.org>
parents:
1962
diff
changeset
|
530 |
@end |
81255f93dfcd
Fixed fullscreen modes with Cocoa video driver.
Sam Lantinga <slouken@libsdl.org>
parents:
1962
diff
changeset
|
531 |
|
81255f93dfcd
Fixed fullscreen modes with Cocoa video driver.
Sam Lantinga <slouken@libsdl.org>
parents:
1962
diff
changeset
|
532 |
@implementation SDLWindow |
81255f93dfcd
Fixed fullscreen modes with Cocoa video driver.
Sam Lantinga <slouken@libsdl.org>
parents:
1962
diff
changeset
|
533 |
- (BOOL)canBecomeKeyWindow |
81255f93dfcd
Fixed fullscreen modes with Cocoa video driver.
Sam Lantinga <slouken@libsdl.org>
parents:
1962
diff
changeset
|
534 |
{ |
81255f93dfcd
Fixed fullscreen modes with Cocoa video driver.
Sam Lantinga <slouken@libsdl.org>
parents:
1962
diff
changeset
|
535 |
return YES; |
81255f93dfcd
Fixed fullscreen modes with Cocoa video driver.
Sam Lantinga <slouken@libsdl.org>
parents:
1962
diff
changeset
|
536 |
} |
81255f93dfcd
Fixed fullscreen modes with Cocoa video driver.
Sam Lantinga <slouken@libsdl.org>
parents:
1962
diff
changeset
|
537 |
|
81255f93dfcd
Fixed fullscreen modes with Cocoa video driver.
Sam Lantinga <slouken@libsdl.org>
parents:
1962
diff
changeset
|
538 |
- (BOOL)canBecomeMainWindow |
81255f93dfcd
Fixed fullscreen modes with Cocoa video driver.
Sam Lantinga <slouken@libsdl.org>
parents:
1962
diff
changeset
|
539 |
{ |
81255f93dfcd
Fixed fullscreen modes with Cocoa video driver.
Sam Lantinga <slouken@libsdl.org>
parents:
1962
diff
changeset
|
540 |
return YES; |
81255f93dfcd
Fixed fullscreen modes with Cocoa video driver.
Sam Lantinga <slouken@libsdl.org>
parents:
1962
diff
changeset
|
541 |
} |
81255f93dfcd
Fixed fullscreen modes with Cocoa video driver.
Sam Lantinga <slouken@libsdl.org>
parents:
1962
diff
changeset
|
542 |
@end |
81255f93dfcd
Fixed fullscreen modes with Cocoa video driver.
Sam Lantinga <slouken@libsdl.org>
parents:
1962
diff
changeset
|
543 |
|
5379
78c071fe4c37
We can defer window creation.
Sam Lantinga <slouken@libsdl.org>
parents:
5378
diff
changeset
|
544 |
@interface SDLView : NSView |
7158
ff52fba70795
Mac: Use cursor rects instead of NSCursor hide/unhide.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7113
diff
changeset
|
545 |
|
5379
78c071fe4c37
We can defer window creation.
Sam Lantinga <slouken@libsdl.org>
parents:
5378
diff
changeset
|
546 |
/* The default implementation doesn't pass rightMouseDown to responder chain */ |
78c071fe4c37
We can defer window creation.
Sam Lantinga <slouken@libsdl.org>
parents:
5378
diff
changeset
|
547 |
- (void)rightMouseDown:(NSEvent *)theEvent; |
4915
834ce48a19c2
Fix right mouse event handling in Cocoa
Jjgod Jiang <gzjjgod@gmail.com>
parents:
4902
diff
changeset
|
548 |
@end |
834ce48a19c2
Fix right mouse event handling in Cocoa
Jjgod Jiang <gzjjgod@gmail.com>
parents:
4902
diff
changeset
|
549 |
|
834ce48a19c2
Fix right mouse event handling in Cocoa
Jjgod Jiang <gzjjgod@gmail.com>
parents:
4902
diff
changeset
|
550 |
@implementation SDLView |
834ce48a19c2
Fix right mouse event handling in Cocoa
Jjgod Jiang <gzjjgod@gmail.com>
parents:
4902
diff
changeset
|
551 |
- (void)rightMouseDown:(NSEvent *)theEvent |
834ce48a19c2
Fix right mouse event handling in Cocoa
Jjgod Jiang <gzjjgod@gmail.com>
parents:
4902
diff
changeset
|
552 |
{ |
5371
fc3d3d580777
Fixed the responder chain for event handling, the listener fully handles mouse events - even in fullscreen mode.
Sam Lantinga <slouken@libsdl.org>
parents:
5367
diff
changeset
|
553 |
[[self nextResponder] rightMouseDown:theEvent]; |
4915
834ce48a19c2
Fix right mouse event handling in Cocoa
Jjgod Jiang <gzjjgod@gmail.com>
parents:
4902
diff
changeset
|
554 |
} |
7158
ff52fba70795
Mac: Use cursor rects instead of NSCursor hide/unhide.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7113
diff
changeset
|
555 |
|
ff52fba70795
Mac: Use cursor rects instead of NSCursor hide/unhide.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7113
diff
changeset
|
556 |
- (void)resetCursorRects |
ff52fba70795
Mac: Use cursor rects instead of NSCursor hide/unhide.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7113
diff
changeset
|
557 |
{ |
ff52fba70795
Mac: Use cursor rects instead of NSCursor hide/unhide.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7113
diff
changeset
|
558 |
[super resetCursorRects]; |
ff52fba70795
Mac: Use cursor rects instead of NSCursor hide/unhide.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7113
diff
changeset
|
559 |
SDL_Mouse *mouse = SDL_GetMouse(); |
ff52fba70795
Mac: Use cursor rects instead of NSCursor hide/unhide.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7113
diff
changeset
|
560 |
|
7270
76df5476a6ce
Mac: Hide cursor in relative mode.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7205
diff
changeset
|
561 |
if (mouse->cursor_shown && mouse->cur_cursor && !mouse->relative_mode) { |
7158
ff52fba70795
Mac: Use cursor rects instead of NSCursor hide/unhide.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7113
diff
changeset
|
562 |
[self addCursorRect:[self bounds] |
ff52fba70795
Mac: Use cursor rects instead of NSCursor hide/unhide.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7113
diff
changeset
|
563 |
cursor:mouse->cur_cursor->driverdata]; |
ff52fba70795
Mac: Use cursor rects instead of NSCursor hide/unhide.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7113
diff
changeset
|
564 |
} else { |
ff52fba70795
Mac: Use cursor rects instead of NSCursor hide/unhide.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7113
diff
changeset
|
565 |
[self addCursorRect:[self bounds] |
ff52fba70795
Mac: Use cursor rects instead of NSCursor hide/unhide.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7113
diff
changeset
|
566 |
cursor:[NSCursor invisibleCursor]]; |
ff52fba70795
Mac: Use cursor rects instead of NSCursor hide/unhide.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7113
diff
changeset
|
567 |
} |
ff52fba70795
Mac: Use cursor rects instead of NSCursor hide/unhide.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7113
diff
changeset
|
568 |
} |
4915
834ce48a19c2
Fix right mouse event handling in Cocoa
Jjgod Jiang <gzjjgod@gmail.com>
parents:
4902
diff
changeset
|
569 |
@end |
834ce48a19c2
Fix right mouse event handling in Cocoa
Jjgod Jiang <gzjjgod@gmail.com>
parents:
4902
diff
changeset
|
570 |
|
5249
7a963be087ef
Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off.
Sam Lantinga <slouken@libsdl.org>
parents:
5246
diff
changeset
|
571 |
static unsigned int |
5305
75f5ff92ad08
Fixed a host of issues with Windows fullscreen modes. Toggling fullscreen OpenGL works now in my test environment.
Sam Lantinga <slouken@libsdl.org>
parents:
5262
diff
changeset
|
572 |
GetWindowStyle(SDL_Window * window) |
5249
7a963be087ef
Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off.
Sam Lantinga <slouken@libsdl.org>
parents:
5246
diff
changeset
|
573 |
{ |
7a963be087ef
Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off.
Sam Lantinga <slouken@libsdl.org>
parents:
5246
diff
changeset
|
574 |
unsigned int style; |
7a963be087ef
Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off.
Sam Lantinga <slouken@libsdl.org>
parents:
5246
diff
changeset
|
575 |
|
7191
75360622e65f
File style cleanup for the SDL 2.0 release
Sam Lantinga <slouken@libsdl.org>
parents:
7158
diff
changeset
|
576 |
if (window->flags & SDL_WINDOW_FULLSCREEN) { |
5249
7a963be087ef
Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off.
Sam Lantinga <slouken@libsdl.org>
parents:
5246
diff
changeset
|
577 |
style = NSBorderlessWindowMask; |
7191
75360622e65f
File style cleanup for the SDL 2.0 release
Sam Lantinga <slouken@libsdl.org>
parents:
7158
diff
changeset
|
578 |
} else { |
75360622e65f
File style cleanup for the SDL 2.0 release
Sam Lantinga <slouken@libsdl.org>
parents:
7158
diff
changeset
|
579 |
if (window->flags & SDL_WINDOW_BORDERLESS) { |
75360622e65f
File style cleanup for the SDL 2.0 release
Sam Lantinga <slouken@libsdl.org>
parents:
7158
diff
changeset
|
580 |
style = NSBorderlessWindowMask; |
75360622e65f
File style cleanup for the SDL 2.0 release
Sam Lantinga <slouken@libsdl.org>
parents:
7158
diff
changeset
|
581 |
} else { |
75360622e65f
File style cleanup for the SDL 2.0 release
Sam Lantinga <slouken@libsdl.org>
parents:
7158
diff
changeset
|
582 |
style = (NSTitledWindowMask|NSClosableWindowMask|NSMiniaturizableWindowMask); |
75360622e65f
File style cleanup for the SDL 2.0 release
Sam Lantinga <slouken@libsdl.org>
parents:
7158
diff
changeset
|
583 |
} |
75360622e65f
File style cleanup for the SDL 2.0 release
Sam Lantinga <slouken@libsdl.org>
parents:
7158
diff
changeset
|
584 |
if (window->flags & SDL_WINDOW_RESIZABLE) { |
75360622e65f
File style cleanup for the SDL 2.0 release
Sam Lantinga <slouken@libsdl.org>
parents:
7158
diff
changeset
|
585 |
style |= NSResizableWindowMask; |
75360622e65f
File style cleanup for the SDL 2.0 release
Sam Lantinga <slouken@libsdl.org>
parents:
7158
diff
changeset
|
586 |
} |
75360622e65f
File style cleanup for the SDL 2.0 release
Sam Lantinga <slouken@libsdl.org>
parents:
7158
diff
changeset
|
587 |
} |
5249
7a963be087ef
Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off.
Sam Lantinga <slouken@libsdl.org>
parents:
5246
diff
changeset
|
588 |
return style; |
7a963be087ef
Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off.
Sam Lantinga <slouken@libsdl.org>
parents:
5246
diff
changeset
|
589 |
} |
7a963be087ef
Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off.
Sam Lantinga <slouken@libsdl.org>
parents:
5246
diff
changeset
|
590 |
|
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
591 |
static int |
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
1937
diff
changeset
|
592 |
SetupWindowData(_THIS, SDL_Window * window, NSWindow *nswindow, SDL_bool created) |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
593 |
{ |
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
594 |
NSAutoreleasePool *pool; |
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
1937
diff
changeset
|
595 |
SDL_VideoData *videodata = (SDL_VideoData *) _this->driverdata; |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
596 |
SDL_WindowData *data; |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
597 |
|
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
598 |
/* Allocate the window data */ |
5249
7a963be087ef
Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off.
Sam Lantinga <slouken@libsdl.org>
parents:
5246
diff
changeset
|
599 |
data = (SDL_WindowData *) SDL_calloc(1, sizeof(*data)); |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
600 |
if (!data) { |
7037
3fedf1f25b94
Make SDL_SetError and friends unconditionally return -1.
Ryan C. Gordon <icculus@icculus.org>
parents:
6953
diff
changeset
|
601 |
return SDL_OutOfMemory(); |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
602 |
} |
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
|
603 |
data->window = window; |
3688
6512cba48440
Fixed Cocoa and OpenGL builds
Sam Lantinga <slouken@libsdl.org>
parents:
3685
diff
changeset
|
604 |
data->nswindow = nswindow; |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
605 |
data->created = created; |
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
1937
diff
changeset
|
606 |
data->videodata = videodata; |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
607 |
|
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
608 |
pool = [[NSAutoreleasePool alloc] init]; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
609 |
|
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
610 |
/* Create an event listener for the window */ |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
611 |
data->listener = [[Cocoa_WindowListener alloc] init]; |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
612 |
|
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
613 |
/* Fill in the SDL window with the window data */ |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
614 |
{ |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
615 |
NSRect rect = [nswindow contentRectForFrameRect:[nswindow frame]]; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
616 |
ConvertNSRect(&rect); |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
617 |
window->x = (int)rect.origin.x; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
618 |
window->y = (int)rect.origin.y; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
619 |
window->w = (int)rect.size.width; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
620 |
window->h = (int)rect.size.height; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
621 |
} |
5371
fc3d3d580777
Fixed the responder chain for event handling, the listener fully handles mouse events - even in fullscreen mode.
Sam Lantinga <slouken@libsdl.org>
parents:
5367
diff
changeset
|
622 |
|
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
623 |
/* Set up the listener after we create the view */ |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
624 |
[data->listener listen:data]; |
5371
fc3d3d580777
Fixed the responder chain for event handling, the listener fully handles mouse events - even in fullscreen mode.
Sam Lantinga <slouken@libsdl.org>
parents:
5367
diff
changeset
|
625 |
|
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
626 |
if ([nswindow isVisible]) { |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
627 |
window->flags |= SDL_WINDOW_SHOWN; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
628 |
} else { |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
629 |
window->flags &= ~SDL_WINDOW_SHOWN; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
630 |
} |
7084
9d43403e9fc5
Properly reflect hidden/shown windows on OSX.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7037
diff
changeset
|
631 |
|
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
632 |
{ |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
633 |
unsigned int style = [nswindow styleMask]; |
6832
156e608ec4ef
Replaced manual NSAutoreleasePool handing with @autorelease
stopiccot <alexey.petruchik@gmail.com>
parents:
6788
diff
changeset
|
634 |
|
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
635 |
if (style == NSBorderlessWindowMask) { |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
636 |
window->flags |= SDL_WINDOW_BORDERLESS; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
637 |
} else { |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
638 |
window->flags &= ~SDL_WINDOW_BORDERLESS; |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
639 |
} |
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
640 |
if (style & NSResizableWindowMask) { |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
641 |
window->flags |= SDL_WINDOW_RESIZABLE; |
6832
156e608ec4ef
Replaced manual NSAutoreleasePool handing with @autorelease
stopiccot <alexey.petruchik@gmail.com>
parents:
6788
diff
changeset
|
642 |
} else { |
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
643 |
window->flags &= ~SDL_WINDOW_RESIZABLE; |
6832
156e608ec4ef
Replaced manual NSAutoreleasePool handing with @autorelease
stopiccot <alexey.petruchik@gmail.com>
parents:
6788
diff
changeset
|
644 |
} |
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
645 |
} |
7084
9d43403e9fc5
Properly reflect hidden/shown windows on OSX.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7037
diff
changeset
|
646 |
|
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
647 |
/* isZoomed always returns true if the window is not resizable */ |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
648 |
if ((window->flags & SDL_WINDOW_RESIZABLE) && [nswindow isZoomed]) { |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
649 |
window->flags |= SDL_WINDOW_MAXIMIZED; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
650 |
} else { |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
651 |
window->flags &= ~SDL_WINDOW_MAXIMIZED; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
652 |
} |
7084
9d43403e9fc5
Properly reflect hidden/shown windows on OSX.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7037
diff
changeset
|
653 |
|
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
654 |
if ([nswindow isMiniaturized]) { |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
655 |
window->flags |= SDL_WINDOW_MINIMIZED; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
656 |
} else { |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
657 |
window->flags &= ~SDL_WINDOW_MINIMIZED; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
658 |
} |
7084
9d43403e9fc5
Properly reflect hidden/shown windows on OSX.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7037
diff
changeset
|
659 |
|
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
660 |
if ([nswindow isKeyWindow]) { |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
661 |
window->flags |= SDL_WINDOW_INPUT_FOCUS; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
662 |
SDL_SetKeyboardFocus(data->window); |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
663 |
} |
6832
156e608ec4ef
Replaced manual NSAutoreleasePool handing with @autorelease
stopiccot <alexey.petruchik@gmail.com>
parents:
6788
diff
changeset
|
664 |
|
7085
152cc7ddfa57
Mac no longer loses OpenGL context when window is hidden.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7084
diff
changeset
|
665 |
/* Prevents the window's "window device" from being destroyed when it is |
152cc7ddfa57
Mac no longer loses OpenGL context when window is hidden.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7084
diff
changeset
|
666 |
* hidden. See http://www.mikeash.com/pyblog/nsopenglcontext-and-one-shot.html |
152cc7ddfa57
Mac no longer loses OpenGL context when window is hidden.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7084
diff
changeset
|
667 |
*/ |
152cc7ddfa57
Mac no longer loses OpenGL context when window is hidden.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7084
diff
changeset
|
668 |
[nswindow setOneShot:NO]; |
152cc7ddfa57
Mac no longer loses OpenGL context when window is hidden.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7084
diff
changeset
|
669 |
|
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
670 |
/* All done! */ |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
671 |
[pool release]; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
672 |
window->driverdata = data; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
673 |
return 0; |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
674 |
} |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
675 |
|
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
676 |
int |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
677 |
Cocoa_CreateWindow(_THIS, SDL_Window * window) |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
678 |
{ |
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
679 |
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
680 |
NSWindow *nswindow; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
681 |
SDL_VideoDisplay *display = SDL_GetDisplayForWindow(window); |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
682 |
NSRect rect; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
683 |
SDL_Rect bounds; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
684 |
unsigned int style; |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
685 |
|
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
686 |
Cocoa_GetDisplayBounds(_this, display, &bounds); |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
687 |
rect.origin.x = window->x; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
688 |
rect.origin.y = window->y; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
689 |
rect.size.width = window->w; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
690 |
rect.size.height = window->h; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
691 |
ConvertNSRect(&rect); |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
692 |
|
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
693 |
style = GetWindowStyle(window); |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
694 |
|
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
695 |
/* Figure out which screen to place this window */ |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
696 |
NSArray *screens = [NSScreen screens]; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
697 |
NSScreen *screen = nil; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
698 |
NSScreen *candidate; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
699 |
int i, count = [screens count]; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
700 |
for (i = 0; i < count; ++i) { |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
701 |
candidate = [screens objectAtIndex:i]; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
702 |
NSRect screenRect = [candidate frame]; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
703 |
if (rect.origin.x >= screenRect.origin.x && |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
704 |
rect.origin.x < screenRect.origin.x + screenRect.size.width && |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
705 |
rect.origin.y >= screenRect.origin.y && |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
706 |
rect.origin.y < screenRect.origin.y + screenRect.size.height) { |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
707 |
screen = candidate; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
708 |
rect.origin.x -= screenRect.origin.x; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
709 |
rect.origin.y -= screenRect.origin.y; |
3506
e829b6098435
Added support for placing windows on different displays
Sam Lantinga <slouken@libsdl.org>
parents:
3414
diff
changeset
|
710 |
} |
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
711 |
} |
7085
152cc7ddfa57
Mac no longer loses OpenGL context when window is hidden.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7084
diff
changeset
|
712 |
nswindow = [[SDLWindow alloc] initWithContentRect:rect styleMask:style backing:NSBackingStoreBuffered defer:NO screen:screen]; |
7205
b1ca5be78064
Patched to compile on older Mac OS X devtools (thanks, D B!).
Ryan C. Gordon <icculus@icculus.org>
parents:
7202
diff
changeset
|
713 |
[nswindow setBackgroundColor:[NSColor blackColor]]; |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
714 |
|
7191
75360622e65f
File style cleanup for the SDL 2.0 release
Sam Lantinga <slouken@libsdl.org>
parents:
7158
diff
changeset
|
715 |
/* Create a default view for this window */ |
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
716 |
rect = [nswindow contentRectForFrameRect:[nswindow frame]]; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
717 |
NSView *contentView = [[SDLView alloc] initWithFrame:rect]; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
718 |
[nswindow setContentView: contentView]; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
719 |
[contentView release]; |
6489
31449ea8f934
Fixed bug 1496 - SDLView not created for a Cocoa window, resulting in missing right mouse clicks
Sam Lantinga <slouken@libsdl.org>
parents:
6426
diff
changeset
|
720 |
|
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
721 |
[pool release]; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
722 |
|
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
723 |
if (SetupWindowData(_this, window, nswindow, SDL_TRUE) < 0) { |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
724 |
[nswindow release]; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
725 |
return -1; |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
726 |
} |
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
727 |
return 0; |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
728 |
} |
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 |
int |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
731 |
Cocoa_CreateWindowFrom(_THIS, SDL_Window * window, const void *data) |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
732 |
{ |
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
733 |
NSAutoreleasePool *pool; |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
734 |
NSWindow *nswindow = (NSWindow *) data; |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
735 |
NSString *title; |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
736 |
|
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
737 |
pool = [[NSAutoreleasePool alloc] init]; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
738 |
|
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
739 |
/* Query the title from the existing window */ |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
740 |
title = [nswindow title]; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
741 |
if (title) { |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
742 |
window->title = SDL_strdup([title UTF8String]); |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
743 |
} |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
744 |
|
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
745 |
[pool release]; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
746 |
|
1951
7177581dc9fa
Initial work on X11 window code in.
Sam Lantinga <slouken@libsdl.org>
parents:
1937
diff
changeset
|
747 |
return SetupWindowData(_this, window, nswindow, SDL_FALSE); |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
748 |
} |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
749 |
|
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
750 |
void |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
751 |
Cocoa_SetWindowTitle(_THIS, SDL_Window * window) |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
752 |
{ |
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
753 |
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
754 |
NSWindow *nswindow = ((SDL_WindowData *) window->driverdata)->nswindow; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
755 |
NSString *string; |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
756 |
|
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
757 |
if(window->title) { |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
758 |
string = [[NSString alloc] initWithUTF8String:window->title]; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
759 |
} else { |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
760 |
string = [[NSString alloc] init]; |
1956
ba0d62354872
Simplified driver window creation code.
Sam Lantinga <slouken@libsdl.org>
parents:
1952
diff
changeset
|
761 |
} |
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
762 |
[nswindow setTitle:string]; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
763 |
[string release]; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
764 |
|
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
765 |
[pool release]; |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
766 |
} |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
767 |
|
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
768 |
void |
5375
16877f74123c
Implemented Cocoa_SetWindowIcon(), added SDL_ConvertSurfaceFormat()
Sam Lantinga <slouken@libsdl.org>
parents:
5374
diff
changeset
|
769 |
Cocoa_SetWindowIcon(_THIS, SDL_Window * window, SDL_Surface * icon) |
16877f74123c
Implemented Cocoa_SetWindowIcon(), added SDL_ConvertSurfaceFormat()
Sam Lantinga <slouken@libsdl.org>
parents:
5374
diff
changeset
|
770 |
{ |
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
771 |
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
772 |
NSImage *nsimage = Cocoa_CreateImage(icon); |
5375
16877f74123c
Implemented Cocoa_SetWindowIcon(), added SDL_ConvertSurfaceFormat()
Sam Lantinga <slouken@libsdl.org>
parents:
5374
diff
changeset
|
773 |
|
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
774 |
if (nsimage) { |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
775 |
[NSApp setApplicationIconImage:nsimage]; |
5375
16877f74123c
Implemented Cocoa_SetWindowIcon(), added SDL_ConvertSurfaceFormat()
Sam Lantinga <slouken@libsdl.org>
parents:
5374
diff
changeset
|
776 |
} |
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
777 |
|
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
778 |
[pool release]; |
5375
16877f74123c
Implemented Cocoa_SetWindowIcon(), added SDL_ConvertSurfaceFormat()
Sam Lantinga <slouken@libsdl.org>
parents:
5374
diff
changeset
|
779 |
} |
16877f74123c
Implemented Cocoa_SetWindowIcon(), added SDL_ConvertSurfaceFormat()
Sam Lantinga <slouken@libsdl.org>
parents:
5374
diff
changeset
|
780 |
|
16877f74123c
Implemented Cocoa_SetWindowIcon(), added SDL_ConvertSurfaceFormat()
Sam Lantinga <slouken@libsdl.org>
parents:
5374
diff
changeset
|
781 |
void |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
782 |
Cocoa_SetWindowPosition(_THIS, SDL_Window * window) |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
783 |
{ |
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
784 |
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
785 |
NSWindow *nswindow = ((SDL_WindowData *) window->driverdata)->nswindow; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
786 |
NSRect rect; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
787 |
Uint32 moveHack; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
788 |
|
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
789 |
rect.origin.x = window->x; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
790 |
rect.origin.y = window->y; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
791 |
rect.size.width = window->w; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
792 |
rect.size.height = window->h; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
793 |
ConvertNSRect(&rect); |
5478
6b65ff3cee62
Fixed bug 1167 (SDL_WINDOWPOS_CENTERED doesn't work if used right after fullscreen -> windowed switch)
Sam Lantinga <slouken@libsdl.org>
parents:
5466
diff
changeset
|
794 |
|
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
795 |
moveHack = s_moveHack; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
796 |
s_moveHack = 0; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
797 |
[nswindow setFrameOrigin:rect.origin]; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
798 |
s_moveHack = moveHack; |
5478
6b65ff3cee62
Fixed bug 1167 (SDL_WINDOWPOS_CENTERED doesn't work if used right after fullscreen -> windowed switch)
Sam Lantinga <slouken@libsdl.org>
parents:
5466
diff
changeset
|
799 |
|
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
800 |
if (window == _this->current_glwin) { |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
801 |
[((NSOpenGLContext *) _this->current_glctx) update]; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
802 |
} |
6832
156e608ec4ef
Replaced manual NSAutoreleasePool handing with @autorelease
stopiccot <alexey.petruchik@gmail.com>
parents:
6788
diff
changeset
|
803 |
|
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
804 |
[pool release]; |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
805 |
} |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
806 |
|
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
807 |
void |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
808 |
Cocoa_SetWindowSize(_THIS, SDL_Window * window) |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
809 |
{ |
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
810 |
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
811 |
SDL_WindowData *windata = (SDL_WindowData *) window->driverdata; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
812 |
NSWindow *nswindow = windata->nswindow; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
813 |
NSSize size; |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
814 |
|
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
815 |
size.width = window->w; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
816 |
size.height = window->h; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
817 |
[nswindow setContentSize:size]; |
5564
7ed38a8ad304
Cocoa: Update the current GL context when its window moves or resizes.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
818 |
|
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
819 |
if (window == _this->current_glwin) { |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
820 |
[((NSOpenGLContext *) _this->current_glctx) update]; |
5564
7ed38a8ad304
Cocoa: Update the current GL context when its window moves or resizes.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
821 |
} |
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
822 |
|
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
823 |
[pool release]; |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
824 |
} |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
825 |
|
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
826 |
void |
6681 | 827 |
Cocoa_SetWindowMinimumSize(_THIS, SDL_Window * window) |
828 |
{ |
|
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
829 |
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
830 |
SDL_WindowData *windata = (SDL_WindowData *) window->driverdata; |
7191
75360622e65f
File style cleanup for the SDL 2.0 release
Sam Lantinga <slouken@libsdl.org>
parents:
7158
diff
changeset
|
831 |
|
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
832 |
NSSize minSize; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
833 |
minSize.width = window->min_w; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
834 |
minSize.height = window->min_h; |
7191
75360622e65f
File style cleanup for the SDL 2.0 release
Sam Lantinga <slouken@libsdl.org>
parents:
7158
diff
changeset
|
835 |
|
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
836 |
[windata->nswindow setContentMinSize:minSize]; |
7191
75360622e65f
File style cleanup for the SDL 2.0 release
Sam Lantinga <slouken@libsdl.org>
parents:
7158
diff
changeset
|
837 |
|
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
838 |
[pool release]; |
6788
036f53f2f5aa
Added SDL_SetWindowMaximumSize() and SDL_GetWindowMaximumSize()
Sam Lantinga <slouken@libsdl.org>
parents:
6784
diff
changeset
|
839 |
} |
036f53f2f5aa
Added SDL_SetWindowMaximumSize() and SDL_GetWindowMaximumSize()
Sam Lantinga <slouken@libsdl.org>
parents:
6784
diff
changeset
|
840 |
|
036f53f2f5aa
Added SDL_SetWindowMaximumSize() and SDL_GetWindowMaximumSize()
Sam Lantinga <slouken@libsdl.org>
parents:
6784
diff
changeset
|
841 |
void |
036f53f2f5aa
Added SDL_SetWindowMaximumSize() and SDL_GetWindowMaximumSize()
Sam Lantinga <slouken@libsdl.org>
parents:
6784
diff
changeset
|
842 |
Cocoa_SetWindowMaximumSize(_THIS, SDL_Window * window) |
036f53f2f5aa
Added SDL_SetWindowMaximumSize() and SDL_GetWindowMaximumSize()
Sam Lantinga <slouken@libsdl.org>
parents:
6784
diff
changeset
|
843 |
{ |
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
844 |
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
845 |
SDL_WindowData *windata = (SDL_WindowData *) window->driverdata; |
7191
75360622e65f
File style cleanup for the SDL 2.0 release
Sam Lantinga <slouken@libsdl.org>
parents:
7158
diff
changeset
|
846 |
|
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
847 |
NSSize maxSize; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
848 |
maxSize.width = window->max_w; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
849 |
maxSize.height = window->max_h; |
7191
75360622e65f
File style cleanup for the SDL 2.0 release
Sam Lantinga <slouken@libsdl.org>
parents:
7158
diff
changeset
|
850 |
|
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
851 |
[windata->nswindow setContentMaxSize:maxSize]; |
7191
75360622e65f
File style cleanup for the SDL 2.0 release
Sam Lantinga <slouken@libsdl.org>
parents:
7158
diff
changeset
|
852 |
|
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
853 |
[pool release]; |
6681 | 854 |
} |
855 |
||
856 |
void |
|
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
857 |
Cocoa_ShowWindow(_THIS, SDL_Window * window) |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
858 |
{ |
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
859 |
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; |
7087
5639ac726076
Fix Mac crash when creating fullscreen window introduced in 9d43403e9fc5.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7085
diff
changeset
|
860 |
SDL_WindowData *windowData = ((SDL_WindowData *) window->driverdata); |
5639ac726076
Fix Mac crash when creating fullscreen window introduced in 9d43403e9fc5.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7085
diff
changeset
|
861 |
NSWindow *nswindow = windowData->nswindow; |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
862 |
|
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
863 |
if (![nswindow isMiniaturized]) { |
7087
5639ac726076
Fix Mac crash when creating fullscreen window introduced in 9d43403e9fc5.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7085
diff
changeset
|
864 |
[windowData->listener pauseVisibleObservation]; |
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
865 |
[nswindow makeKeyAndOrderFront:nil]; |
7087
5639ac726076
Fix Mac crash when creating fullscreen window introduced in 9d43403e9fc5.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7085
diff
changeset
|
866 |
[windowData->listener resumeVisibleObservation]; |
1956
ba0d62354872
Simplified driver window creation code.
Sam Lantinga <slouken@libsdl.org>
parents:
1952
diff
changeset
|
867 |
} |
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
868 |
[pool release]; |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
869 |
} |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
870 |
|
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
871 |
void |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
872 |
Cocoa_HideWindow(_THIS, SDL_Window * window) |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
873 |
{ |
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
874 |
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
875 |
NSWindow *nswindow = ((SDL_WindowData *) window->driverdata)->nswindow; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
876 |
|
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
877 |
[nswindow orderOut:nil]; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
878 |
[pool release]; |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
879 |
} |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
880 |
|
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
881 |
void |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
882 |
Cocoa_RaiseWindow(_THIS, SDL_Window * window) |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
883 |
{ |
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
884 |
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; |
7087
5639ac726076
Fix Mac crash when creating fullscreen window introduced in 9d43403e9fc5.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7085
diff
changeset
|
885 |
SDL_WindowData *windowData = ((SDL_WindowData *) window->driverdata); |
5639ac726076
Fix Mac crash when creating fullscreen window introduced in 9d43403e9fc5.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7085
diff
changeset
|
886 |
NSWindow *nswindow = windowData->nswindow; |
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
887 |
|
7469
4310d5aee6fe
Mac: Handle SDL_CreateWindow with SDL_WINDOW_MINIMZED.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7389
diff
changeset
|
888 |
// makeKeyAndOrderFront: has the side-effect of deminiaturizing and showing |
4310d5aee6fe
Mac: Handle SDL_CreateWindow with SDL_WINDOW_MINIMZED.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7389
diff
changeset
|
889 |
// a minimized or hidden window, so check for that before showing it. |
7087
5639ac726076
Fix Mac crash when creating fullscreen window introduced in 9d43403e9fc5.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7085
diff
changeset
|
890 |
[windowData->listener pauseVisibleObservation]; |
7469
4310d5aee6fe
Mac: Handle SDL_CreateWindow with SDL_WINDOW_MINIMZED.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7389
diff
changeset
|
891 |
if (![nswindow isMiniaturized] && [nswindow isVisible]) { |
4310d5aee6fe
Mac: Handle SDL_CreateWindow with SDL_WINDOW_MINIMZED.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7389
diff
changeset
|
892 |
[nswindow makeKeyAndOrderFront:nil]; |
4310d5aee6fe
Mac: Handle SDL_CreateWindow with SDL_WINDOW_MINIMZED.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7389
diff
changeset
|
893 |
} |
7087
5639ac726076
Fix Mac crash when creating fullscreen window introduced in 9d43403e9fc5.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7085
diff
changeset
|
894 |
[windowData->listener resumeVisibleObservation]; |
5639ac726076
Fix Mac crash when creating fullscreen window introduced in 9d43403e9fc5.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7085
diff
changeset
|
895 |
|
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
896 |
[pool release]; |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
897 |
} |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
898 |
|
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
899 |
void |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
900 |
Cocoa_MaximizeWindow(_THIS, SDL_Window * window) |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
901 |
{ |
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
902 |
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
903 |
NSWindow *nswindow = ((SDL_WindowData *) window->driverdata)->nswindow; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
904 |
|
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
905 |
[nswindow zoom:nil]; |
5564
7ed38a8ad304
Cocoa: Update the current GL context when its window moves or resizes.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
906 |
|
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
907 |
if (window == _this->current_glwin) { |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
908 |
[((NSOpenGLContext *) _this->current_glctx) update]; |
5564
7ed38a8ad304
Cocoa: Update the current GL context when its window moves or resizes.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
909 |
} |
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
910 |
|
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
911 |
[pool release]; |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
912 |
} |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
913 |
|
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
914 |
void |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
915 |
Cocoa_MinimizeWindow(_THIS, SDL_Window * window) |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
916 |
{ |
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
917 |
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
918 |
NSWindow *nswindow = ((SDL_WindowData *) window->driverdata)->nswindow; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
919 |
|
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
920 |
[nswindow miniaturize:nil]; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
921 |
[pool release]; |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
922 |
} |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
923 |
|
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
924 |
void |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
925 |
Cocoa_RestoreWindow(_THIS, SDL_Window * window) |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
926 |
{ |
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
927 |
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
928 |
NSWindow *nswindow = ((SDL_WindowData *) window->driverdata)->nswindow; |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
929 |
|
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
930 |
if ([nswindow isMiniaturized]) { |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
931 |
[nswindow deminiaturize:nil]; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
932 |
} else if ((window->flags & SDL_WINDOW_RESIZABLE) && [nswindow isZoomed]) { |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
933 |
[nswindow zoom:nil]; |
1956
ba0d62354872
Simplified driver window creation code.
Sam Lantinga <slouken@libsdl.org>
parents:
1952
diff
changeset
|
934 |
} |
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
935 |
[pool release]; |
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
936 |
} |
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
937 |
|
5400 | 938 |
static NSWindow * |
939 |
Cocoa_RebuildWindow(SDL_WindowData * data, NSWindow * nswindow, unsigned style) |
|
940 |
{ |
|
941 |
if (!data->created) { |
|
942 |
/* Don't mess with other people's windows... */ |
|
943 |
return nswindow; |
|
944 |
} |
|
945 |
||
946 |
[data->listener close]; |
|
7085
152cc7ddfa57
Mac no longer loses OpenGL context when window is hidden.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7084
diff
changeset
|
947 |
data->nswindow = [[SDLWindow alloc] initWithContentRect:[[nswindow contentView] frame] styleMask:style backing:NSBackingStoreBuffered defer:NO screen:[nswindow screen]]; |
5400 | 948 |
[data->nswindow setContentView:[nswindow contentView]]; |
7085
152cc7ddfa57
Mac no longer loses OpenGL context when window is hidden.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7084
diff
changeset
|
949 |
/* See comment in SetupWindowData. */ |
152cc7ddfa57
Mac no longer loses OpenGL context when window is hidden.
Jørgen P. Tjernø <jorgen@valvesoftware.com>
parents:
7084
diff
changeset
|
950 |
[data->nswindow setOneShot:NO]; |
5400 | 951 |
[data->listener listen:data]; |
952 |
||
953 |
[nswindow close]; |
|
954 |
||
955 |
return data->nswindow; |
|
956 |
} |
|
957 |
||
1933
7ee5297340f7
Implemented Cocoa window support
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
958 |
void |
6422
fd0ac1b56115
Added SDL_SetWindowBordered() API.
Ryan C. Gordon <icculus@icculus.org>
parents:
6301
diff
changeset
|
959 |
Cocoa_SetWindowBordered(_THIS, SDL_Window * window, SDL_bool bordered) |
fd0ac1b56115
Added SDL_SetWindowBordered() API.
Ryan C. Gordon <icculus@icculus.org>
parents:
6301
diff
changeset
|
960 |
{ |
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
961 |
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
962 |
NSWindow *nswindow = ((SDL_WindowData *) window->driverdata)->nswindow; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
963 |
if ([nswindow respondsToSelector:@selector(setStyleMask:)]) { |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
964 |
[nswindow setStyleMask:GetWindowStyle(window)]; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
965 |
if (bordered) { |
7191
75360622e65f
File style cleanup for the SDL 2.0 release
Sam Lantinga <slouken@libsdl.org>
parents:
7158
diff
changeset
|
966 |
Cocoa_SetWindowTitle(_this, window); /* this got blanked out. */ |
6426
38ed71d9ae5f
Restore Cocoa title bar caption when adding border to a window.
Ryan C. Gordon <icculus@icculus.org>
parents:
6422
diff
changeset
|
967 |
} |
6422
fd0ac1b56115
Added SDL_SetWindowBordered() API.
Ryan C. Gordon <icculus@icculus.org>
parents:
6301
diff
changeset
|
968 |
} |
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
969 |
[pool release]; |
6422
fd0ac1b56115
Added SDL_SetWindowBordered() API.
Ryan C. Gordon <icculus@icculus.org>
parents:
6301
diff
changeset
|
970 |
} |
fd0ac1b56115
Added SDL_SetWindowBordered() API.
Ryan C. Gordon <icculus@icculus.org>
parents:
6301
diff
changeset
|
971 |
|
fd0ac1b56115
Added SDL_SetWindowBordered() API.
Ryan C. Gordon <icculus@icculus.org>
parents:
6301
diff
changeset
|
972 |
void |
5305
75f5ff92ad08
Fixed a host of issues with Windows fullscreen modes. Toggling fullscreen OpenGL works now in my test environment.
Sam Lantinga <slouken@libsdl.org>
parents:
5262
diff
changeset
|
973 |
Cocoa_SetWindowFullscreen(_THIS, SDL_Window * window, SDL_VideoDisplay * display, SDL_bool fullscreen) |
5249
7a963be087ef
Mostly fixed fullscreen mode on Mac OS X, and you can toggle it on and off.
Sam Lantinga <slouken@libsdl.org>
parents:
5246
diff
changeset
|
974 |
{ |
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
975 |
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
976 |
SDL_WindowData *data = (SDL_WindowData *) window->driverdata; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
977 |
NSWindow *nswindow = data->nswindow; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
978 |
NSRect rect; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
979 |
|
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
980 |
/* The view responder chain gets messed with during setStyleMask */ |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
981 |
if ([[nswindow contentView] nextResponder] == data->listener) { |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
982 |
[[nswindow contentView] setNextResponder:nil]; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
983 |
} |
5502
ed5f117c949d
Fixed bug: No right mouse button events during FullScreen Mac OS
Sam Lantinga <slouken@libsdl.org>
parents:
5478
diff
changeset
|
984 |
|
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
985 |
if (fullscreen) { |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
986 |
SDL_Rect bounds; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
987 |
|
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
988 |
Cocoa_GetDisplayBounds(_this, display, &bounds); |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
989 |
rect.origin.x = bounds.x; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
990 |
rect.origin.y = bounds.y; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
991 |
rect.size.width = bounds.w; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
992 |
rect.size.height = bounds.h; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
993 |
ConvertNSRect(&rect); |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
994 |
|
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
995 |
/* Hack to fix origin on Mac OS X 10.4 */ |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
996 |
NSRect screenRect = [[nswindow screen] frame]; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
997 |
if (screenRect.size.height >= 1.0f) { |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
998 |
rect.origin.y += (screenRect.size.height - rect.size.height); |
5401
ccaccc76a196
Fix fullscreen origin on Mac OS X 10.4
Sam Lantinga <slouken@libsdl.org>
parents:
5400
diff
changeset
|
999 |
} |
ccaccc76a196
Fix fullscreen origin on Mac OS X 10.4
Sam Lantinga <slouken@libsdl.org>
parents:
5400
diff
changeset
|
1000 |
|
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
1001 |
if ([nswindow respondsToSelector: @selector(setStyleMask:)]) { |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
1002 |
[nswindow performSelector: @selector(setStyleMask:) withObject: (id)NSBorderlessWindowMask]; |
5400 | 1003 |
} else { |
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
1004 |
nswindow = Cocoa_RebuildWindow(data, nswindow, NSBorderlessWindowMask); |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
1005 |
} |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
1006 |
} else { |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
1007 |
rect.origin.x = window->windowed.x; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
1008 |
rect.origin.y = window->windowed.y; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
1009 |
rect.size.width = window->windowed.w; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
1010 |
rect.size.height = window->windowed.h; |
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
1011 |
ConvertNSRect(&rect); |
6832
156e608ec4ef
Replaced manual NSAutoreleasePool handing with @autorelease
stopiccot <alexey.petruchik@gmail.com>
parents:
6788
diff
changeset
|
1012 |
|
6848
478ecc8a58b3
Backed out use of @autorelease keyword for now, since it's not supported by older Xcode versions.
Sam Lantinga <slouken@libsdl.org>
parents:
6832
diff
changeset
|
1013 |
if ([nswindow respondsToSelector: @selector(setStyleMask:)]) { |