Mercurial > mplayer.hg
annotate libvo/vo_macosx.m @ 28481:b78c8cb3959b
partial sync with obsolete section removal
author | diego |
---|---|
date | Tue, 10 Feb 2009 00:23:50 +0000 |
parents | 7681eab10aea |
children | 93652f17d567 |
rev | line source |
---|---|
28446
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28306
diff
changeset
|
1 /* |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28306
diff
changeset
|
2 * This file is part of MPlayer. |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28306
diff
changeset
|
3 * |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28306
diff
changeset
|
4 * MPlayer is free software; you can redistribute it and/or modify |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28306
diff
changeset
|
5 * 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
|
6 * the Free Software Foundation; either version 2 of the License, or |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28306
diff
changeset
|
7 * (at your option) any later version. |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28306
diff
changeset
|
8 * |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28306
diff
changeset
|
9 * MPlayer is distributed in the hope that it will be useful, |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28306
diff
changeset
|
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28306
diff
changeset
|
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28306
diff
changeset
|
12 * GNU General Public License for more details. |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28306
diff
changeset
|
13 * |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28306
diff
changeset
|
14 * 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
|
15 * with MPlayer; if not, write to the Free Software Foundation, Inc., |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28306
diff
changeset
|
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28306
diff
changeset
|
17 */ |
7681eab10aea
Add standard license headers, unify header formatting.
diego
parents:
28306
diff
changeset
|
18 |
15289 | 19 /* |
20 vo_macosx.m | |
21 by Nicolas Plourde <nicolasplourde@gmail.com> | |
22 | |
23 MPlayer Mac OSX video out module. | |
24 Copyright (c) Nicolas Plourde - 2005 | |
25 */ | |
26 | |
27 #import "vo_macosx.h" | |
16385 | 28 #include <sys/types.h> |
29 #include <sys/ipc.h> | |
28016
3b8e66828e10
use mmap instead of shmat for MPlayerOSX, patch by Adrian Stutz<adrian@sttz.ch>
nplourde
parents:
28010
diff
changeset
|
30 #include <sys/mman.h> |
28077 | 31 #include <unistd.h> |
27988 | 32 #include <CoreServices/CoreServices.h> |
33 //special workaround for Apple bug #6267445 | |
34 //(OSServices Power API disabled in OSServices.h for 64bit systems) | |
35 #ifndef __POWER__ | |
36 #include <CoreServices/../Frameworks/OSServices.framework/Headers/Power.h> | |
37 #endif | |
15289 | 38 |
39 //MPLAYER | |
40 #include "config.h" | |
41 #include "fastmemcpy.h" | |
42 #include "video_out.h" | |
43 #include "video_out_internal.h" | |
44 #include "aspect.h" | |
45 #include "mp_msg.h" | |
46 #include "m_option.h" | |
28075
ca9badc94740
#include appropriate headers instead of locally declaring function prototypes.
diego
parents:
28051
diff
changeset
|
47 #include "mp_fifo.h" |
ca9badc94740
#include appropriate headers instead of locally declaring function prototypes.
diego
parents:
28051
diff
changeset
|
48 #include "libvo/sub.h" |
28130
b5898cb411da
Replace vo_macosx's custom options parsing with a subopt_parse()-based one
gpoirier
parents:
28077
diff
changeset
|
49 #include "subopt-helper.h" |
15289 | 50 |
51 #include "input/input.h" | |
52 #include "input/mouse.h" | |
53 | |
54 #include "osdep/keycodes.h" | |
55 | |
56 //Cocoa | |
25157
cf3b6015735d
Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents:
25137
diff
changeset
|
57 NSDistantObject *mplayerosxProxy; |
cf3b6015735d
Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents:
25137
diff
changeset
|
58 id <MPlayerOSXVOProto> mplayerosxProto; |
15611 | 59 MPlayerOpenGLView *mpGLView; |
15289 | 60 NSAutoreleasePool *autoreleasepool; |
61 OSType pixelFormat; | |
62 | |
16385 | 63 //shared memory |
28016
3b8e66828e10
use mmap instead of shmat for MPlayerOSX, patch by Adrian Stutz<adrian@sttz.ch>
nplourde
parents:
28010
diff
changeset
|
64 int shm_fd; |
16385 | 65 BOOL shared_buffer = false; |
28180
781ef511a767
Add an option to vo_macosx to set a custom buffer_name.
gpoirier
parents:
28130
diff
changeset
|
66 #define DEFAULT_BUFFER_NAME "mplayerosx" |
781ef511a767
Add an option to vo_macosx to set a custom buffer_name.
gpoirier
parents:
28130
diff
changeset
|
67 static char *buffer_name; |
16385 | 68 |
15728 | 69 //Screen |
28306 | 70 int screen_id = -1; |
15728 | 71 NSRect screen_frame; |
72 NSScreen *screen_handle; | |
73 NSArray *screen_array; | |
15289 | 74 |
75 //image | |
76 unsigned char *image_data; | |
25180 | 77 // For double buffering |
78 static uint8_t image_page = 0; | |
79 static unsigned char *image_datas[2]; | |
80 | |
15289 | 81 static uint32_t image_width; |
82 static uint32_t image_height; | |
83 static uint32_t image_depth; | |
84 static uint32_t image_bytes; | |
85 static uint32_t image_format; | |
86 | |
87 //vo | |
88 static int isFullscreen; | |
15320 | 89 static int isOntop; |
15327 | 90 static int isRootwin; |
15289 | 91 extern float monitor_aspect; |
92 extern float movie_aspect; | |
93 static float old_movie_aspect; | |
25446 | 94 extern int enable_mouse_movements; |
15289 | 95 |
15731 | 96 static float winAlpha = 1; |
15289 | 97 static int int_pause = 0; |
98 | |
25179
6e8b40d412f0
Fix play window not get actived problem on Leopard.
ulion
parents:
25178
diff
changeset
|
99 static BOOL isLeopardOrLater; |
6e8b40d412f0
Fix play window not get actived problem on Leopard.
ulion
parents:
25178
diff
changeset
|
100 |
15289 | 101 static vo_info_t info = |
102 { | |
103 "Mac OSX Core Video", | |
104 "macosx", | |
105 "Nicolas Plourde <nicolas.plourde@gmail.com>", | |
106 "" | |
107 }; | |
108 | |
109 LIBVO_EXTERN(macosx) | |
110 | |
111 static void draw_alpha(int x0, int y0, int w, int h, unsigned char *src, unsigned char *srca, int stride) | |
112 { | |
113 switch (image_format) | |
114 { | |
115 case IMGFMT_RGB32: | |
116 vo_draw_alpha_rgb32(w,h,src,srca,stride,image_data+4*(y0*image_width+x0),4*image_width); | |
117 break; | |
118 case IMGFMT_YUY2: | |
119 vo_draw_alpha_yuy2(w,h,src,srca,stride,image_data + (x0 + y0 * image_width) * 2,image_width*2); | |
120 break; | |
121 } | |
122 } | |
123 | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
16145
diff
changeset
|
124 static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format) |
15289 | 125 { |
16385 | 126 |
15728 | 127 //init screen |
128 screen_array = [NSScreen screens]; | |
129 if(screen_id < [screen_array count]) | |
15289 | 130 { |
28306 | 131 screen_handle = [screen_array objectAtIndex:(screen_id < 0 ? 0 : screen_id)]; |
15289 | 132 } |
15728 | 133 else |
134 { | |
135 mp_msg(MSGT_VO, MSGL_FATAL, "Get device error: Device ID %d do not exist, falling back to main device.\n", screen_id); | |
136 screen_handle = [screen_array objectAtIndex:0]; | |
28306 | 137 screen_id = -1; |
15728 | 138 } |
139 screen_frame = [screen_handle frame]; | |
25414
5c03a9bdf220
Record screen size and display size in vo_ variables.
ulion
parents:
25413
diff
changeset
|
140 vo_screenwidth = screen_frame.size.width; |
5c03a9bdf220
Record screen size and display size in vo_ variables.
ulion
parents:
25413
diff
changeset
|
141 vo_screenheight = screen_frame.size.height; |
16385 | 142 |
15289 | 143 //misc mplayer setup |
144 image_width = width; | |
145 image_height = height; | |
146 switch (image_format) | |
147 { | |
148 case IMGFMT_BGR32: | |
149 case IMGFMT_RGB32: | |
150 image_depth = 32; | |
151 break; | |
16385 | 152 case IMGFMT_YUY2: |
15289 | 153 image_depth = 16; |
154 break; | |
155 } | |
156 image_bytes = (image_depth + 7) / 8; | |
16385 | 157 |
158 if(!shared_buffer) | |
159 { | |
25120
9b4ca4dc1294
Fix a memory leak when working in shared_buffer mode.
ulion
parents:
25114
diff
changeset
|
160 image_data = malloc(image_width*image_height*image_bytes); |
25180 | 161 image_datas[0] = image_data; |
162 if (vo_doublebuffering) | |
163 image_datas[1] = malloc(image_width*image_height*image_bytes); | |
164 image_page = 0; | |
25120
9b4ca4dc1294
Fix a memory leak when working in shared_buffer mode.
ulion
parents:
25114
diff
changeset
|
165 |
16385 | 166 monitor_aspect = (float)screen_frame.size.width/(float)screen_frame.size.height; |
167 | |
168 //set aspect | |
169 panscan_init(); | |
170 aspect_save_orig(width,height); | |
171 aspect_save_prescale(d_width,d_height); | |
172 aspect_save_screenres(screen_frame.size.width, screen_frame.size.height); | |
173 aspect((int *)&d_width,(int *)&d_height,A_NOZOOM); | |
174 | |
175 movie_aspect = (float)d_width/(float)d_height; | |
176 old_movie_aspect = movie_aspect; | |
15726 | 177 |
16385 | 178 vo_fs = flags & VOFLAG_FULLSCREEN; |
179 | |
180 //config OpenGL View | |
181 [mpGLView config]; | |
182 [mpGLView reshape]; | |
183 } | |
184 else | |
185 { | |
28180
781ef511a767
Add an option to vo_macosx to set a custom buffer_name.
gpoirier
parents:
28130
diff
changeset
|
186 mp_msg(MSGT_VO, MSGL_INFO, "VO: [macosx] writing output to a shared buffer " |
781ef511a767
Add an option to vo_macosx to set a custom buffer_name.
gpoirier
parents:
28130
diff
changeset
|
187 "named \"%s\".\n",buffer_name); |
781ef511a767
Add an option to vo_macosx to set a custom buffer_name.
gpoirier
parents:
28130
diff
changeset
|
188 |
16385 | 189 movie_aspect = (float)d_width/(float)d_height; |
28016
3b8e66828e10
use mmap instead of shmat for MPlayerOSX, patch by Adrian Stutz<adrian@sttz.ch>
nplourde
parents:
28010
diff
changeset
|
190 |
3b8e66828e10
use mmap instead of shmat for MPlayerOSX, patch by Adrian Stutz<adrian@sttz.ch>
nplourde
parents:
28010
diff
changeset
|
191 // create shared memory |
28180
781ef511a767
Add an option to vo_macosx to set a custom buffer_name.
gpoirier
parents:
28130
diff
changeset
|
192 shm_fd = shm_open(buffer_name, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR); |
28016
3b8e66828e10
use mmap instead of shmat for MPlayerOSX, patch by Adrian Stutz<adrian@sttz.ch>
nplourde
parents:
28010
diff
changeset
|
193 if (shm_fd == -1) |
16385 | 194 { |
28016
3b8e66828e10
use mmap instead of shmat for MPlayerOSX, patch by Adrian Stutz<adrian@sttz.ch>
nplourde
parents:
28010
diff
changeset
|
195 mp_msg(MSGT_VO, MSGL_FATAL, |
3b8e66828e10
use mmap instead of shmat for MPlayerOSX, patch by Adrian Stutz<adrian@sttz.ch>
nplourde
parents:
28010
diff
changeset
|
196 "vo_macosx: failed to open shared memory. Error: %s\n", strerror(errno)); |
16385 | 197 return 1; |
198 } | |
199 | |
28016
3b8e66828e10
use mmap instead of shmat for MPlayerOSX, patch by Adrian Stutz<adrian@sttz.ch>
nplourde
parents:
28010
diff
changeset
|
200 |
3b8e66828e10
use mmap instead of shmat for MPlayerOSX, patch by Adrian Stutz<adrian@sttz.ch>
nplourde
parents:
28010
diff
changeset
|
201 if (ftruncate(shm_fd, image_width*image_height*image_bytes) == -1) |
3b8e66828e10
use mmap instead of shmat for MPlayerOSX, patch by Adrian Stutz<adrian@sttz.ch>
nplourde
parents:
28010
diff
changeset
|
202 { |
3b8e66828e10
use mmap instead of shmat for MPlayerOSX, patch by Adrian Stutz<adrian@sttz.ch>
nplourde
parents:
28010
diff
changeset
|
203 mp_msg(MSGT_VO, MSGL_FATAL, |
3b8e66828e10
use mmap instead of shmat for MPlayerOSX, patch by Adrian Stutz<adrian@sttz.ch>
nplourde
parents:
28010
diff
changeset
|
204 "vo_macosx: failed to size shared memory, possibly already in use. Error: %s\n", strerror(errno)); |
28180
781ef511a767
Add an option to vo_macosx to set a custom buffer_name.
gpoirier
parents:
28130
diff
changeset
|
205 shm_unlink(buffer_name); |
16385 | 206 return 1; |
207 } | |
208 | |
28016
3b8e66828e10
use mmap instead of shmat for MPlayerOSX, patch by Adrian Stutz<adrian@sttz.ch>
nplourde
parents:
28010
diff
changeset
|
209 image_data = mmap(NULL, image_width*image_height*image_bytes, |
3b8e66828e10
use mmap instead of shmat for MPlayerOSX, patch by Adrian Stutz<adrian@sttz.ch>
nplourde
parents:
28010
diff
changeset
|
210 PROT_READ | PROT_WRITE, MAP_SHARED, shm_fd, 0); |
3b8e66828e10
use mmap instead of shmat for MPlayerOSX, patch by Adrian Stutz<adrian@sttz.ch>
nplourde
parents:
28010
diff
changeset
|
211 |
3b8e66828e10
use mmap instead of shmat for MPlayerOSX, patch by Adrian Stutz<adrian@sttz.ch>
nplourde
parents:
28010
diff
changeset
|
212 if (image_data == MAP_FAILED) |
3b8e66828e10
use mmap instead of shmat for MPlayerOSX, patch by Adrian Stutz<adrian@sttz.ch>
nplourde
parents:
28010
diff
changeset
|
213 { |
3b8e66828e10
use mmap instead of shmat for MPlayerOSX, patch by Adrian Stutz<adrian@sttz.ch>
nplourde
parents:
28010
diff
changeset
|
214 mp_msg(MSGT_VO, MSGL_FATAL, |
3b8e66828e10
use mmap instead of shmat for MPlayerOSX, patch by Adrian Stutz<adrian@sttz.ch>
nplourde
parents:
28010
diff
changeset
|
215 "vo_macosx: failed to map shared memory. Error: %s\n", strerror(errno)); |
28180
781ef511a767
Add an option to vo_macosx to set a custom buffer_name.
gpoirier
parents:
28130
diff
changeset
|
216 shm_unlink(buffer_name); |
28016
3b8e66828e10
use mmap instead of shmat for MPlayerOSX, patch by Adrian Stutz<adrian@sttz.ch>
nplourde
parents:
28010
diff
changeset
|
217 return 1; |
3b8e66828e10
use mmap instead of shmat for MPlayerOSX, patch by Adrian Stutz<adrian@sttz.ch>
nplourde
parents:
28010
diff
changeset
|
218 } |
3b8e66828e10
use mmap instead of shmat for MPlayerOSX, patch by Adrian Stutz<adrian@sttz.ch>
nplourde
parents:
28010
diff
changeset
|
219 |
16385 | 220 //connnect to mplayerosx |
28180
781ef511a767
Add an option to vo_macosx to set a custom buffer_name.
gpoirier
parents:
28130
diff
changeset
|
221 mplayerosxProxy=[NSConnection rootProxyForConnectionWithRegisteredName:[NSString stringWithCString:buffer_name] host:nil]; |
25157
cf3b6015735d
Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents:
25137
diff
changeset
|
222 if ([mplayerosxProxy conformsToProtocol:@protocol(MPlayerOSXVOProto)]) { |
cf3b6015735d
Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents:
25137
diff
changeset
|
223 [mplayerosxProxy setProtocolForProxy:@protocol(MPlayerOSXVOProto)]; |
cf3b6015735d
Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents:
25137
diff
changeset
|
224 mplayerosxProto = (id <MPlayerOSXVOProto>)mplayerosxProxy; |
cf3b6015735d
Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents:
25137
diff
changeset
|
225 [mplayerosxProto startWithWidth: image_width withHeight: image_height withBytes: image_bytes withAspect:(int)(movie_aspect*100)]; |
cf3b6015735d
Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents:
25137
diff
changeset
|
226 } |
cf3b6015735d
Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents:
25137
diff
changeset
|
227 else { |
cf3b6015735d
Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents:
25137
diff
changeset
|
228 [mplayerosxProxy release]; |
cf3b6015735d
Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents:
25137
diff
changeset
|
229 mplayerosxProxy = nil; |
cf3b6015735d
Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents:
25137
diff
changeset
|
230 mplayerosxProto = nil; |
cf3b6015735d
Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents:
25137
diff
changeset
|
231 } |
16385 | 232 } |
15289 | 233 return 0; |
234 } | |
235 | |
236 static void check_events(void) | |
237 { | |
15611 | 238 [mpGLView check_events]; |
15289 | 239 } |
240 | |
241 static void draw_osd(void) | |
242 { | |
243 vo_draw_text(image_width, image_height, draw_alpha); | |
244 } | |
245 | |
246 static void flip_page(void) | |
247 { | |
16385 | 248 if(shared_buffer) |
25157
cf3b6015735d
Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents:
25137
diff
changeset
|
249 [mplayerosxProto render]; |
25114
bed4188998ca
Move the setCurrentTexture call into flip_page(), fix osd flicker problem.
ulion
parents:
25078
diff
changeset
|
250 else { |
bed4188998ca
Move the setCurrentTexture call into flip_page(), fix osd flicker problem.
ulion
parents:
25078
diff
changeset
|
251 [mpGLView setCurrentTexture]; |
16385 | 252 [mpGLView render]; |
25180 | 253 if (vo_doublebuffering) { |
254 image_page = 1 - image_page; | |
255 image_data = image_datas[image_page]; | |
256 } | |
25114
bed4188998ca
Move the setCurrentTexture call into flip_page(), fix osd flicker problem.
ulion
parents:
25078
diff
changeset
|
257 } |
15289 | 258 } |
259 | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
16145
diff
changeset
|
260 static int draw_slice(uint8_t *src[], int stride[], int w,int h,int x,int y) |
15289 | 261 { |
262 return 0; | |
263 } | |
264 | |
265 | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
16145
diff
changeset
|
266 static int draw_frame(uint8_t *src[]) |
15289 | 267 { |
268 switch (image_format) | |
269 { | |
270 case IMGFMT_BGR32: | |
271 case IMGFMT_RGB32: | |
23457
a124f3abc1ec
Replace implicit use of fast_memcpy via macro by explicit use to allow
reimar
parents:
23381
diff
changeset
|
272 fast_memcpy(image_data, src[0], image_width*image_height*image_bytes); |
15289 | 273 break; |
274 | |
275 case IMGFMT_YUY2: | |
276 memcpy_pic(image_data, src[0], image_width * 2, image_height, image_width * 2, image_width * 2); | |
277 break; | |
278 } | |
16385 | 279 |
15289 | 280 return 0; |
281 } | |
282 | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
16145
diff
changeset
|
283 static int query_format(uint32_t format) |
15289 | 284 { |
285 image_format = format; | |
286 | |
287 switch(format) | |
288 { | |
289 case IMGFMT_YUY2: | |
290 pixelFormat = kYUVSPixelFormat; | |
291 return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_OSD | VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN; | |
292 | |
293 case IMGFMT_RGB32: | |
294 case IMGFMT_BGR32: | |
295 pixelFormat = k32ARGBPixelFormat; | |
296 return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_OSD | VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN; | |
297 } | |
298 return 0; | |
299 } | |
300 | |
301 static void uninit(void) | |
302 { | |
16385 | 303 if(shared_buffer) |
304 { | |
25157
cf3b6015735d
Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents:
25137
diff
changeset
|
305 [mplayerosxProto stop]; |
cf3b6015735d
Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents:
25137
diff
changeset
|
306 mplayerosxProto = nil; |
cf3b6015735d
Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents:
25137
diff
changeset
|
307 [mplayerosxProxy release]; |
cf3b6015735d
Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents:
25137
diff
changeset
|
308 mplayerosxProxy = nil; |
28016
3b8e66828e10
use mmap instead of shmat for MPlayerOSX, patch by Adrian Stutz<adrian@sttz.ch>
nplourde
parents:
28010
diff
changeset
|
309 |
3b8e66828e10
use mmap instead of shmat for MPlayerOSX, patch by Adrian Stutz<adrian@sttz.ch>
nplourde
parents:
28010
diff
changeset
|
310 if (munmap(image_data, image_width*image_height*image_bytes) == -1) |
3b8e66828e10
use mmap instead of shmat for MPlayerOSX, patch by Adrian Stutz<adrian@sttz.ch>
nplourde
parents:
28010
diff
changeset
|
311 mp_msg(MSGT_VO, MSGL_FATAL, "uninit: munmap failed. Error: %s\n", strerror(errno)); |
3b8e66828e10
use mmap instead of shmat for MPlayerOSX, patch by Adrian Stutz<adrian@sttz.ch>
nplourde
parents:
28010
diff
changeset
|
312 |
28180
781ef511a767
Add an option to vo_macosx to set a custom buffer_name.
gpoirier
parents:
28130
diff
changeset
|
313 if (shm_unlink(buffer_name) == -1) |
28016
3b8e66828e10
use mmap instead of shmat for MPlayerOSX, patch by Adrian Stutz<adrian@sttz.ch>
nplourde
parents:
28010
diff
changeset
|
314 mp_msg(MSGT_VO, MSGL_FATAL, "uninit: shm_unlink failed. Error: %s\n", strerror(errno)); |
3b8e66828e10
use mmap instead of shmat for MPlayerOSX, patch by Adrian Stutz<adrian@sttz.ch>
nplourde
parents:
28010
diff
changeset
|
315 |
16385 | 316 } |
317 | |
21551 | 318 SetSystemUIMode( kUIModeNormal, 0); |
319 CGDisplayShowCursor(kCGDirectMainDisplay); | |
320 | |
321 if(mpGLView) | |
322 { | |
25136 | 323 NSAutoreleasePool *finalPool; |
24742
0bef706332b5
Fix deallocate bug which sometimes causes a crash when reinitializing.
nplourde
parents:
24698
diff
changeset
|
324 mpGLView = nil; |
21551 | 325 [autoreleasepool release]; |
25136 | 326 finalPool = [[NSAutoreleasePool alloc] init]; |
25078
3efbdaab822f
Let NSApp handle events when uninit to fix the delay dealloc bug of mpGLView.
ulion
parents:
24965
diff
changeset
|
327 [NSApp nextEventMatchingMask:NSAnyEventMask untilDate:nil inMode:NSDefaultRunLoopMode dequeue:YES]; |
3efbdaab822f
Let NSApp handle events when uninit to fix the delay dealloc bug of mpGLView.
ulion
parents:
24965
diff
changeset
|
328 [finalPool release]; |
21551 | 329 } |
25121 | 330 if (!shared_buffer) |
331 { | |
25180 | 332 free(image_datas[0]); |
333 if (vo_doublebuffering) | |
334 free(image_datas[1]); | |
335 image_datas[0] = NULL; | |
336 image_datas[1] = NULL; | |
25121 | 337 image_data = NULL; |
338 } | |
28180
781ef511a767
Add an option to vo_macosx to set a custom buffer_name.
gpoirier
parents:
28130
diff
changeset
|
339 |
781ef511a767
Add an option to vo_macosx to set a custom buffer_name.
gpoirier
parents:
28130
diff
changeset
|
340 if (buffer_name) free(buffer_name); |
781ef511a767
Add an option to vo_macosx to set a custom buffer_name.
gpoirier
parents:
28130
diff
changeset
|
341 buffer_name = NULL; |
15289 | 342 } |
343 | |
28130
b5898cb411da
Replace vo_macosx's custom options parsing with a subopt_parse()-based one
gpoirier
parents:
28077
diff
changeset
|
344 static opt_t subopts[] = { |
28306 | 345 {"device_id", OPT_ARG_INT, &screen_id, NULL}, |
28130
b5898cb411da
Replace vo_macosx's custom options parsing with a subopt_parse()-based one
gpoirier
parents:
28077
diff
changeset
|
346 {"shared_buffer", OPT_ARG_BOOL, &shared_buffer, NULL}, |
28180
781ef511a767
Add an option to vo_macosx to set a custom buffer_name.
gpoirier
parents:
28130
diff
changeset
|
347 {"buffer_name", OPT_ARG_MSTRZ,&buffer_name, NULL}, |
28130
b5898cb411da
Replace vo_macosx's custom options parsing with a subopt_parse()-based one
gpoirier
parents:
28077
diff
changeset
|
348 {NULL} |
b5898cb411da
Replace vo_macosx's custom options parsing with a subopt_parse()-based one
gpoirier
parents:
28077
diff
changeset
|
349 }; |
b5898cb411da
Replace vo_macosx's custom options parsing with a subopt_parse()-based one
gpoirier
parents:
28077
diff
changeset
|
350 |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
16145
diff
changeset
|
351 static int preinit(const char *arg) |
15289 | 352 { |
28130
b5898cb411da
Replace vo_macosx's custom options parsing with a subopt_parse()-based one
gpoirier
parents:
28077
diff
changeset
|
353 |
b5898cb411da
Replace vo_macosx's custom options parsing with a subopt_parse()-based one
gpoirier
parents:
28077
diff
changeset
|
354 // set defaults |
28306 | 355 screen_id = -1; |
28130
b5898cb411da
Replace vo_macosx's custom options parsing with a subopt_parse()-based one
gpoirier
parents:
28077
diff
changeset
|
356 shared_buffer = false; |
28204 | 357 buffer_name = NULL; |
28130
b5898cb411da
Replace vo_macosx's custom options parsing with a subopt_parse()-based one
gpoirier
parents:
28077
diff
changeset
|
358 |
b5898cb411da
Replace vo_macosx's custom options parsing with a subopt_parse()-based one
gpoirier
parents:
28077
diff
changeset
|
359 if (subopt_parse(arg, subopts) != 0) { |
b5898cb411da
Replace vo_macosx's custom options parsing with a subopt_parse()-based one
gpoirier
parents:
28077
diff
changeset
|
360 mp_msg(MSGT_VO, MSGL_FATAL, |
b5898cb411da
Replace vo_macosx's custom options parsing with a subopt_parse()-based one
gpoirier
parents:
28077
diff
changeset
|
361 "\n-vo macosx command line help:\n" |
28180
781ef511a767
Add an option to vo_macosx to set a custom buffer_name.
gpoirier
parents:
28130
diff
changeset
|
362 "Example: mplayer -vo macosx:device_id=1:shared_buffer:buffer_name=mybuff\n" |
28130
b5898cb411da
Replace vo_macosx's custom options parsing with a subopt_parse()-based one
gpoirier
parents:
28077
diff
changeset
|
363 "\nOptions:\n" |
b5898cb411da
Replace vo_macosx's custom options parsing with a subopt_parse()-based one
gpoirier
parents:
28077
diff
changeset
|
364 " device_id=<0-...>\n" |
b5898cb411da
Replace vo_macosx's custom options parsing with a subopt_parse()-based one
gpoirier
parents:
28077
diff
changeset
|
365 " Set screen device id for fullscreen.\n" |
b5898cb411da
Replace vo_macosx's custom options parsing with a subopt_parse()-based one
gpoirier
parents:
28077
diff
changeset
|
366 " shared_buffer\n" |
b5898cb411da
Replace vo_macosx's custom options parsing with a subopt_parse()-based one
gpoirier
parents:
28077
diff
changeset
|
367 " Write output to a shared memory buffer instead of displaying it.\n" |
28180
781ef511a767
Add an option to vo_macosx to set a custom buffer_name.
gpoirier
parents:
28130
diff
changeset
|
368 " buffer_name=<name>\n" |
781ef511a767
Add an option to vo_macosx to set a custom buffer_name.
gpoirier
parents:
28130
diff
changeset
|
369 " Name of the shared buffer created with shm_open() as well as\n" |
781ef511a767
Add an option to vo_macosx to set a custom buffer_name.
gpoirier
parents:
28130
diff
changeset
|
370 " the name of the NSConnection MPlayer will try to open.\n" |
781ef511a767
Add an option to vo_macosx to set a custom buffer_name.
gpoirier
parents:
28130
diff
changeset
|
371 " Setting buffer_name implicitly enables shared_buffer.\n" |
28130
b5898cb411da
Replace vo_macosx's custom options parsing with a subopt_parse()-based one
gpoirier
parents:
28077
diff
changeset
|
372 "\n" ); |
b5898cb411da
Replace vo_macosx's custom options parsing with a subopt_parse()-based one
gpoirier
parents:
28077
diff
changeset
|
373 return -1; |
b5898cb411da
Replace vo_macosx's custom options parsing with a subopt_parse()-based one
gpoirier
parents:
28077
diff
changeset
|
374 } |
15728 | 375 |
15737
0c3939433cef
set nsapp and setup cocoa with NSApplicationLoad
nplourde
parents:
15736
diff
changeset
|
376 NSApplicationLoad(); |
15289 | 377 autoreleasepool = [[NSAutoreleasePool alloc] init]; |
15737
0c3939433cef
set nsapp and setup cocoa with NSApplicationLoad
nplourde
parents:
15736
diff
changeset
|
378 NSApp = [NSApplication sharedApplication]; |
25179
6e8b40d412f0
Fix play window not get actived problem on Leopard.
ulion
parents:
25178
diff
changeset
|
379 isLeopardOrLater = floor(NSAppKitVersionNumber) > 824; |
15726 | 380 |
28204 | 381 if (!buffer_name) |
382 buffer_name = strdup(DEFAULT_BUFFER_NAME); | |
383 else | |
28180
781ef511a767
Add an option to vo_macosx to set a custom buffer_name.
gpoirier
parents:
28130
diff
changeset
|
384 shared_buffer = true; |
781ef511a767
Add an option to vo_macosx to set a custom buffer_name.
gpoirier
parents:
28130
diff
changeset
|
385 |
16385 | 386 if(!shared_buffer) |
16144 | 387 { |
27397
d47744b95b78
Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents:
27394
diff
changeset
|
388 #if !defined (CONFIG_MACOSX_FINDER) || !defined (CONFIG_SDL) |
17358
22ec2e9cb530
do not give focus to vo_macosx in shared buffer mode. Patch by Hector Chu<hectorchu@gmail.com>
nplourde
parents:
16385
diff
changeset
|
389 //this chunk of code is heavily based off SDL_macosx.m from SDL |
22ec2e9cb530
do not give focus to vo_macosx in shared buffer mode. Patch by Hector Chu<hectorchu@gmail.com>
nplourde
parents:
16385
diff
changeset
|
390 ProcessSerialNumber myProc, frProc; |
22ec2e9cb530
do not give focus to vo_macosx in shared buffer mode. Patch by Hector Chu<hectorchu@gmail.com>
nplourde
parents:
16385
diff
changeset
|
391 Boolean sameProc; |
22ec2e9cb530
do not give focus to vo_macosx in shared buffer mode. Patch by Hector Chu<hectorchu@gmail.com>
nplourde
parents:
16385
diff
changeset
|
392 |
22ec2e9cb530
do not give focus to vo_macosx in shared buffer mode. Patch by Hector Chu<hectorchu@gmail.com>
nplourde
parents:
16385
diff
changeset
|
393 if (GetFrontProcess(&frProc) == noErr) |
22ec2e9cb530
do not give focus to vo_macosx in shared buffer mode. Patch by Hector Chu<hectorchu@gmail.com>
nplourde
parents:
16385
diff
changeset
|
394 { |
22ec2e9cb530
do not give focus to vo_macosx in shared buffer mode. Patch by Hector Chu<hectorchu@gmail.com>
nplourde
parents:
16385
diff
changeset
|
395 if (GetCurrentProcess(&myProc) == noErr) |
22ec2e9cb530
do not give focus to vo_macosx in shared buffer mode. Patch by Hector Chu<hectorchu@gmail.com>
nplourde
parents:
16385
diff
changeset
|
396 { |
22ec2e9cb530
do not give focus to vo_macosx in shared buffer mode. Patch by Hector Chu<hectorchu@gmail.com>
nplourde
parents:
16385
diff
changeset
|
397 if (SameProcess(&frProc, &myProc, &sameProc) == noErr && !sameProc) |
22ec2e9cb530
do not give focus to vo_macosx in shared buffer mode. Patch by Hector Chu<hectorchu@gmail.com>
nplourde
parents:
16385
diff
changeset
|
398 { |
27988 | 399 TransformProcessType(&myProc, kProcessTransformToForegroundApplication); |
17358
22ec2e9cb530
do not give focus to vo_macosx in shared buffer mode. Patch by Hector Chu<hectorchu@gmail.com>
nplourde
parents:
16385
diff
changeset
|
400 } |
22ec2e9cb530
do not give focus to vo_macosx in shared buffer mode. Patch by Hector Chu<hectorchu@gmail.com>
nplourde
parents:
16385
diff
changeset
|
401 SetFrontProcess(&myProc); |
22ec2e9cb530
do not give focus to vo_macosx in shared buffer mode. Patch by Hector Chu<hectorchu@gmail.com>
nplourde
parents:
16385
diff
changeset
|
402 } |
22ec2e9cb530
do not give focus to vo_macosx in shared buffer mode. Patch by Hector Chu<hectorchu@gmail.com>
nplourde
parents:
16385
diff
changeset
|
403 } |
22ec2e9cb530
do not give focus to vo_macosx in shared buffer mode. Patch by Hector Chu<hectorchu@gmail.com>
nplourde
parents:
16385
diff
changeset
|
404 #endif |
22ec2e9cb530
do not give focus to vo_macosx in shared buffer mode. Patch by Hector Chu<hectorchu@gmail.com>
nplourde
parents:
16385
diff
changeset
|
405 |
16385 | 406 if(!mpGLView) |
407 { | |
408 mpGLView = [[MPlayerOpenGLView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100) pixelFormat:[MPlayerOpenGLView defaultPixelFormat]]; | |
409 [mpGLView autorelease]; | |
410 } | |
411 | |
412 [mpGLView display]; | |
413 [mpGLView preinit]; | |
16144 | 414 } |
415 | |
15289 | 416 return 0; |
417 } | |
418 | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
16145
diff
changeset
|
419 static int control(uint32_t request, void *data, ...) |
15289 | 420 { |
421 switch (request) | |
422 { | |
26755
46f0b4d34fa1
cosmetics: Remove useless parentheses from from return statements.
diego
parents:
25468
diff
changeset
|
423 case VOCTRL_PAUSE: return int_pause = 1; |
46f0b4d34fa1
cosmetics: Remove useless parentheses from from return statements.
diego
parents:
25468
diff
changeset
|
424 case VOCTRL_RESUME: return int_pause = 0; |
15289 | 425 case VOCTRL_QUERY_FORMAT: return query_format(*((uint32_t*)data)); |
25157
cf3b6015735d
Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents:
25137
diff
changeset
|
426 case VOCTRL_ONTOP: vo_ontop = (!(vo_ontop)); if(!shared_buffer){ [mpGLView ontop]; } else { [mplayerosxProto ontop]; } return VO_TRUE; |
15611 | 427 case VOCTRL_ROOTWIN: vo_rootwin = (!(vo_rootwin)); [mpGLView rootwin]; return VO_TRUE; |
25157
cf3b6015735d
Set protocol for the vo proxy used in shared-buffer mode.
ulion
parents:
25137
diff
changeset
|
428 case VOCTRL_FULLSCREEN: vo_fs = (!(vo_fs)); if(!shared_buffer){ [mpGLView fullscreen: NO]; } else { [mplayerosxProto toggleFullscreen]; } return VO_TRUE; |
15289 | 429 case VOCTRL_GET_PANSCAN: return VO_TRUE; |
15611 | 430 case VOCTRL_SET_PANSCAN: [mpGLView panscan]; return VO_TRUE; |
15289 | 431 } |
432 return VO_NOTIMPL; | |
433 } | |
434 | |
435 ////////////////////////////////////////////////////////////////////////// | |
436 // NSOpenGLView Subclass | |
437 ////////////////////////////////////////////////////////////////////////// | |
15611 | 438 @implementation MPlayerOpenGLView |
24076 | 439 - (void) preinit |
15289 | 440 { |
15726 | 441 //init menu |
442 [self initMenu]; | |
443 | |
444 //create window | |
15747
fbf14e1ab725
osx 10.3 dont like to have a window init with no size
nplourde
parents:
15737
diff
changeset
|
445 window = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 100, 100) |
15726 | 446 styleMask:NSTitledWindowMask|NSTexturedBackgroundWindowMask|NSClosableWindowMask|NSMiniaturizableWindowMask|NSResizableWindowMask |
447 backing:NSBackingStoreBuffered defer:NO]; | |
448 | |
16144 | 449 [window autorelease]; |
15726 | 450 [window setDelegate:mpGLView]; |
451 [window setContentView:mpGLView]; | |
452 [window setInitialFirstResponder:mpGLView]; | |
453 [window setAcceptsMouseMovedEvents:YES]; | |
454 [window setTitle:@"MPlayer - The Movie Player"]; | |
455 | |
456 isFullscreen = 0; | |
15855 | 457 winSizeMult = 1; |
15726 | 458 } |
459 | |
24076 | 460 - (void) config |
15726 | 461 { |
462 uint32_t d_width; | |
463 uint32_t d_height; | |
464 | |
25137 | 465 GLint swapInterval = 1; |
15726 | 466 |
467 NSRect frame; | |
15289 | 468 CVReturn error = kCVReturnSuccess; |
469 | |
15728 | 470 //config window |
15726 | 471 aspect((int *)&d_width, (int *)&d_height,A_NOZOOM); |
472 frame = NSMakeRect(0, 0, d_width, d_height); | |
473 [window setContentSize: frame.size]; | |
15570 | 474 |
15289 | 475 //create OpenGL Context |
476 glContext = [[NSOpenGLContext alloc] initWithFormat:[NSOpenGLView defaultPixelFormat] shareContext:nil]; | |
15647 | 477 |
15289 | 478 [self setOpenGLContext:glContext]; |
15647 | 479 [glContext setValues:&swapInterval forParameter:NSOpenGLCPSwapInterval]; |
15289 | 480 [glContext setView:self]; |
481 [glContext makeCurrentContext]; | |
482 | |
25180 | 483 error = CVPixelBufferCreateWithBytes(NULL, image_width, image_height, pixelFormat, image_datas[0], image_width*image_bytes, NULL, NULL, NULL, &frameBuffers[0]); |
15289 | 484 if(error != kCVReturnSuccess) |
485 mp_msg(MSGT_VO, MSGL_ERR,"Failed to create Pixel Buffer(%d)\n", error); | |
25180 | 486 if (vo_doublebuffering) { |
487 error = CVPixelBufferCreateWithBytes(NULL, image_width, image_height, pixelFormat, image_datas[1], image_width*image_bytes, NULL, NULL, NULL, &frameBuffers[1]); | |
488 if(error != kCVReturnSuccess) | |
489 mp_msg(MSGT_VO, MSGL_ERR,"Failed to create Pixel Double Buffer(%d)\n", error); | |
490 } | |
15289 | 491 |
492 error = CVOpenGLTextureCacheCreate(NULL, 0, [glContext CGLContextObj], [[self pixelFormat] CGLPixelFormatObj], 0, &textureCache); | |
493 if(error != kCVReturnSuccess) | |
494 mp_msg(MSGT_VO, MSGL_ERR,"Failed to create OpenGL texture Cache(%d)\n", error); | |
495 | |
25180 | 496 error = CVOpenGLTextureCacheCreateTextureFromImage(NULL, textureCache, frameBuffers[image_page], 0, &texture); |
15289 | 497 if(error != kCVReturnSuccess) |
498 mp_msg(MSGT_VO, MSGL_ERR,"Failed to create OpenGL texture(%d)\n", error); | |
499 | |
15728 | 500 //show window |
501 [window center]; | |
502 [window makeKeyAndOrderFront:mpGLView]; | |
503 | |
15726 | 504 if(vo_rootwin) |
505 [mpGLView rootwin]; | |
506 | |
507 if(vo_fs) | |
508 [mpGLView fullscreen: NO]; | |
509 | |
510 if(vo_ontop) | |
511 [mpGLView ontop]; | |
15289 | 512 } |
513 | |
514 /* | |
15570 | 515 Init Menu |
516 */ | |
517 - (void)initMenu | |
518 { | |
21395 | 519 NSMenu *menu, *aspectMenu; |
15570 | 520 NSMenuItem *menuItem; |
521 | |
522 [NSApp setMainMenu:[[NSMenu alloc] init]]; | |
523 | |
524 //Create Movie Menu | |
525 menu = [[NSMenu alloc] initWithTitle:@"Movie"]; | |
526 menuItem = [[NSMenuItem alloc] initWithTitle:@"Half Size" action:@selector(menuAction:) keyEquivalent:@"0"]; [menu addItem:menuItem]; | |
527 kHalfScreenCmd = menuItem; | |
528 menuItem = [[NSMenuItem alloc] initWithTitle:@"Normal Size" action:@selector(menuAction:) keyEquivalent:@"1"]; [menu addItem:menuItem]; | |
529 kNormalScreenCmd = menuItem; | |
530 menuItem = [[NSMenuItem alloc] initWithTitle:@"Double Size" action:@selector(menuAction:) keyEquivalent:@"2"]; [menu addItem:menuItem]; | |
531 kDoubleScreenCmd = menuItem; | |
532 menuItem = [[NSMenuItem alloc] initWithTitle:@"Full Size" action:@selector(menuAction:) keyEquivalent:@"f"]; [menu addItem:menuItem]; | |
533 kFullScreenCmd = menuItem; | |
15909 | 534 menuItem = (NSMenuItem *)[NSMenuItem separatorItem]; [menu addItem:menuItem]; |
15570 | 535 |
536 aspectMenu = [[NSMenu alloc] initWithTitle:@"Aspect Ratio"]; | |
537 menuItem = [[NSMenuItem alloc] initWithTitle:@"Keep" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem]; | |
538 if(vo_keepaspect) [menuItem setState:NSOnState]; | |
539 kKeepAspectCmd = menuItem; | |
540 menuItem = [[NSMenuItem alloc] initWithTitle:@"Pan-Scan" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem]; | |
541 if(vo_panscan) [menuItem setState:NSOnState]; | |
542 kPanScanCmd = menuItem; | |
15909 | 543 menuItem = (NSMenuItem *)[NSMenuItem separatorItem]; [aspectMenu addItem:menuItem]; |
15570 | 544 menuItem = [[NSMenuItem alloc] initWithTitle:@"Original" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem]; |
545 kAspectOrgCmd = menuItem; | |
546 menuItem = [[NSMenuItem alloc] initWithTitle:@"4:3" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem]; | |
547 kAspectFullCmd = menuItem; | |
548 menuItem = [[NSMenuItem alloc] initWithTitle:@"16:9" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem]; | |
549 kAspectWideCmd = menuItem; | |
550 menuItem = [[NSMenuItem alloc] initWithTitle:@"Aspect Ratio" action:nil keyEquivalent:@""]; | |
551 [menuItem setSubmenu:aspectMenu]; | |
552 [menu addItem:menuItem]; | |
553 [aspectMenu release]; | |
554 | |
555 //Add to menubar | |
556 menuItem = [[NSMenuItem alloc] initWithTitle:@"Movie" action:nil keyEquivalent:@""]; | |
557 [menuItem setSubmenu:menu]; | |
558 [[NSApp mainMenu] addItem:menuItem]; | |
559 | |
560 //Create Window Menu | |
561 menu = [[NSMenu alloc] initWithTitle:@"Window"]; | |
562 | |
563 menuItem = [[NSMenuItem alloc] initWithTitle:@"Minimize" action:@selector(performMiniaturize:) keyEquivalent:@"m"]; [menu addItem:menuItem]; | |
564 menuItem = [[NSMenuItem alloc] initWithTitle:@"Zoom" action:@selector(performZoom:) keyEquivalent:@""]; [menu addItem:menuItem]; | |
565 | |
566 //Add to menubar | |
567 menuItem = [[NSMenuItem alloc] initWithTitle:@"Window" action:nil keyEquivalent:@""]; | |
568 [menuItem setSubmenu:menu]; | |
569 [[NSApp mainMenu] addItem:menuItem]; | |
570 [NSApp setWindowsMenu:menu]; | |
571 | |
572 [menu release]; | |
573 [menuItem release]; | |
574 } | |
575 | |
576 /* | |
577 Menu Action | |
578 */ | |
579 - (void)menuAction:(id)sender | |
580 { | |
581 uint32_t d_width; | |
582 uint32_t d_height; | |
583 NSRect frame; | |
584 | |
585 aspect((int *)&d_width, (int *)&d_height,A_NOZOOM); | |
15731 | 586 |
587 if(sender == kQuitCmd) | |
588 { | |
589 mplayer_put_key(KEY_ESC); | |
590 } | |
15570 | 591 |
592 if(sender == kHalfScreenCmd) | |
593 { | |
594 if(isFullscreen) { | |
21546
253a1e98bfe3
vo_macosx.m disable window animation when going to fullscreen
nplourde
parents:
21395
diff
changeset
|
595 vo_fs = (!(vo_fs)); [self fullscreen:NO]; |
15570 | 596 } |
597 | |
15855 | 598 winSizeMult = 0.5; |
599 frame.size.width = (d_width*winSizeMult); | |
600 frame.size.height = ((d_width/movie_aspect)*winSizeMult); | |
15570 | 601 [window setContentSize: frame.size]; |
602 [self reshape]; | |
603 } | |
604 if(sender == kNormalScreenCmd) | |
605 { | |
606 if(isFullscreen) { | |
21546
253a1e98bfe3
vo_macosx.m disable window animation when going to fullscreen
nplourde
parents:
21395
diff
changeset
|
607 vo_fs = (!(vo_fs)); [self fullscreen:NO]; |
15570 | 608 } |
609 | |
15855 | 610 winSizeMult = 1; |
15570 | 611 frame.size.width = d_width; |
612 frame.size.height = d_width/movie_aspect; | |
613 [window setContentSize: frame.size]; | |
614 [self reshape]; | |
615 } | |
616 if(sender == kDoubleScreenCmd) | |
617 { | |
618 if(isFullscreen) { | |
21546
253a1e98bfe3
vo_macosx.m disable window animation when going to fullscreen
nplourde
parents:
21395
diff
changeset
|
619 vo_fs = (!(vo_fs)); [self fullscreen:NO]; |
15570 | 620 } |
621 | |
15855 | 622 winSizeMult = 2; |
623 frame.size.width = d_width*winSizeMult; | |
624 frame.size.height = (d_width/movie_aspect)*winSizeMult; | |
15570 | 625 [window setContentSize: frame.size]; |
626 [self reshape]; | |
627 } | |
628 if(sender == kFullScreenCmd) | |
629 { | |
630 vo_fs = (!(vo_fs)); | |
21546
253a1e98bfe3
vo_macosx.m disable window animation when going to fullscreen
nplourde
parents:
21395
diff
changeset
|
631 [self fullscreen:NO]; |
15570 | 632 } |
633 | |
634 if(sender == kKeepAspectCmd) | |
635 { | |
636 vo_keepaspect = (!(vo_keepaspect)); | |
637 if(vo_keepaspect) | |
638 [kKeepAspectCmd setState:NSOnState]; | |
639 else | |
640 [kKeepAspectCmd setState:NSOffState]; | |
15909 | 641 |
642 [self reshape]; | |
15570 | 643 } |
644 | |
645 if(sender == kPanScanCmd) | |
646 { | |
647 vo_panscan = (!(vo_panscan)); | |
648 if(vo_panscan) | |
649 [kPanScanCmd setState:NSOnState]; | |
650 else | |
651 [kPanScanCmd setState:NSOffState]; | |
15902
16534910f0fb
fix various window resizing bug with menu option
nplourde
parents:
15882
diff
changeset
|
652 |
16534910f0fb
fix various window resizing bug with menu option
nplourde
parents:
15882
diff
changeset
|
653 [self panscan]; |
15570 | 654 } |
655 | |
656 if(sender == kAspectOrgCmd) | |
657 { | |
658 movie_aspect = old_movie_aspect; | |
15902
16534910f0fb
fix various window resizing bug with menu option
nplourde
parents:
15882
diff
changeset
|
659 |
16534910f0fb
fix various window resizing bug with menu option
nplourde
parents:
15882
diff
changeset
|
660 if(isFullscreen) |
16534910f0fb
fix various window resizing bug with menu option
nplourde
parents:
15882
diff
changeset
|
661 { |
16534910f0fb
fix various window resizing bug with menu option
nplourde
parents:
15882
diff
changeset
|
662 [self reshape]; |
16534910f0fb
fix various window resizing bug with menu option
nplourde
parents:
15882
diff
changeset
|
663 } |
16534910f0fb
fix various window resizing bug with menu option
nplourde
parents:
15882
diff
changeset
|
664 else |
16534910f0fb
fix various window resizing bug with menu option
nplourde
parents:
15882
diff
changeset
|
665 { |
16534910f0fb
fix various window resizing bug with menu option
nplourde
parents:
15882
diff
changeset
|
666 frame.size.width = d_width*winSizeMult; |
16534910f0fb
fix various window resizing bug with menu option
nplourde
parents:
15882
diff
changeset
|
667 frame.size.height = (d_width/movie_aspect)*winSizeMult; |
16534910f0fb
fix various window resizing bug with menu option
nplourde
parents:
15882
diff
changeset
|
668 [window setContentSize: frame.size]; |
16534910f0fb
fix various window resizing bug with menu option
nplourde
parents:
15882
diff
changeset
|
669 [self reshape]; |
16534910f0fb
fix various window resizing bug with menu option
nplourde
parents:
15882
diff
changeset
|
670 } |
15570 | 671 } |
672 | |
673 if(sender == kAspectFullCmd) | |
674 { | |
675 movie_aspect = 4.0f/3.0f; | |
15882 | 676 |
677 if(isFullscreen) | |
678 { | |
679 [self reshape]; | |
680 } | |
681 else | |
682 { | |
683 frame.size.width = d_width*winSizeMult; | |
684 frame.size.height = (d_width/movie_aspect)*winSizeMult; | |
685 [window setContentSize: frame.size]; | |
686 [self reshape]; | |
687 } | |
15570 | 688 } |
689 | |
690 if(sender == kAspectWideCmd) | |
691 { | |
692 movie_aspect = 16.0f/9.0f; | |
15882 | 693 |
694 if(isFullscreen) | |
695 { | |
696 [self reshape]; | |
697 } | |
698 else | |
699 { | |
700 frame.size.width = d_width*winSizeMult; | |
701 frame.size.height = (d_width/movie_aspect)*winSizeMult; | |
702 [window setContentSize: frame.size]; | |
703 [self reshape]; | |
704 } | |
15570 | 705 } |
706 } | |
707 | |
708 /* | |
15289 | 709 Setup OpenGL |
710 */ | |
711 - (void)prepareOpenGL | |
712 { | |
15339 | 713 glEnable(GL_BLEND); |
15289 | 714 glDisable(GL_DEPTH_TEST); |
715 glDepthMask(GL_FALSE); | |
716 glDisable(GL_CULL_FACE); | |
717 [self reshape]; | |
718 } | |
719 | |
720 /* | |
721 reshape OpenGL viewport | |
722 */ | |
723 - (void)reshape | |
724 { | |
725 uint32_t d_width; | |
726 uint32_t d_height; | |
727 float aspectX; | |
728 float aspectY; | |
729 int padding = 0; | |
730 | |
731 NSRect frame = [self frame]; | |
732 | |
733 glViewport(0, 0, frame.size.width, frame.size.height); | |
734 glMatrixMode(GL_PROJECTION); | |
735 glLoadIdentity(); | |
736 glOrtho(0, frame.size.width, frame.size.height, 0, -1.0, 1.0); | |
737 glMatrixMode(GL_MODELVIEW); | |
738 glLoadIdentity(); | |
739 | |
15729 | 740 //set texture frame |
15289 | 741 if(vo_keepaspect) |
742 { | |
15571 | 743 aspect( (int *)&d_width, (int *)&d_height, A_NOZOOM); |
15289 | 744 d_height = ((float)d_width/movie_aspect); |
745 | |
746 aspectX = (float)((float)frame.size.width/(float)d_width); | |
747 aspectY = (float)((float)(frame.size.height)/(float)d_height); | |
748 | |
749 if((d_height*aspectX)>(frame.size.height)) | |
750 { | |
751 padding = (frame.size.width - d_width*aspectY)/2; | |
25424 | 752 textureFrame = NSMakeRect(padding, 0, d_width*aspectY, d_height*aspectY); |
15289 | 753 } |
754 else | |
755 { | |
756 padding = ((frame.size.height) - d_height*aspectX)/2; | |
25424 | 757 textureFrame = NSMakeRect(0, padding, d_width*aspectX, d_height*aspectX); |
15289 | 758 } |
759 } | |
760 else | |
761 { | |
15729 | 762 textureFrame = frame; |
15289 | 763 } |
25446 | 764 vo_dwidth = textureFrame.size.width; |
765 vo_dheight = textureFrame.size.height; | |
15289 | 766 } |
767 | |
768 /* | |
769 Render frame | |
770 */ | |
771 - (void) render | |
772 { | |
21395 | 773 int curTime; |
774 | |
15289 | 775 glClear(GL_COLOR_BUFFER_BIT); |
776 | |
777 glEnable(CVOpenGLTextureGetTarget(texture)); | |
778 glBindTexture(CVOpenGLTextureGetTarget(texture), CVOpenGLTextureGetName(texture)); | |
779 | |
780 glColor3f(1,1,1); | |
781 glBegin(GL_QUADS); | |
15729 | 782 glTexCoord2f(upperLeft[0], upperLeft[1]); glVertex2i( textureFrame.origin.x-(vo_panscan_x >> 1), textureFrame.origin.y-(vo_panscan_y >> 1)); |
25424 | 783 glTexCoord2f(lowerLeft[0], lowerLeft[1]); glVertex2i(textureFrame.origin.x-(vo_panscan_x >> 1), NSMaxY(textureFrame)+(vo_panscan_y >> 1)); |
784 glTexCoord2f(lowerRight[0], lowerRight[1]); glVertex2i(NSMaxX(textureFrame)+(vo_panscan_x >> 1), NSMaxY(textureFrame)+(vo_panscan_y >> 1)); | |
785 glTexCoord2f(upperRight[0], upperRight[1]); glVertex2i(NSMaxX(textureFrame)+(vo_panscan_x >> 1), textureFrame.origin.y-(vo_panscan_y >> 1)); | |
15289 | 786 glEnd(); |
15339 | 787 glDisable(CVOpenGLTextureGetTarget(texture)); |
788 | |
789 //render resize box | |
790 if(!isFullscreen) | |
791 { | |
792 NSRect frame = [self frame]; | |
793 | |
794 glBegin(GL_LINES); | |
795 glColor4f(0.2, 0.2, 0.2, 0.5); | |
796 glVertex2i(frame.size.width-1, frame.size.height-1); glVertex2i(frame.size.width-1, frame.size.height-1); | |
797 glVertex2i(frame.size.width-1, frame.size.height-5); glVertex2i(frame.size.width-5, frame.size.height-1); | |
798 glVertex2i(frame.size.width-1, frame.size.height-9); glVertex2i(frame.size.width-9, frame.size.height-1); | |
799 | |
800 glColor4f(0.4, 0.4, 0.4, 0.5); | |
801 glVertex2i(frame.size.width-1, frame.size.height-2); glVertex2i(frame.size.width-2, frame.size.height-1); | |
802 glVertex2i(frame.size.width-1, frame.size.height-6); glVertex2i(frame.size.width-6, frame.size.height-1); | |
803 glVertex2i(frame.size.width-1, frame.size.height-10); glVertex2i(frame.size.width-10, frame.size.height-1); | |
804 | |
805 glColor4f(0.6, 0.6, 0.6, 0.5); | |
806 glVertex2i(frame.size.width-1, frame.size.height-3); glVertex2i(frame.size.width-3, frame.size.height-1); | |
807 glVertex2i(frame.size.width-1, frame.size.height-7); glVertex2i(frame.size.width-7, frame.size.height-1); | |
808 glVertex2i(frame.size.width-1, frame.size.height-11); glVertex2i(frame.size.width-11, frame.size.height-1); | |
809 glEnd(); | |
810 } | |
15289 | 811 |
812 glFlush(); | |
813 | |
28010
0a0f63090e60
factorize mouse hiding and screensaver disabling code
gpoirier
parents:
28001
diff
changeset
|
814 curTime = TickCount()/60; |
0a0f63090e60
factorize mouse hiding and screensaver disabling code
gpoirier
parents:
28001
diff
changeset
|
815 |
28001 | 816 //auto hide mouse cursor (and future on-screen control?) |
15327 | 817 if(isFullscreen && !mouseHide && !isRootwin) |
15289 | 818 { |
28010
0a0f63090e60
factorize mouse hiding and screensaver disabling code
gpoirier
parents:
28001
diff
changeset
|
819 if( ((curTime - lastMouseHide) >= 5) || (lastMouseHide == 0) ) |
15289 | 820 { |
18057 | 821 CGDisplayHideCursor(kCGDirectMainDisplay); |
28010
0a0f63090e60
factorize mouse hiding and screensaver disabling code
gpoirier
parents:
28001
diff
changeset
|
822 mouseHide = TRUE; |
0a0f63090e60
factorize mouse hiding and screensaver disabling code
gpoirier
parents:
28001
diff
changeset
|
823 lastMouseHide = curTime; |
15289 | 824 } |
825 } | |
17546 | 826 |
17725 | 827 //update activity every 30 seconds to prevent |
17546 | 828 //screensaver from starting up. |
28010
0a0f63090e60
factorize mouse hiding and screensaver disabling code
gpoirier
parents:
28001
diff
changeset
|
829 if( ((curTime - lastScreensaverUpdate) >= 30) || (lastScreensaverUpdate == 0) ) |
17546 | 830 { |
831 UpdateSystemActivity(UsrActivity); | |
28010
0a0f63090e60
factorize mouse hiding and screensaver disabling code
gpoirier
parents:
28001
diff
changeset
|
832 lastScreensaverUpdate = curTime; |
17546 | 833 } |
15289 | 834 } |
835 | |
836 /* | |
837 Create OpenGL texture from current frame & set texco | |
838 */ | |
839 - (void) setCurrentTexture | |
840 { | |
841 CVReturn error = kCVReturnSuccess; | |
842 | |
25180 | 843 error = CVOpenGLTextureCacheCreateTextureFromImage(NULL, textureCache, frameBuffers[image_page], 0, &texture); |
15289 | 844 if(error != kCVReturnSuccess) |
845 mp_msg(MSGT_VO, MSGL_ERR,"Failed to create OpenGL texture(%d)\n", error); | |
846 | |
847 CVOpenGLTextureGetCleanTexCoords(texture, lowerLeft, lowerRight, upperRight, upperLeft); | |
848 } | |
849 | |
850 /* | |
851 redraw win rect | |
852 */ | |
853 - (void) drawRect: (NSRect *) bounds | |
854 { | |
855 [self render]; | |
856 } | |
857 | |
858 /* | |
859 Toggle Fullscreen | |
860 */ | |
861 - (void) fullscreen: (BOOL) animate | |
862 { | |
863 static NSRect old_frame; | |
864 static NSRect old_view_frame; | |
15728 | 865 |
15573 | 866 panscan_calc(); |
867 | |
15289 | 868 //go fullscreen |
869 if(vo_fs) | |
870 { | |
15327 | 871 if(!isRootwin) |
872 { | |
15882 | 873 SetSystemUIMode( kUIModeAllHidden, kUIOptionAutoShowMenuBar); |
18057 | 874 CGDisplayHideCursor(kCGDirectMainDisplay); |
15327 | 875 mouseHide = YES; |
876 } | |
15289 | 877 |
878 old_frame = [window frame]; //save main window size & position | |
28306 | 879 if(screen_id >= 0) |
25413 | 880 screen_frame = [screen_handle frame]; |
25414
5c03a9bdf220
Record screen size and display size in vo_ variables.
ulion
parents:
25413
diff
changeset
|
881 else { |
25413 | 882 screen_frame = [[window screen] frame]; |
25414
5c03a9bdf220
Record screen size and display size in vo_ variables.
ulion
parents:
25413
diff
changeset
|
883 vo_screenwidth = screen_frame.size.width; |
5c03a9bdf220
Record screen size and display size in vo_ variables.
ulion
parents:
25413
diff
changeset
|
884 vo_screenheight = screen_frame.size.height; |
5c03a9bdf220
Record screen size and display size in vo_ variables.
ulion
parents:
25413
diff
changeset
|
885 } |
25413 | 886 |
15728 | 887 [window setFrame:screen_frame display:YES animate:animate]; //zoom-in window with nice useless sfx |
15289 | 888 old_view_frame = [self bounds]; |
889 | |
890 //fix origin for multi screen setup | |
15728 | 891 screen_frame.origin.x = 0; |
892 screen_frame.origin.y = 0; | |
893 [self setFrame:screen_frame]; | |
15289 | 894 [self setNeedsDisplay:YES]; |
895 [window setHasShadow:NO]; | |
896 isFullscreen = 1; | |
897 } | |
898 else | |
15882 | 899 { |
15902
16534910f0fb
fix various window resizing bug with menu option
nplourde
parents:
15882
diff
changeset
|
900 SetSystemUIMode( kUIModeNormal, 0); |
15882 | 901 |
15289 | 902 isFullscreen = 0; |
18057 | 903 CGDisplayShowCursor(kCGDirectMainDisplay); |
15289 | 904 mouseHide = NO; |
905 | |
906 //revert window to previous setting | |
907 [self setFrame:old_view_frame]; | |
908 [self setNeedsDisplay:YES]; | |
16081
72c352edce8f
restore window shadow when quitting fullscreen mode
nplourde
parents:
15909
diff
changeset
|
909 [window setHasShadow:YES]; |
15289 | 910 [window setFrame:old_frame display:YES animate:animate];//zoom-out window with nice useless sfx |
911 } | |
912 } | |
913 | |
914 /* | |
915 Toggle ontop | |
916 */ | |
917 - (void) ontop | |
918 { | |
15320 | 919 if(vo_ontop) |
920 { | |
921 [window setLevel:NSScreenSaverWindowLevel]; | |
922 isOntop = YES; | |
923 } | |
924 else | |
925 { | |
926 [window setLevel:NSNormalWindowLevel]; | |
927 isOntop = NO; | |
928 } | |
15289 | 929 } |
930 | |
931 /* | |
932 Toggle panscan | |
933 */ | |
934 - (void) panscan | |
935 { | |
15331 | 936 panscan_calc(); |
15289 | 937 } |
938 | |
939 /* | |
15327 | 940 Toggle rootwin |
941 */ | |
942 - (void) rootwin | |
943 { | |
944 if(vo_rootwin) | |
945 { | |
946 [window setLevel:CGWindowLevelForKey(kCGDesktopWindowLevelKey)]; | |
947 [window orderBack:self]; | |
948 isRootwin = YES; | |
949 } | |
950 else | |
951 { | |
952 [window setLevel:NSNormalWindowLevel]; | |
953 isRootwin = NO; | |
954 } | |
955 } | |
956 | |
957 /* | |
15289 | 958 Check event for new event |
959 */ | |
960 - (void) check_events | |
961 { | |
962 event = [NSApp nextEventMatchingMask:NSAnyEventMask untilDate:[NSDate dateWithTimeIntervalSinceNow:0.0001] inMode:NSEventTrackingRunLoopMode dequeue:YES]; | |
25178 | 963 if (event == nil) |
964 return; | |
15289 | 965 [NSApp sendEvent:event]; |
25179
6e8b40d412f0
Fix play window not get actived problem on Leopard.
ulion
parents:
25178
diff
changeset
|
966 // Without SDL's bootstrap code (include SDL.h in mplayer.c), |
6e8b40d412f0
Fix play window not get actived problem on Leopard.
ulion
parents:
25178
diff
changeset
|
967 // on Leopard, we got trouble to get the play window auto focused |
6e8b40d412f0
Fix play window not get actived problem on Leopard.
ulion
parents:
25178
diff
changeset
|
968 // when app is actived. Following code fix this problem. |
27370
14c5017f40d2
Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents:
26755
diff
changeset
|
969 #ifndef CONFIG_SDL |
25179
6e8b40d412f0
Fix play window not get actived problem on Leopard.
ulion
parents:
25178
diff
changeset
|
970 if (isLeopardOrLater && [event type] == NSAppKitDefined |
6e8b40d412f0
Fix play window not get actived problem on Leopard.
ulion
parents:
25178
diff
changeset
|
971 && [event subtype] == NSApplicationActivatedEventType) { |
6e8b40d412f0
Fix play window not get actived problem on Leopard.
ulion
parents:
25178
diff
changeset
|
972 [window makeMainWindow]; |
6e8b40d412f0
Fix play window not get actived problem on Leopard.
ulion
parents:
25178
diff
changeset
|
973 [window makeKeyAndOrderFront:mpGLView]; |
6e8b40d412f0
Fix play window not get actived problem on Leopard.
ulion
parents:
25178
diff
changeset
|
974 } |
6e8b40d412f0
Fix play window not get actived problem on Leopard.
ulion
parents:
25178
diff
changeset
|
975 #endif |
15289 | 976 } |
977 | |
978 /* | |
15731 | 979 From NSView, respond to key equivalents. |
980 */ | |
981 - (BOOL)performKeyEquivalent:(NSEvent *)theEvent | |
982 { | |
983 switch([theEvent keyCode]) | |
984 { | |
985 case 0x21: [window setAlphaValue: winAlpha-=0.05]; return YES; | |
986 case 0x1e: [window setAlphaValue: winAlpha+=0.05]; return YES; | |
987 } | |
988 return NO; | |
989 } | |
990 | |
991 /* | |
15289 | 992 Process key event |
993 */ | |
994 - (void) keyDown: (NSEvent *) theEvent | |
995 { | |
996 unsigned int key; | |
997 | |
998 switch([theEvent keyCode]) | |
999 { | |
1000 case 0x34: | |
1001 case 0x24: key = KEY_ENTER; break; | |
1002 case 0x35: key = KEY_ESC; break; | |
1003 case 0x33: key = KEY_BACKSPACE; break; | |
1004 case 0x3A: key = KEY_BACKSPACE; break; | |
1005 case 0x3B: key = KEY_BACKSPACE; break; | |
1006 case 0x38: key = KEY_BACKSPACE; break; | |
1007 case 0x7A: key = KEY_F+1; break; | |
1008 case 0x78: key = KEY_F+2; break; | |
1009 case 0x63: key = KEY_F+3; break; | |
1010 case 0x76: key = KEY_F+4; break; | |
1011 case 0x60: key = KEY_F+5; break; | |
1012 case 0x61: key = KEY_F+6; break; | |
1013 case 0x62: key = KEY_F+7; break; | |
1014 case 0x64: key = KEY_F+8; break; | |
1015 case 0x65: key = KEY_F+9; break; | |
1016 case 0x6D: key = KEY_F+10; break; | |
1017 case 0x67: key = KEY_F+11; break; | |
1018 case 0x6F: key = KEY_F+12; break; | |
1019 case 0x72: key = KEY_INSERT; break; | |
1020 case 0x75: key = KEY_DELETE; break; | |
1021 case 0x73: key = KEY_HOME; break; | |
1022 case 0x77: key = KEY_END; break; | |
1023 case 0x45: key = '+'; break; | |
1024 case 0x4E: key = '-'; break; | |
1025 case 0x30: key = KEY_TAB; break; | |
1026 case 0x74: key = KEY_PAGE_UP; break; | |
1027 case 0x79: key = KEY_PAGE_DOWN; break; | |
1028 case 0x7B: key = KEY_LEFT; break; | |
1029 case 0x7C: key = KEY_RIGHT; break; | |
1030 case 0x7D: key = KEY_DOWN; break; | |
1031 case 0x7E: key = KEY_UP; break; | |
1032 case 0x43: key = '*'; break; | |
1033 case 0x4B: key = '/'; break; | |
24107 | 1034 case 0x4C: key = KEY_KPENTER; break; |
15289 | 1035 case 0x41: key = KEY_KPDEC; break; |
1036 case 0x52: key = KEY_KP0; break; | |
1037 case 0x53: key = KEY_KP1; break; | |
1038 case 0x54: key = KEY_KP2; break; | |
1039 case 0x55: key = KEY_KP3; break; | |
1040 case 0x56: key = KEY_KP4; break; | |
1041 case 0x57: key = KEY_KP5; break; | |
1042 case 0x58: key = KEY_KP6; break; | |
1043 case 0x59: key = KEY_KP7; break; | |
1044 case 0x5B: key = KEY_KP8; break; | |
1045 case 0x5C: key = KEY_KP9; break; | |
1046 default: key = *[[theEvent characters] UTF8String]; break; | |
1047 } | |
1048 mplayer_put_key(key); | |
1049 } | |
1050 | |
1051 /* | |
1052 Process mouse button event | |
1053 */ | |
1054 - (void) mouseMoved: (NSEvent *) theEvent | |
1055 { | |
15327 | 1056 if(isFullscreen && !isRootwin) |
15289 | 1057 { |
18057 | 1058 CGDisplayShowCursor(kCGDirectMainDisplay); |
15289 | 1059 mouseHide = NO; |
1060 } | |
25468
a77c438fedf7
Do not send mouse movements events in root win mode.
ulion
parents:
25446
diff
changeset
|
1061 if (enable_mouse_movements && !isRootwin) { |
25446 | 1062 NSPoint p =[self convertPoint:[theEvent locationInWindow] fromView:nil]; |
1063 if ([self mouse:p inRect:textureFrame]) { | |
1064 char cmdstr[40]; | |
1065 snprintf(cmdstr, sizeof(cmdstr), "set_mouse_pos %i %i", | |
1066 (int)(vo_fs ? p.x : (p.x - textureFrame.origin.x)), | |
1067 (int)(vo_fs ? [self frame].size.height - p.y: (NSMaxY(textureFrame) - p.y))); | |
1068 mp_input_queue_cmd(mp_input_parse_cmd(cmdstr)); | |
1069 } | |
1070 } | |
15289 | 1071 } |
1072 | |
1073 - (void) mouseDown: (NSEvent *) theEvent | |
1074 { | |
1075 [self mouseEvent: theEvent]; | |
1076 } | |
1077 | |
24077
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1078 - (void) mouseUp: (NSEvent *) theEvent |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1079 { |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1080 [self mouseEvent: theEvent]; |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1081 } |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1082 |
15289 | 1083 - (void) rightMouseDown: (NSEvent *) theEvent |
1084 { | |
1085 [self mouseEvent: theEvent]; | |
1086 } | |
1087 | |
24077
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1088 - (void) rightMouseUp: (NSEvent *) theEvent |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1089 { |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1090 [self mouseEvent: theEvent]; |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1091 } |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1092 |
15289 | 1093 - (void) otherMouseDown: (NSEvent *) theEvent |
1094 { | |
1095 [self mouseEvent: theEvent]; | |
1096 } | |
1097 | |
24077
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1098 - (void) otherMouseUp: (NSEvent *) theEvent |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1099 { |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1100 [self mouseEvent: theEvent]; |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1101 } |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1102 |
15289 | 1103 - (void) scrollWheel: (NSEvent *) theEvent |
1104 { | |
1105 if([theEvent deltaY] > 0) | |
1106 mplayer_put_key(MOUSE_BTN3); | |
1107 else | |
1108 mplayer_put_key(MOUSE_BTN4); | |
1109 } | |
1110 | |
1111 - (void) mouseEvent: (NSEvent *) theEvent | |
1112 { | |
24077
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1113 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
|
1114 { |
25422 | 1115 int buttonNumber = [theEvent buttonNumber]; |
1116 // Fix to mplayer defined button order: left, middle, right | |
1117 if (buttonNumber == 1) | |
1118 buttonNumber = 2; | |
25423 | 1119 else if (buttonNumber == 2) |
1120 buttonNumber = 1; | |
24077
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1121 switch([theEvent type]) |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1122 { |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1123 case NSLeftMouseDown: |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1124 case NSRightMouseDown: |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1125 case NSOtherMouseDown: |
25422 | 1126 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
|
1127 break; |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1128 case NSLeftMouseUp: |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1129 case NSRightMouseUp: |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1130 case NSOtherMouseUp: |
25422 | 1131 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
|
1132 break; |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1133 } |
15289 | 1134 } |
1135 } | |
1136 | |
1137 /* | |
1138 NSResponder | |
1139 */ | |
1140 - (BOOL) acceptsFirstResponder | |
1141 { | |
1142 return YES; | |
1143 } | |
1144 | |
1145 - (BOOL) becomeFirstResponder | |
1146 { | |
1147 return YES; | |
1148 } | |
1149 | |
1150 - (BOOL) resignFirstResponder | |
1151 { | |
1152 return YES; | |
1153 } | |
15325 | 1154 |
1155 - (void)windowWillClose:(NSNotification *)aNotification | |
1156 { | |
21551 | 1157 mpGLView = NULL; |
15325 | 1158 mplayer_put_key(KEY_ESC); |
1159 } | |
1160 @end |