Mercurial > mplayer.hg
annotate libvo/osx_objc_common.m @ 35094:967b0f13715c
Provide a swap buffer function for OS X.
It does not change any of the issues with double buffering.
author | reimar |
---|---|
date | Thu, 13 Sep 2012 21:46:59 +0000 |
parents | cc8276116e95 |
children | 84bb4ca7c6dd |
rev | line source |
---|---|
28446
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28306
diff
changeset
|
1 /* |
29210 | 2 * CoreVideo video output driver |
28836 | 3 * Copyright (c) 2005 Nicolas Plourde <nicolasplourde@gmail.com> |
4 * | |
28446
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28306
diff
changeset
|
5 * This file is part of MPlayer. |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28306
diff
changeset
|
6 * |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28306
diff
changeset
|
7 * MPlayer is free software; you can redistribute it and/or modify |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28306
diff
changeset
|
8 * it under the terms of the GNU General Public License as published by |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28306
diff
changeset
|
9 * the Free Software Foundation; either version 2 of the License, or |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28306
diff
changeset
|
10 * (at your option) any later version. |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28306
diff
changeset
|
11 * |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28306
diff
changeset
|
12 * MPlayer is distributed in the hope that it will be useful, |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28306
diff
changeset
|
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28306
diff
changeset
|
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28306
diff
changeset
|
15 * GNU General Public License for more details. |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28306
diff
changeset
|
16 * |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28306
diff
changeset
|
17 * You should have received a copy of the GNU General Public License along |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28306
diff
changeset
|
18 * with MPlayer; if not, write to the Free Software Foundation, Inc., |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28306
diff
changeset
|
19 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28306
diff
changeset
|
20 */ |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28306
diff
changeset
|
21 |
35086
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
22 #import "osx_objc_common.h" |
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
23 #include <Carbon/Carbon.h> |
27988 | 24 #include <CoreServices/CoreServices.h> |
25 //special workaround for Apple bug #6267445 | |
26 //(OSServices Power API disabled in OSServices.h for 64bit systems) | |
27 #ifndef __POWER__ | |
28 #include <CoreServices/../Frameworks/OSServices.framework/Headers/Power.h> | |
29 #endif | |
15289 | 30 |
31 //MPLAYER | |
32 #include "config.h" | |
33 #include "video_out.h" | |
34 #include "aspect.h" | |
35 #include "mp_msg.h" | |
28075
ca9badc94740
#include appropriate headers instead of locally declaring function prototypes.
diego
parents:
28051
diff
changeset
|
36 #include "mp_fifo.h" |
15289 | 37 |
38 #include "input/input.h" | |
39 #include "input/mouse.h" | |
40 | |
41 #include "osdep/keycodes.h" | |
29533
9c8f8e375823
Reuse the osx_common convert_key function to convert OSX keycodes to MPlayer
reimar
parents:
29272
diff
changeset
|
42 #include "osx_common.h" |
15289 | 43 |
15731 | 44 static float winAlpha = 1; |
15289 | 45 |
25179
6e8b40d412f0
Fix play window not get actived problem on Leopard.
ulion
parents:
25178
diff
changeset
|
46 static BOOL isLeopardOrLater; |
6e8b40d412f0
Fix play window not get actived problem on Leopard.
ulion
parents:
25178
diff
changeset
|
47 |
35086
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
48 static NSAutoreleasePool *autoreleasepool; |
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
49 static MPCommonOpenGLView *oglv; |
15289 | 50 |
35092 | 51 void (*vo_osx_redraw_func)(void); |
52 | |
35086
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
53 int vo_osx_init(void) |
15289 | 54 { |
35086
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
55 autoreleasepool = [[NSAutoreleasePool alloc] init]; |
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
56 oglv = [[MPCommonOpenGLView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100) pixelFormat:[MPCommonOpenGLView defaultPixelFormat]]; |
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
57 [oglv autorelease]; |
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
58 [oglv display]; |
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
59 [oglv preinit]; |
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
60 return 1; |
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
61 } |
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
62 |
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
63 void vo_osx_uninit(void) |
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
64 { |
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
65 NSAutoreleasePool *finalPool; |
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
66 oglv = nil; |
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
67 [autoreleasepool release]; |
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
68 finalPool = [[NSAutoreleasePool alloc] init]; |
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
69 [NSApp nextEventMatchingMask:NSAnyEventMask untilDate:nil inMode:NSDefaultRunLoopMode dequeue:YES]; |
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
70 [finalPool release]; |
15289 | 71 } |
72 | |
35086
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
73 int vo_osx_config(uint32_t width, uint32_t height, uint32_t flags) |
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
74 { |
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
75 [oglv config:width:height:flags]; |
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
76 return 1; |
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
77 } |
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
78 |
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
79 void vo_osx_ontop(void) |
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
80 { |
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
81 vo_ontop = !vo_ontop; |
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
82 [oglv ontop]; |
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
83 } |
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
84 |
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
85 void vo_osx_fullscreen(void) |
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
86 { |
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
87 vo_fs = !vo_fs; |
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
88 [oglv fullscreen:YES]; |
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
89 } |
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
90 |
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
91 int vo_osx_check_events(void) |
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
92 { |
35091 | 93 return [oglv check_events]; |
35086
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
94 } |
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
95 |
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
96 void vo_osx_update_xinerama_info(void) |
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
97 { |
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
98 [oglv update_screen_info]; |
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
99 } |
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
100 |
35094 | 101 void vo_osx_swap_buffers(void) |
102 { | |
103 [oglv->glContext flushBuffer]; | |
104 } | |
105 | |
35086
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
106 @implementation MPCommonOpenGLView |
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
107 - (void) update_screen_info |
15289 | 108 { |
35074
3fb18ad99003
Deprecate corevideo device_id in favour of -xineramascreen.
reimar
parents:
35073
diff
changeset
|
109 int screen_id = xinerama_screen; |
35073 | 110 NSArray *screen_array = [NSScreen screens]; |
35072 | 111 NSScreen *screen_handle; |
112 NSRect screen_frame; | |
30000
a30debd7acd7
Add -xineramascreen support to corevideo vo. Still prefer corevideo's own device_id parameter if it's set.
adrian
parents:
29657
diff
changeset
|
113 |
31740 | 114 if(screen_id >= (int)[screen_array count]) |
15728 | 115 { |
29210 | 116 mp_msg(MSGT_VO, MSGL_INFO, "[vo_corevideo] Device ID %d does not exist, falling back to main device\n", screen_id); |
28306 | 117 screen_id = -1; |
15728 | 118 } |
35086
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
119 if (screen_id < 0 && [self window]) |
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
120 screen_handle = [[self window] screen]; |
31741
601cd1e830fe
Avoid some code duplication in update_screen_info.
reimar
parents:
31740
diff
changeset
|
121 else |
31742 | 122 screen_handle = [screen_array objectAtIndex:(screen_id < 0 ? 0 : screen_id)]; |
29564
4ae3d2d7946e
Use MPlayer's standard aspect handling functions in corevideo
reimar
parents:
29533
diff
changeset
|
123 |
31741
601cd1e830fe
Avoid some code duplication in update_screen_info.
reimar
parents:
31740
diff
changeset
|
124 screen_frame = [screen_handle frame]; |
25414
5c03a9bdf220
Record screen size and display size in vo_ variables.
ulion
parents:
25413
diff
changeset
|
125 vo_screenwidth = screen_frame.size.width; |
5c03a9bdf220
Record screen size and display size in vo_ variables.
ulion
parents:
25413
diff
changeset
|
126 vo_screenheight = screen_frame.size.height; |
35071 | 127 xinerama_x = screen_frame.origin.x; |
128 xinerama_y = screen_frame.origin.y; | |
29564
4ae3d2d7946e
Use MPlayer's standard aspect handling functions in corevideo
reimar
parents:
29533
diff
changeset
|
129 aspect_save_screenres(vo_screenwidth, vo_screenheight); |
4ae3d2d7946e
Use MPlayer's standard aspect handling functions in corevideo
reimar
parents:
29533
diff
changeset
|
130 } |
4ae3d2d7946e
Use MPlayer's standard aspect handling functions in corevideo
reimar
parents:
29533
diff
changeset
|
131 |
24076 | 132 - (void) preinit |
15289 | 133 { |
29566
b128ce47771d
Reduce vo_corevideo memleaks by initializing static context etc. only once
reimar
parents:
29564
diff
changeset
|
134 GLint swapInterval = 1; |
b128ce47771d
Reduce vo_corevideo memleaks by initializing static context etc. only once
reimar
parents:
29564
diff
changeset
|
135 |
35085
5a9728bbb51e
Move some code around in preparation for following patch.
reimar
parents:
35084
diff
changeset
|
136 NSApplicationLoad(); |
5a9728bbb51e
Move some code around in preparation for following patch.
reimar
parents:
35084
diff
changeset
|
137 NSApp = [NSApplication sharedApplication]; |
5a9728bbb51e
Move some code around in preparation for following patch.
reimar
parents:
35084
diff
changeset
|
138 isLeopardOrLater = floor(NSAppKitVersionNumber) > 824; |
5a9728bbb51e
Move some code around in preparation for following patch.
reimar
parents:
35084
diff
changeset
|
139 |
5a9728bbb51e
Move some code around in preparation for following patch.
reimar
parents:
35084
diff
changeset
|
140 osx_foreground_hack(); |
5a9728bbb51e
Move some code around in preparation for following patch.
reimar
parents:
35084
diff
changeset
|
141 |
5a9728bbb51e
Move some code around in preparation for following patch.
reimar
parents:
35084
diff
changeset
|
142 // Install an event handler so the Quit menu entry works |
5a9728bbb51e
Move some code around in preparation for following patch.
reimar
parents:
35084
diff
changeset
|
143 // The proper way using NSApp setDelegate: and |
5a9728bbb51e
Move some code around in preparation for following patch.
reimar
parents:
35084
diff
changeset
|
144 // applicationShouldTerminate: does not work, |
5a9728bbb51e
Move some code around in preparation for following patch.
reimar
parents:
35084
diff
changeset
|
145 // probably NSApplication never installs its handler. |
5a9728bbb51e
Move some code around in preparation for following patch.
reimar
parents:
35084
diff
changeset
|
146 [[NSAppleEventManager sharedAppleEventManager] |
5a9728bbb51e
Move some code around in preparation for following patch.
reimar
parents:
35084
diff
changeset
|
147 setEventHandler:self |
5a9728bbb51e
Move some code around in preparation for following patch.
reimar
parents:
35084
diff
changeset
|
148 andSelector:@selector(handleQuitEvent:withReplyEvent:) |
5a9728bbb51e
Move some code around in preparation for following patch.
reimar
parents:
35084
diff
changeset
|
149 forEventClass:kCoreEventClass |
5a9728bbb51e
Move some code around in preparation for following patch.
reimar
parents:
35084
diff
changeset
|
150 andEventID:kAEQuitApplication]; |
5a9728bbb51e
Move some code around in preparation for following patch.
reimar
parents:
35084
diff
changeset
|
151 |
15726 | 152 //init menu |
153 [self initMenu]; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
154 |
15726 | 155 //create window |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
156 window = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 100, 100) |
15726 | 157 styleMask:NSTitledWindowMask|NSTexturedBackgroundWindowMask|NSClosableWindowMask|NSMiniaturizableWindowMask|NSResizableWindowMask |
158 backing:NSBackingStoreBuffered defer:NO]; | |
159 | |
16144 | 160 [window autorelease]; |
35066
e91f5bd3214d
Consistently use "self" instead of a global variable.
reimar
parents:
35065
diff
changeset
|
161 [window setDelegate:self]; |
e91f5bd3214d
Consistently use "self" instead of a global variable.
reimar
parents:
35065
diff
changeset
|
162 [window setContentView:self]; |
e91f5bd3214d
Consistently use "self" instead of a global variable.
reimar
parents:
35065
diff
changeset
|
163 [window setInitialFirstResponder:self]; |
15726 | 164 [window setAcceptsMouseMovedEvents:YES]; |
31742 | 165 [window setTitle:@"MPlayer - The Movie Player"]; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
166 |
15855 | 167 winSizeMult = 1; |
29566
b128ce47771d
Reduce vo_corevideo memleaks by initializing static context etc. only once
reimar
parents:
29564
diff
changeset
|
168 |
b128ce47771d
Reduce vo_corevideo memleaks by initializing static context etc. only once
reimar
parents:
29564
diff
changeset
|
169 //create OpenGL Context |
b128ce47771d
Reduce vo_corevideo memleaks by initializing static context etc. only once
reimar
parents:
29564
diff
changeset
|
170 glContext = [[NSOpenGLContext alloc] initWithFormat:[NSOpenGLView defaultPixelFormat] shareContext:nil]; |
b128ce47771d
Reduce vo_corevideo memleaks by initializing static context etc. only once
reimar
parents:
29564
diff
changeset
|
171 |
b128ce47771d
Reduce vo_corevideo memleaks by initializing static context etc. only once
reimar
parents:
29564
diff
changeset
|
172 [self setOpenGLContext:glContext]; |
b128ce47771d
Reduce vo_corevideo memleaks by initializing static context etc. only once
reimar
parents:
29564
diff
changeset
|
173 [glContext setValues:&swapInterval forParameter:NSOpenGLCPSwapInterval]; |
b128ce47771d
Reduce vo_corevideo memleaks by initializing static context etc. only once
reimar
parents:
29564
diff
changeset
|
174 [glContext setView:self]; |
b128ce47771d
Reduce vo_corevideo memleaks by initializing static context etc. only once
reimar
parents:
29564
diff
changeset
|
175 [glContext makeCurrentContext]; |
15726 | 176 } |
177 | |
29574
0aa36133f638
Add a dealloc function to corevideo to reduce the memleaks from
reimar
parents:
29573
diff
changeset
|
178 - (void) dealloc |
0aa36133f638
Add a dealloc function to corevideo to reduce the memleaks from
reimar
parents:
29573
diff
changeset
|
179 { |
35094 | 180 [glContext release]; |
29574
0aa36133f638
Add a dealloc function to corevideo to reduce the memleaks from
reimar
parents:
29573
diff
changeset
|
181 [self setOpenGLContext:nil]; |
0aa36133f638
Add a dealloc function to corevideo to reduce the memleaks from
reimar
parents:
29573
diff
changeset
|
182 [super dealloc]; |
0aa36133f638
Add a dealloc function to corevideo to reduce the memleaks from
reimar
parents:
29573
diff
changeset
|
183 } |
0aa36133f638
Add a dealloc function to corevideo to reduce the memleaks from
reimar
parents:
29573
diff
changeset
|
184 |
35080
a10c7a7a9232
Move some code around to make splitting into vo-specific and generic code easier.
reimar
parents:
35079
diff
changeset
|
185 - (void) config:(uint32_t)width:(uint32_t)height:(uint32_t)flags |
15726 | 186 { |
35080
a10c7a7a9232
Move some code around to make splitting into vo-specific and generic code easier.
reimar
parents:
35079
diff
changeset
|
187 config_movie_aspect((float)width/height); |
a10c7a7a9232
Move some code around to make splitting into vo-specific and generic code easier.
reimar
parents:
35079
diff
changeset
|
188 |
35084 | 189 vo_dwidth = width *= self->winSizeMult; |
190 vo_dheight = height *= self->winSizeMult; | |
35080
a10c7a7a9232
Move some code around to make splitting into vo-specific and generic code easier.
reimar
parents:
35079
diff
changeset
|
191 |
15728 | 192 //config window |
30001 | 193 [window setContentSize:NSMakeSize(vo_dwidth, vo_dheight)]; |
194 | |
35070
ff4758e8cfba
Change geometry for corevideo vo to not take dock into account.
reimar
parents:
35069
diff
changeset
|
195 // Do not use visibleFrame - taking the menu bar and dock into account |
ff4758e8cfba
Change geometry for corevideo vo to not take dock into account.
reimar
parents:
35069
diff
changeset
|
196 // would be nicer in principle, but currently only results in the window |
ff4758e8cfba
Change geometry for corevideo vo to not take dock into account.
reimar
parents:
35069
diff
changeset
|
197 // being placed strangely off-center since vo_dx/vo_dy calculation is |
ff4758e8cfba
Change geometry for corevideo vo to not take dock into account.
reimar
parents:
35069
diff
changeset
|
198 // not aware of it. |
30001 | 199 // Also flip vo_dy since the screen origin is in the bottom left on OSX. |
35086
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
200 [self update_screen_info]; |
30001 | 201 [window setFrameTopLeftPoint:NSMakePoint( |
35071 | 202 vo_dx, |
203 2*xinerama_y + vo_screenheight - vo_dy)]; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
204 |
35080
a10c7a7a9232
Move some code around to make splitting into vo-specific and generic code easier.
reimar
parents:
35079
diff
changeset
|
205 vo_fs = flags & VOFLAG_FULLSCREEN; |
a10c7a7a9232
Move some code around to make splitting into vo-specific and generic code easier.
reimar
parents:
35079
diff
changeset
|
206 |
35083 | 207 [self rootwin]; |
15726 | 208 |
209 if(vo_fs) | |
35066
e91f5bd3214d
Consistently use "self" instead of a global variable.
reimar
parents:
35065
diff
changeset
|
210 [self fullscreen: NO]; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
211 |
35083 | 212 [self ontop]; |
35081
65f3a403ab3e
Set up things like fullscreen status etc. before showing the window.
reimar
parents:
35080
diff
changeset
|
213 |
35086
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
214 if (!(flags & VOFLAG_HIDDEN)) |
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
215 //show window |
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
216 [window makeKeyAndOrderFront:self]; |
15289 | 217 } |
218 | |
35092 | 219 - (void) drawRect: (NSRect *) bounds |
220 { | |
221 if (vo_osx_redraw_func) vo_osx_redraw_func(); | |
222 } | |
223 | |
35091 | 224 - (void)reshape |
225 { | |
226 NSRect frame = [self frame]; | |
227 vo_dwidth = frame.size.width; | |
228 vo_dheight = frame.size.height; | |
229 event_flags |= VO_EVENT_RESIZE; | |
230 } | |
231 | |
15289 | 232 /* |
15570 | 233 Init Menu |
234 */ | |
235 - (void)initMenu | |
236 { | |
35075
c40203dd82b7
Fix menu on newer OSX versions (at least 10.6) without breaking 10.5.
reimar
parents:
35074
diff
changeset
|
237 NSMenu *mainMenu = [[NSMenu alloc] init]; |
21395 | 238 NSMenu *menu, *aspectMenu; |
15570 | 239 NSMenuItem *menuItem; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
240 |
35075
c40203dd82b7
Fix menu on newer OSX versions (at least 10.6) without breaking 10.5.
reimar
parents:
35074
diff
changeset
|
241 menu = [[NSMenu alloc] init]; |
c40203dd82b7
Fix menu on newer OSX versions (at least 10.6) without breaking 10.5.
reimar
parents:
35074
diff
changeset
|
242 menuItem = [[NSMenuItem alloc] init]; |
c40203dd82b7
Fix menu on newer OSX versions (at least 10.6) without breaking 10.5.
reimar
parents:
35074
diff
changeset
|
243 [menuItem setSubmenu:menu]; |
c40203dd82b7
Fix menu on newer OSX versions (at least 10.6) without breaking 10.5.
reimar
parents:
35074
diff
changeset
|
244 [mainMenu addItem:menuItem]; |
c40203dd82b7
Fix menu on newer OSX versions (at least 10.6) without breaking 10.5.
reimar
parents:
35074
diff
changeset
|
245 // Note: setAppleMenu seems to be unnecessary from 10.6 on, |
c40203dd82b7
Fix menu on newer OSX versions (at least 10.6) without breaking 10.5.
reimar
parents:
35074
diff
changeset
|
246 // but is needed for all earlier versions or the menu is |
c40203dd82b7
Fix menu on newer OSX versions (at least 10.6) without breaking 10.5.
reimar
parents:
35074
diff
changeset
|
247 // messed up. |
c40203dd82b7
Fix menu on newer OSX versions (at least 10.6) without breaking 10.5.
reimar
parents:
35074
diff
changeset
|
248 // Round-about way with performSelector used to avoid compiler |
c40203dd82b7
Fix menu on newer OSX versions (at least 10.6) without breaking 10.5.
reimar
parents:
35074
diff
changeset
|
249 // warnings. |
c40203dd82b7
Fix menu on newer OSX versions (at least 10.6) without breaking 10.5.
reimar
parents:
35074
diff
changeset
|
250 [NSApp performSelector:@selector(setAppleMenu:) withObject:menu]; |
15570 | 251 |
252 //Create Movie Menu | |
253 menu = [[NSMenu alloc] initWithTitle:@"Movie"]; | |
254 menuItem = [[NSMenuItem alloc] initWithTitle:@"Half Size" action:@selector(menuAction:) keyEquivalent:@"0"]; [menu addItem:menuItem]; | |
255 kHalfScreenCmd = menuItem; | |
256 menuItem = [[NSMenuItem alloc] initWithTitle:@"Normal Size" action:@selector(menuAction:) keyEquivalent:@"1"]; [menu addItem:menuItem]; | |
257 kNormalScreenCmd = menuItem; | |
258 menuItem = [[NSMenuItem alloc] initWithTitle:@"Double Size" action:@selector(menuAction:) keyEquivalent:@"2"]; [menu addItem:menuItem]; | |
259 kDoubleScreenCmd = menuItem; | |
260 menuItem = [[NSMenuItem alloc] initWithTitle:@"Full Size" action:@selector(menuAction:) keyEquivalent:@"f"]; [menu addItem:menuItem]; | |
261 kFullScreenCmd = menuItem; | |
31738 | 262 menuItem = [NSMenuItem separatorItem]; [menu addItem:menuItem]; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
263 |
31742 | 264 aspectMenu = [[NSMenu alloc] initWithTitle:@"Aspect Ratio"]; |
265 menuItem = [[NSMenuItem alloc] initWithTitle:@"Keep" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem]; | |
266 if(vo_keepaspect) [menuItem setState:NSOnState]; | |
267 kKeepAspectCmd = menuItem; | |
268 menuItem = [[NSMenuItem alloc] initWithTitle:@"Pan-Scan" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem]; | |
269 if(vo_panscan) [menuItem setState:NSOnState]; | |
270 kPanScanCmd = menuItem; | |
271 menuItem = [NSMenuItem separatorItem]; [aspectMenu addItem:menuItem]; | |
272 menuItem = [[NSMenuItem alloc] initWithTitle:@"Original" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem]; | |
273 kAspectOrgCmd = menuItem; | |
274 menuItem = [[NSMenuItem alloc] initWithTitle:@"4:3" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem]; | |
275 kAspectFullCmd = menuItem; | |
276 menuItem = [[NSMenuItem alloc] initWithTitle:@"16:9" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem]; | |
277 kAspectWideCmd = menuItem; | |
278 menuItem = [[NSMenuItem alloc] initWithTitle:@"Aspect Ratio" action:nil keyEquivalent:@""]; | |
279 [menuItem setSubmenu:aspectMenu]; | |
280 [menu addItem:menuItem]; | |
281 [aspectMenu release]; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
282 |
15570 | 283 //Add to menubar |
284 menuItem = [[NSMenuItem alloc] initWithTitle:@"Movie" action:nil keyEquivalent:@""]; | |
285 [menuItem setSubmenu:menu]; | |
35075
c40203dd82b7
Fix menu on newer OSX versions (at least 10.6) without breaking 10.5.
reimar
parents:
35074
diff
changeset
|
286 [mainMenu addItem:menuItem]; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
287 |
15570 | 288 //Create Window Menu |
289 menu = [[NSMenu alloc] initWithTitle:@"Window"]; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
290 |
15570 | 291 menuItem = [[NSMenuItem alloc] initWithTitle:@"Minimize" action:@selector(performMiniaturize:) keyEquivalent:@"m"]; [menu addItem:menuItem]; |
292 menuItem = [[NSMenuItem alloc] initWithTitle:@"Zoom" action:@selector(performZoom:) keyEquivalent:@""]; [menu addItem:menuItem]; | |
293 | |
294 //Add to menubar | |
295 menuItem = [[NSMenuItem alloc] initWithTitle:@"Window" action:nil keyEquivalent:@""]; | |
296 [menuItem setSubmenu:menu]; | |
35075
c40203dd82b7
Fix menu on newer OSX versions (at least 10.6) without breaking 10.5.
reimar
parents:
35074
diff
changeset
|
297 [mainMenu addItem:menuItem]; |
15570 | 298 [NSApp setWindowsMenu:menu]; |
35075
c40203dd82b7
Fix menu on newer OSX versions (at least 10.6) without breaking 10.5.
reimar
parents:
35074
diff
changeset
|
299 [NSApp setMainMenu:mainMenu]; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
300 |
15570 | 301 [menu release]; |
302 [menuItem release]; | |
303 } | |
304 | |
29604
cd056d688db8
Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents:
29603
diff
changeset
|
305 - (void)set_winSizeMult:(float)mult |
cd056d688db8
Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents:
29603
diff
changeset
|
306 { |
cd056d688db8
Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents:
29603
diff
changeset
|
307 NSRect frame; |
cd056d688db8
Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents:
29603
diff
changeset
|
308 int d_width, d_height; |
cd056d688db8
Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents:
29603
diff
changeset
|
309 aspect(&d_width, &d_height, A_NOZOOM); |
cd056d688db8
Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents:
29603
diff
changeset
|
310 |
35082
6d8be70115a8
Remove local variables that (except for very brief moments before
reimar
parents:
35081
diff
changeset
|
311 if (vo_fs) { |
29604
cd056d688db8
Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents:
29603
diff
changeset
|
312 vo_fs = !vo_fs; |
cd056d688db8
Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents:
29603
diff
changeset
|
313 [self fullscreen:NO]; |
cd056d688db8
Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents:
29603
diff
changeset
|
314 } |
cd056d688db8
Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents:
29603
diff
changeset
|
315 |
cd056d688db8
Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents:
29603
diff
changeset
|
316 winSizeMult = mult; |
cd056d688db8
Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents:
29603
diff
changeset
|
317 frame.size.width = d_width * mult; |
cd056d688db8
Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents:
29603
diff
changeset
|
318 frame.size.height = d_height * mult; |
cd056d688db8
Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents:
29603
diff
changeset
|
319 [window setContentSize: frame.size]; |
cd056d688db8
Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents:
29603
diff
changeset
|
320 [self reshape]; |
cd056d688db8
Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents:
29603
diff
changeset
|
321 } |
cd056d688db8
Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents:
29603
diff
changeset
|
322 |
15570 | 323 /* |
324 Menu Action | |
325 */ | |
326 - (void)menuAction:(id)sender | |
327 { | |
328 if(sender == kHalfScreenCmd) | |
29604
cd056d688db8
Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents:
29603
diff
changeset
|
329 [self set_winSizeMult: 0.5]; |
15570 | 330 if(sender == kNormalScreenCmd) |
29604
cd056d688db8
Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents:
29603
diff
changeset
|
331 [self set_winSizeMult: 1]; |
15570 | 332 if(sender == kDoubleScreenCmd) |
29604
cd056d688db8
Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents:
29603
diff
changeset
|
333 [self set_winSizeMult: 2]; |
15570 | 334 if(sender == kFullScreenCmd) |
335 { | |
31736 | 336 vo_fs = !vo_fs; |
21546
253a1e98bfe3
vo_macosx.m disable window animation when going to fullscreen
nplourde
parents:
21395
diff
changeset
|
337 [self fullscreen:NO]; |
15570 | 338 } |
339 | |
340 if(sender == kKeepAspectCmd) | |
341 { | |
31736 | 342 vo_keepaspect = !vo_keepaspect; |
15570 | 343 if(vo_keepaspect) |
344 [kKeepAspectCmd setState:NSOnState]; | |
345 else | |
346 [kKeepAspectCmd setState:NSOffState]; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
347 |
15909 | 348 [self reshape]; |
15570 | 349 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
350 |
15570 | 351 if(sender == kPanScanCmd) |
352 { | |
31736 | 353 vo_panscan = !vo_panscan; |
15570 | 354 if(vo_panscan) |
355 [kPanScanCmd setState:NSOnState]; | |
356 else | |
357 [kPanScanCmd setState:NSOffState]; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
358 |
35069 | 359 panscan_calc(); |
15570 | 360 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
361 |
15570 | 362 if(sender == kAspectOrgCmd) |
29564
4ae3d2d7946e
Use MPlayer's standard aspect handling functions in corevideo
reimar
parents:
29533
diff
changeset
|
363 change_movie_aspect(-1); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
364 |
15570 | 365 if(sender == kAspectFullCmd) |
29564
4ae3d2d7946e
Use MPlayer's standard aspect handling functions in corevideo
reimar
parents:
29533
diff
changeset
|
366 change_movie_aspect(4.0f/3.0f); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
367 |
15570 | 368 if(sender == kAspectWideCmd) |
29564
4ae3d2d7946e
Use MPlayer's standard aspect handling functions in corevideo
reimar
parents:
29533
diff
changeset
|
369 change_movie_aspect(16.0f/9.0f); |
15570 | 370 } |
371 | |
372 /* | |
15289 | 373 Toggle Fullscreen |
374 */ | |
375 - (void) fullscreen: (BOOL) animate | |
376 { | |
377 static NSRect old_frame; | |
378 static NSRect old_view_frame; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
379 |
15573 | 380 panscan_calc(); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
381 |
15289 | 382 //go fullscreen |
383 if(vo_fs) | |
384 { | |
35082
6d8be70115a8
Remove local variables that (except for very brief moments before
reimar
parents:
35081
diff
changeset
|
385 if(!vo_rootwin) |
15327 | 386 { |
15882 | 387 SetSystemUIMode( kUIModeAllHidden, kUIOptionAutoShowMenuBar); |
18057 | 388 CGDisplayHideCursor(kCGDirectMainDisplay); |
15327 | 389 mouseHide = YES; |
390 } | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
391 |
15289 | 392 old_frame = [window frame]; //save main window size & position |
35086
8848682f4035
Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents:
35085
diff
changeset
|
393 [self update_screen_info]; |
25413 | 394 |
35072 | 395 [window setFrame:NSMakeRect(xinerama_x, xinerama_y, vo_screenwidth, vo_screenheight) display:YES animate:animate]; //zoom-in window with nice useless sfx |
15289 | 396 old_view_frame = [self bounds]; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
397 |
35072 | 398 [self setFrame:NSMakeRect(0, 0, vo_screenwidth, vo_screenheight)]; |
15289 | 399 [self setNeedsDisplay:YES]; |
400 [window setHasShadow:NO]; | |
401 } | |
402 else | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
403 { |
15902
16534910f0fb
fix various window resizing bug with menu option
nplourde
parents:
15882
diff
changeset
|
404 SetSystemUIMode( kUIModeNormal, 0); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
405 |
18057 | 406 CGDisplayShowCursor(kCGDirectMainDisplay); |
15289 | 407 mouseHide = NO; |
408 | |
409 //revert window to previous setting | |
410 [self setFrame:old_view_frame]; | |
411 [self setNeedsDisplay:YES]; | |
16081
72c352edce8f
restore window shadow when quitting fullscreen mode
nplourde
parents:
15909
diff
changeset
|
412 [window setHasShadow:YES]; |
15289 | 413 [window setFrame:old_frame display:YES animate:animate];//zoom-out window with nice useless sfx |
414 } | |
415 } | |
416 | |
417 /* | |
418 Toggle ontop | |
419 */ | |
420 - (void) ontop | |
421 { | |
15320 | 422 if(vo_ontop) |
423 { | |
424 [window setLevel:NSScreenSaverWindowLevel]; | |
425 } | |
426 else | |
427 { | |
428 [window setLevel:NSNormalWindowLevel]; | |
429 } | |
15289 | 430 } |
431 | |
432 /* | |
15327 | 433 Toggle rootwin |
434 */ | |
435 - (void) rootwin | |
436 { | |
437 if(vo_rootwin) | |
438 { | |
439 [window setLevel:CGWindowLevelForKey(kCGDesktopWindowLevelKey)]; | |
440 [window orderBack:self]; | |
441 } | |
442 else | |
443 { | |
444 [window setLevel:NSNormalWindowLevel]; | |
445 } | |
446 } | |
447 | |
448 /* | |
15289 | 449 Check event for new event |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
450 */ |
35091 | 451 - (int) check_events |
15289 | 452 { |
31760
dc95a7191375
Move variable into the only function where it is used.
reimar
parents:
31759
diff
changeset
|
453 NSEvent *event; |
31759
a320b893f660
Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents:
31758
diff
changeset
|
454 int curTime = TickCount()/60; |
a320b893f660
Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents:
31758
diff
changeset
|
455 |
a320b893f660
Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents:
31758
diff
changeset
|
456 //automatically hide mouse cursor (and future on-screen control?) |
35082
6d8be70115a8
Remove local variables that (except for very brief moments before
reimar
parents:
35081
diff
changeset
|
457 if(vo_fs && !mouseHide && !vo_rootwin) |
31759
a320b893f660
Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents:
31758
diff
changeset
|
458 { |
a320b893f660
Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents:
31758
diff
changeset
|
459 if(curTime - lastMouseHide >= 5 || lastMouseHide == 0) |
a320b893f660
Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents:
31758
diff
changeset
|
460 { |
a320b893f660
Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents:
31758
diff
changeset
|
461 CGDisplayHideCursor(kCGDirectMainDisplay); |
a320b893f660
Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents:
31758
diff
changeset
|
462 mouseHide = TRUE; |
a320b893f660
Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents:
31758
diff
changeset
|
463 lastMouseHide = curTime; |
a320b893f660
Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents:
31758
diff
changeset
|
464 } |
a320b893f660
Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents:
31758
diff
changeset
|
465 } |
a320b893f660
Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents:
31758
diff
changeset
|
466 |
a320b893f660
Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents:
31758
diff
changeset
|
467 //update activity every 30 seconds to prevent |
a320b893f660
Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents:
31758
diff
changeset
|
468 //screensaver from starting up. |
a320b893f660
Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents:
31758
diff
changeset
|
469 if(curTime - lastScreensaverUpdate >= 30 || lastScreensaverUpdate == 0) |
a320b893f660
Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents:
31758
diff
changeset
|
470 { |
a320b893f660
Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents:
31758
diff
changeset
|
471 UpdateSystemActivity(UsrActivity); |
a320b893f660
Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents:
31758
diff
changeset
|
472 lastScreensaverUpdate = curTime; |
a320b893f660
Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents:
31758
diff
changeset
|
473 } |
a320b893f660
Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents:
31758
diff
changeset
|
474 |
35091 | 475 event_flags = 0; |
31757
83423e6b288e
Simplify check_events: avoid seemingly pointless untilDate argument.
reimar
parents:
31756
diff
changeset
|
476 event = [NSApp nextEventMatchingMask:NSAnyEventMask untilDate:nil inMode:NSEventTrackingRunLoopMode dequeue:YES]; |
25178 | 477 if (event == nil) |
35091 | 478 return event_flags; |
15289 | 479 [NSApp sendEvent:event]; |
25179
6e8b40d412f0
Fix play window not get actived problem on Leopard.
ulion
parents:
25178
diff
changeset
|
480 // Without SDL's bootstrap code (include SDL.h in mplayer.c), |
28837 | 481 // on Leopard, we have trouble to get the play window automatically focused |
482 // when the app is actived. The Following code fix this problem. | |
27370
14c5017f40d2
Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents:
26755
diff
changeset
|
483 #ifndef CONFIG_SDL |
25179
6e8b40d412f0
Fix play window not get actived problem on Leopard.
ulion
parents:
25178
diff
changeset
|
484 if (isLeopardOrLater && [event type] == NSAppKitDefined |
6e8b40d412f0
Fix play window not get actived problem on Leopard.
ulion
parents:
25178
diff
changeset
|
485 && [event subtype] == NSApplicationActivatedEventType) { |
6e8b40d412f0
Fix play window not get actived problem on Leopard.
ulion
parents:
25178
diff
changeset
|
486 [window makeMainWindow]; |
35066
e91f5bd3214d
Consistently use "self" instead of a global variable.
reimar
parents:
35065
diff
changeset
|
487 [window makeKeyAndOrderFront:self]; |
25179
6e8b40d412f0
Fix play window not get actived problem on Leopard.
ulion
parents:
25178
diff
changeset
|
488 } |
6e8b40d412f0
Fix play window not get actived problem on Leopard.
ulion
parents:
25178
diff
changeset
|
489 #endif |
35091 | 490 return event_flags; |
15289 | 491 } |
492 | |
493 /* | |
15731 | 494 From NSView, respond to key equivalents. |
495 */ | |
496 - (BOOL)performKeyEquivalent:(NSEvent *)theEvent | |
497 { | |
498 switch([theEvent keyCode]) | |
31742 | 499 { |
15731 | 500 case 0x21: [window setAlphaValue: winAlpha-=0.05]; return YES; |
501 case 0x1e: [window setAlphaValue: winAlpha+=0.05]; return YES; | |
31742 | 502 } |
15731 | 503 return NO; |
504 } | |
505 | |
506 /* | |
15289 | 507 Process key event |
508 */ | |
509 - (void) keyDown: (NSEvent *) theEvent | |
510 { | |
29533
9c8f8e375823
Reuse the osx_common convert_key function to convert OSX keycodes to MPlayer
reimar
parents:
29272
diff
changeset
|
511 int key = convert_key([theEvent keyCode], *[[theEvent characters] UTF8String]); |
9c8f8e375823
Reuse the osx_common convert_key function to convert OSX keycodes to MPlayer
reimar
parents:
29272
diff
changeset
|
512 if (key != -1) |
15289 | 513 mplayer_put_key(key); |
514 } | |
515 | |
516 /* | |
517 Process mouse button event | |
518 */ | |
519 - (void) mouseMoved: (NSEvent *) theEvent | |
520 { | |
35082
6d8be70115a8
Remove local variables that (except for very brief moments before
reimar
parents:
35081
diff
changeset
|
521 if(vo_fs && !vo_rootwin) |
15289 | 522 { |
18057 | 523 CGDisplayShowCursor(kCGDirectMainDisplay); |
15289 | 524 mouseHide = NO; |
525 } | |
35082
6d8be70115a8
Remove local variables that (except for very brief moments before
reimar
parents:
35081
diff
changeset
|
526 if (enable_mouse_movements && !vo_rootwin) { |
25446 | 527 NSPoint p =[self convertPoint:[theEvent locationInWindow] fromView:nil]; |
35079 | 528 if ([self mouse:p inRect:[self frame]]) { |
529 vo_mouse_movement(p.x, [self frame].size.height - p.y); | |
25446 | 530 } |
531 } | |
15289 | 532 } |
533 | |
534 - (void) mouseDown: (NSEvent *) theEvent | |
535 { | |
536 [self mouseEvent: theEvent]; | |
537 } | |
538 | |
24077
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
539 - (void) mouseUp: (NSEvent *) theEvent |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
540 { |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
541 [self mouseEvent: theEvent]; |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
542 } |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
543 |
15289 | 544 - (void) rightMouseDown: (NSEvent *) theEvent |
545 { | |
546 [self mouseEvent: theEvent]; | |
547 } | |
548 | |
24077
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
549 - (void) rightMouseUp: (NSEvent *) theEvent |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
550 { |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
551 [self mouseEvent: theEvent]; |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
552 } |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
553 |
15289 | 554 - (void) otherMouseDown: (NSEvent *) theEvent |
555 { | |
556 [self mouseEvent: theEvent]; | |
557 } | |
558 | |
24077
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
559 - (void) otherMouseUp: (NSEvent *) theEvent |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
560 { |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
561 [self mouseEvent: theEvent]; |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
562 } |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
563 |
15289 | 564 - (void) scrollWheel: (NSEvent *) theEvent |
565 { | |
566 if([theEvent deltaY] > 0) | |
567 mplayer_put_key(MOUSE_BTN3); | |
568 else | |
569 mplayer_put_key(MOUSE_BTN4); | |
570 } | |
571 | |
572 - (void) mouseEvent: (NSEvent *) theEvent | |
573 { | |
24077
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
574 if ( [theEvent buttonNumber] >= 0 && [theEvent buttonNumber] <= 9 ) |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
575 { |
25422 | 576 int buttonNumber = [theEvent buttonNumber]; |
577 // Fix to mplayer defined button order: left, middle, right | |
578 if (buttonNumber == 1) | |
579 buttonNumber = 2; | |
25423 | 580 else if (buttonNumber == 2) |
581 buttonNumber = 1; | |
24077
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
582 switch([theEvent type]) |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
583 { |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
584 case NSLeftMouseDown: |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
585 case NSRightMouseDown: |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
586 case NSOtherMouseDown: |
25422 | 587 mplayer_put_key((MOUSE_BTN0 + buttonNumber) | MP_KEY_DOWN); |
24077
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
588 break; |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
589 case NSLeftMouseUp: |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
590 case NSRightMouseUp: |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
591 case NSOtherMouseUp: |
25422 | 592 mplayer_put_key(MOUSE_BTN0 + buttonNumber); |
24077
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
593 break; |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
594 } |
15289 | 595 } |
596 } | |
597 | |
598 /* | |
599 NSResponder | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
29210
diff
changeset
|
600 */ |
15289 | 601 - (BOOL) acceptsFirstResponder |
602 { | |
603 return YES; | |
604 } | |
605 | |
606 - (BOOL) becomeFirstResponder | |
607 { | |
608 return YES; | |
609 } | |
610 | |
611 - (BOOL) resignFirstResponder | |
612 { | |
613 return YES; | |
614 } | |
15325 | 615 |
31756
8e043273075d
Change window-closing handling so it works properly if the
reimar
parents:
31745
diff
changeset
|
616 - (BOOL)windowShouldClose:(id)sender |
15325 | 617 { |
31735
3bb00f5abe8e
Send KEY_CLOSE_WIN instead of KEY_ESC when the user requested
reimar
parents:
31049
diff
changeset
|
618 mplayer_put_key(KEY_CLOSE_WIN); |
31756
8e043273075d
Change window-closing handling so it works properly if the
reimar
parents:
31745
diff
changeset
|
619 // We have to wait for MPlayer to handle this, |
8e043273075d
Change window-closing handling so it works properly if the
reimar
parents:
31745
diff
changeset
|
620 // otherwise we are in trouble if the |
8e043273075d
Change window-closing handling so it works properly if the
reimar
parents:
31745
diff
changeset
|
621 // KEY_CLOSE_WIN handler is disabled |
8e043273075d
Change window-closing handling so it works properly if the
reimar
parents:
31745
diff
changeset
|
622 return NO; |
15325 | 623 } |
31758 | 624 |
625 - (void)handleQuitEvent:(NSAppleEventDescriptor*)e withReplyEvent:(NSAppleEventDescriptor*)r | |
626 { | |
627 mplayer_put_key(KEY_CLOSE_WIN); | |
628 } | |
15325 | 629 @end |