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