Mercurial > mplayer.hg
annotate libvo/vo_macosx.m @ 24744:d81eef9beb1b
DirectShow based tv:// driver for win32
Teletext is also supported (but 625 system parameters are hardcoded).
pthreads is required for teletext.
Code is still experimental.
author | voroshil |
---|---|
date | Sat, 13 Oct 2007 17:14:39 +0000 |
parents | 0bef706332b5 |
children | aca7d0259d90 |
rev | line source |
---|---|
15289 | 1 /* |
2 vo_macosx.m | |
3 by Nicolas Plourde <nicolasplourde@gmail.com> | |
4 | |
5 MPlayer Mac OSX video out module. | |
6 Copyright (c) Nicolas Plourde - 2005 | |
7 */ | |
8 | |
9 #import "vo_macosx.h" | |
16385 | 10 #include <sys/types.h> |
11 #include <sys/ipc.h> | |
12 #include <sys/shm.h> | |
15289 | 13 |
14 //MPLAYER | |
15 #include "config.h" | |
16 #include "fastmemcpy.h" | |
17 #include "video_out.h" | |
18 #include "video_out_internal.h" | |
19 #include "aspect.h" | |
20 #include "mp_msg.h" | |
21 #include "m_option.h" | |
22 | |
23 #include "input/input.h" | |
24 #include "input/mouse.h" | |
25 | |
26 #include "osdep/keycodes.h" | |
27 | |
28 //Cocoa | |
16385 | 29 NSProxy *mplayerosxProxy; |
15611 | 30 MPlayerOpenGLView *mpGLView; |
15289 | 31 NSAutoreleasePool *autoreleasepool; |
32 OSType pixelFormat; | |
33 | |
16385 | 34 //shared memory |
35 int shm_id; | |
36 struct shmid_ds shm_desc; | |
37 BOOL shared_buffer = false; | |
38 | |
15728 | 39 //Screen |
40 int screen_id; | |
41 BOOL screen_force; | |
42 NSRect screen_frame; | |
43 NSScreen *screen_handle; | |
44 NSArray *screen_array; | |
15289 | 45 |
46 //image | |
47 unsigned char *image_data; | |
48 static uint32_t image_width; | |
49 static uint32_t image_height; | |
50 static uint32_t image_depth; | |
51 static uint32_t image_bytes; | |
52 static uint32_t image_format; | |
53 | |
54 //vo | |
55 static int isFullscreen; | |
15320 | 56 static int isOntop; |
15327 | 57 static int isRootwin; |
15289 | 58 extern float monitor_aspect; |
59 extern float movie_aspect; | |
60 static float old_movie_aspect; | |
61 | |
15731 | 62 static float winAlpha = 1; |
15289 | 63 static int int_pause = 0; |
64 | |
65 static vo_info_t info = | |
66 { | |
67 "Mac OSX Core Video", | |
68 "macosx", | |
69 "Nicolas Plourde <nicolas.plourde@gmail.com>", | |
70 "" | |
71 }; | |
72 | |
73 LIBVO_EXTERN(macosx) | |
74 | |
75 extern void mplayer_put_key(int code); | |
76 extern void vo_draw_text(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride)); | |
77 | |
78 static void draw_alpha(int x0, int y0, int w, int h, unsigned char *src, unsigned char *srca, int stride) | |
79 { | |
80 switch (image_format) | |
81 { | |
82 case IMGFMT_RGB32: | |
83 vo_draw_alpha_rgb32(w,h,src,srca,stride,image_data+4*(y0*image_width+x0),4*image_width); | |
84 break; | |
85 case IMGFMT_YUY2: | |
86 vo_draw_alpha_yuy2(w,h,src,srca,stride,image_data + (x0 + y0 * image_width) * 2,image_width*2); | |
87 break; | |
88 } | |
89 } | |
90 | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
16145
diff
changeset
|
91 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 | 92 { |
16385 | 93 |
15728 | 94 //init screen |
95 screen_array = [NSScreen screens]; | |
96 if(screen_id < [screen_array count]) | |
15289 | 97 { |
15728 | 98 screen_handle = [screen_array objectAtIndex:screen_id]; |
15289 | 99 } |
15728 | 100 else |
101 { | |
102 mp_msg(MSGT_VO, MSGL_FATAL, "Get device error: Device ID %d do not exist, falling back to main device.\n", screen_id); | |
103 screen_handle = [screen_array objectAtIndex:0]; | |
104 screen_id = 0; | |
105 } | |
106 screen_frame = [screen_handle frame]; | |
16385 | 107 |
15289 | 108 //misc mplayer setup |
109 image_width = width; | |
110 image_height = height; | |
111 switch (image_format) | |
112 { | |
113 case IMGFMT_BGR32: | |
114 case IMGFMT_RGB32: | |
115 image_depth = 32; | |
116 break; | |
16385 | 117 case IMGFMT_YUY2: |
15289 | 118 image_depth = 16; |
119 break; | |
120 } | |
121 image_bytes = (image_depth + 7) / 8; | |
18878 | 122 image_data = malloc(image_width*image_height*image_bytes); |
16385 | 123 |
124 if(!shared_buffer) | |
125 { | |
126 monitor_aspect = (float)screen_frame.size.width/(float)screen_frame.size.height; | |
127 | |
128 //set aspect | |
129 panscan_init(); | |
130 aspect_save_orig(width,height); | |
131 aspect_save_prescale(d_width,d_height); | |
132 aspect_save_screenres(screen_frame.size.width, screen_frame.size.height); | |
133 aspect((int *)&d_width,(int *)&d_height,A_NOZOOM); | |
134 | |
135 movie_aspect = (float)d_width/(float)d_height; | |
136 old_movie_aspect = movie_aspect; | |
15726 | 137 |
16385 | 138 vo_fs = flags & VOFLAG_FULLSCREEN; |
139 | |
140 //config OpenGL View | |
141 [mpGLView config]; | |
142 [mpGLView reshape]; | |
143 } | |
144 else | |
145 { | |
146 movie_aspect = (float)d_width/(float)d_height; | |
147 | |
148 shm_id = shmget(9849, image_width*image_height*image_bytes, IPC_CREAT | 0666); | |
149 if (shm_id == -1) | |
150 { | |
151 perror("vo_mplayer shmget: "); | |
152 return 1; | |
153 } | |
154 | |
155 image_data = shmat(shm_id, NULL, 0); | |
156 if (!image_data) | |
157 { | |
158 perror("vo_mplayer shmat: "); | |
159 return 1; | |
160 } | |
161 | |
162 //connnect to mplayerosx | |
163 mplayerosxProxy=[NSConnection rootProxyForConnectionWithRegisteredName:@"mplayerosx" host:nil]; | |
18057 | 164 [mplayerosxProxy startWithWidth: image_width withHeight: image_height withBytes: image_bytes withAspect:(int)(movie_aspect*100)]; |
16385 | 165 } |
15289 | 166 return 0; |
167 } | |
168 | |
169 static void check_events(void) | |
170 { | |
15611 | 171 [mpGLView check_events]; |
15289 | 172 } |
173 | |
174 static void draw_osd(void) | |
175 { | |
176 vo_draw_text(image_width, image_height, draw_alpha); | |
177 } | |
178 | |
179 static void flip_page(void) | |
180 { | |
16385 | 181 if(shared_buffer) |
182 [mplayerosxProxy render]; | |
183 else | |
184 [mpGLView render]; | |
15289 | 185 } |
186 | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
16145
diff
changeset
|
187 static int draw_slice(uint8_t *src[], int stride[], int w,int h,int x,int y) |
15289 | 188 { |
15611 | 189 [mpGLView setCurrentTexture]; |
15289 | 190 return 0; |
191 } | |
192 | |
193 | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
16145
diff
changeset
|
194 static int draw_frame(uint8_t *src[]) |
15289 | 195 { |
196 switch (image_format) | |
197 { | |
198 case IMGFMT_BGR32: | |
199 case IMGFMT_RGB32: | |
23457
a124f3abc1ec
Replace implicit use of fast_memcpy via macro by explicit use to allow
reimar
parents:
23381
diff
changeset
|
200 fast_memcpy(image_data, src[0], image_width*image_height*image_bytes); |
15289 | 201 break; |
202 | |
203 case IMGFMT_YUY2: | |
204 memcpy_pic(image_data, src[0], image_width * 2, image_height, image_width * 2, image_width * 2); | |
205 break; | |
206 } | |
16385 | 207 |
208 if(!shared_buffer) | |
209 [mpGLView setCurrentTexture]; | |
210 | |
15289 | 211 return 0; |
212 } | |
213 | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
16145
diff
changeset
|
214 static int query_format(uint32_t format) |
15289 | 215 { |
216 image_format = format; | |
217 | |
218 switch(format) | |
219 { | |
220 case IMGFMT_YUY2: | |
221 pixelFormat = kYUVSPixelFormat; | |
222 return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_OSD | VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN; | |
223 | |
224 case IMGFMT_RGB32: | |
225 case IMGFMT_BGR32: | |
226 pixelFormat = k32ARGBPixelFormat; | |
227 return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_OSD | VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN; | |
228 } | |
229 return 0; | |
230 } | |
231 | |
232 static void uninit(void) | |
233 { | |
16385 | 234 if(shared_buffer) |
235 { | |
236 [mplayerosxProxy stop]; | |
237 | |
238 if (shmdt(image_data) == -1) | |
239 mp_msg(MSGT_VO, MSGL_FATAL, "uninit: shmdt failed\n"); | |
240 | |
241 if (shmctl(shm_id, IPC_RMID, &shm_desc) == -1) | |
242 mp_msg(MSGT_VO, MSGL_FATAL, "uninit: shmctl failed\n"); | |
243 } | |
244 | |
21551 | 245 SetSystemUIMode( kUIModeNormal, 0); |
246 CGDisplayShowCursor(kCGDirectMainDisplay); | |
247 | |
248 if(mpGLView) | |
249 { | |
24742
0bef706332b5
Fix deallocate bug which sometimes causes a crash when reinitializing.
nplourde
parents:
24698
diff
changeset
|
250 mpGLView = nil; |
21551 | 251 [autoreleasepool release]; |
252 } | |
15289 | 253 } |
254 | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
16145
diff
changeset
|
255 static int preinit(const char *arg) |
15289 | 256 { |
257 int parse_err = 0; | |
258 | |
15728 | 259 if(arg) |
260 { | |
261 char *parse_pos = (char *)&arg[0]; | |
262 while (parse_pos[0] && !parse_err) | |
263 { | |
264 if (strncmp (parse_pos, "device_id=", 10) == 0) | |
265 { | |
266 parse_pos = &parse_pos[10]; | |
267 screen_id = strtol(parse_pos, &parse_pos, 0); | |
268 screen_force = YES; | |
269 } | |
16385 | 270 if (strncmp (parse_pos, "shared_buffer", 13) == 0) |
271 { | |
272 parse_pos = &parse_pos[13]; | |
273 shared_buffer = YES; | |
274 } | |
15728 | 275 if (parse_pos[0] == ':') parse_pos = &parse_pos[1]; |
276 else if (parse_pos[0]) parse_err = 1; | |
277 } | |
278 } | |
279 | |
15737
0c3939433cef
set nsapp and setup cocoa with NSApplicationLoad
nplourde
parents:
15736
diff
changeset
|
280 NSApplicationLoad(); |
15289 | 281 autoreleasepool = [[NSAutoreleasePool alloc] init]; |
15737
0c3939433cef
set nsapp and setup cocoa with NSApplicationLoad
nplourde
parents:
15736
diff
changeset
|
282 NSApp = [NSApplication sharedApplication]; |
15726 | 283 |
16385 | 284 if(!shared_buffer) |
16144 | 285 { |
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
|
286 #if !defined (MACOSX_FINDER_SUPPORT) || !defined (HAVE_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
|
287 //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
|
288 //it uses an Apple private function to request foreground operation |
22ec2e9cb530
do not give focus to vo_macosx in shared buffer mode. Patch by Hector Chu<hectorchu@gmail.com>
nplourde
parents:
16385
diff
changeset
|
289 void CPSEnableForegroundOperation(ProcessSerialNumber* psn); |
22ec2e9cb530
do not give focus to vo_macosx in shared buffer mode. Patch by Hector Chu<hectorchu@gmail.com>
nplourde
parents:
16385
diff
changeset
|
290 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
|
291 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
|
292 |
22ec2e9cb530
do not give focus to vo_macosx in shared buffer mode. Patch by Hector Chu<hectorchu@gmail.com>
nplourde
parents:
16385
diff
changeset
|
293 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
|
294 { |
22ec2e9cb530
do not give focus to vo_macosx in shared buffer mode. Patch by Hector Chu<hectorchu@gmail.com>
nplourde
parents:
16385
diff
changeset
|
295 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
|
296 { |
22ec2e9cb530
do not give focus to vo_macosx in shared buffer mode. Patch by Hector Chu<hectorchu@gmail.com>
nplourde
parents:
16385
diff
changeset
|
297 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
|
298 { |
22ec2e9cb530
do not give focus to vo_macosx in shared buffer mode. Patch by Hector Chu<hectorchu@gmail.com>
nplourde
parents:
16385
diff
changeset
|
299 CPSEnableForegroundOperation(&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
|
300 } |
22ec2e9cb530
do not give focus to vo_macosx in shared buffer mode. Patch by Hector Chu<hectorchu@gmail.com>
nplourde
parents:
16385
diff
changeset
|
301 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
|
302 } |
22ec2e9cb530
do not give focus to vo_macosx in shared buffer mode. Patch by Hector Chu<hectorchu@gmail.com>
nplourde
parents:
16385
diff
changeset
|
303 } |
22ec2e9cb530
do not give focus to vo_macosx in shared buffer mode. Patch by Hector Chu<hectorchu@gmail.com>
nplourde
parents:
16385
diff
changeset
|
304 #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
|
305 |
16385 | 306 if(!mpGLView) |
307 { | |
308 mpGLView = [[MPlayerOpenGLView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100) pixelFormat:[MPlayerOpenGLView defaultPixelFormat]]; | |
309 [mpGLView autorelease]; | |
310 } | |
311 | |
312 [mpGLView display]; | |
313 [mpGLView preinit]; | |
16144 | 314 } |
315 | |
15289 | 316 return 0; |
317 } | |
318 | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
16145
diff
changeset
|
319 static int control(uint32_t request, void *data, ...) |
15289 | 320 { |
321 switch (request) | |
322 { | |
323 case VOCTRL_PAUSE: return (int_pause=1); | |
324 case VOCTRL_RESUME: return (int_pause=0); | |
325 case VOCTRL_QUERY_FORMAT: return query_format(*((uint32_t*)data)); | |
15611 | 326 case VOCTRL_ONTOP: vo_ontop = (!(vo_ontop)); [mpGLView ontop]; return VO_TRUE; |
327 case VOCTRL_ROOTWIN: vo_rootwin = (!(vo_rootwin)); [mpGLView rootwin]; return VO_TRUE; | |
24698
6f56399be56c
enable fullscreen command from mplayer to be sent to mplayer osx
nplourde
parents:
24107
diff
changeset
|
328 case VOCTRL_FULLSCREEN: vo_fs = (!(vo_fs)); if(!shared_buffer){ [mpGLView fullscreen: NO]; } else { [mplayerosxProxy toggleFullscreen]; } return VO_TRUE; |
15289 | 329 case VOCTRL_GET_PANSCAN: return VO_TRUE; |
15611 | 330 case VOCTRL_SET_PANSCAN: [mpGLView panscan]; return VO_TRUE; |
15289 | 331 } |
332 return VO_NOTIMPL; | |
333 } | |
334 | |
335 ////////////////////////////////////////////////////////////////////////// | |
336 // NSOpenGLView Subclass | |
337 ////////////////////////////////////////////////////////////////////////// | |
15611 | 338 @implementation MPlayerOpenGLView |
24076 | 339 - (void) preinit |
15289 | 340 { |
15726 | 341 //init menu |
342 [self initMenu]; | |
343 | |
344 //create window | |
15747
fbf14e1ab725
osx 10.3 dont like to have a window init with no size
nplourde
parents:
15737
diff
changeset
|
345 window = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 100, 100) |
15726 | 346 styleMask:NSTitledWindowMask|NSTexturedBackgroundWindowMask|NSClosableWindowMask|NSMiniaturizableWindowMask|NSResizableWindowMask |
347 backing:NSBackingStoreBuffered defer:NO]; | |
348 | |
16144 | 349 [window autorelease]; |
15726 | 350 [window setDelegate:mpGLView]; |
351 [window setContentView:mpGLView]; | |
352 [window setInitialFirstResponder:mpGLView]; | |
353 [window setAcceptsMouseMovedEvents:YES]; | |
354 [window setTitle:@"MPlayer - The Movie Player"]; | |
355 | |
356 isFullscreen = 0; | |
15855 | 357 winSizeMult = 1; |
15726 | 358 } |
359 | |
24076 | 360 - (void) config |
15726 | 361 { |
362 uint32_t d_width; | |
363 uint32_t d_height; | |
364 | |
15610 | 365 long swapInterval = 1; |
15726 | 366 |
367 NSRect frame; | |
15289 | 368 CVReturn error = kCVReturnSuccess; |
369 | |
15728 | 370 //config window |
15726 | 371 aspect((int *)&d_width, (int *)&d_height,A_NOZOOM); |
372 frame = NSMakeRect(0, 0, d_width, d_height); | |
373 [window setContentSize: frame.size]; | |
15570 | 374 |
15289 | 375 //create OpenGL Context |
376 glContext = [[NSOpenGLContext alloc] initWithFormat:[NSOpenGLView defaultPixelFormat] shareContext:nil]; | |
15647 | 377 |
15289 | 378 [self setOpenGLContext:glContext]; |
15647 | 379 [glContext setValues:&swapInterval forParameter:NSOpenGLCPSwapInterval]; |
15289 | 380 [glContext setView:self]; |
381 [glContext makeCurrentContext]; | |
382 | |
15647 | 383 error = CVPixelBufferCreateWithBytes( NULL, image_width, image_height, pixelFormat, image_data, image_width*image_bytes, NULL, NULL, NULL, ¤tFrameBuffer); |
15289 | 384 if(error != kCVReturnSuccess) |
385 mp_msg(MSGT_VO, MSGL_ERR,"Failed to create Pixel Buffer(%d)\n", error); | |
386 | |
387 error = CVOpenGLTextureCacheCreate(NULL, 0, [glContext CGLContextObj], [[self pixelFormat] CGLPixelFormatObj], 0, &textureCache); | |
388 if(error != kCVReturnSuccess) | |
389 mp_msg(MSGT_VO, MSGL_ERR,"Failed to create OpenGL texture Cache(%d)\n", error); | |
390 | |
391 error = CVOpenGLTextureCacheCreateTextureFromImage( NULL, textureCache, currentFrameBuffer, 0, &texture); | |
392 if(error != kCVReturnSuccess) | |
393 mp_msg(MSGT_VO, MSGL_ERR,"Failed to create OpenGL texture(%d)\n", error); | |
394 | |
15728 | 395 //show window |
396 [window center]; | |
397 [window makeKeyAndOrderFront:mpGLView]; | |
398 | |
15726 | 399 if(vo_rootwin) |
400 [mpGLView rootwin]; | |
401 | |
402 if(vo_fs) | |
403 [mpGLView fullscreen: NO]; | |
404 | |
405 if(vo_ontop) | |
406 [mpGLView ontop]; | |
15289 | 407 } |
408 | |
409 /* | |
15570 | 410 Init Menu |
411 */ | |
412 - (void)initMenu | |
413 { | |
21395 | 414 NSMenu *menu, *aspectMenu; |
15570 | 415 NSMenuItem *menuItem; |
416 | |
417 [NSApp setMainMenu:[[NSMenu alloc] init]]; | |
418 | |
419 //Create Movie Menu | |
420 menu = [[NSMenu alloc] initWithTitle:@"Movie"]; | |
421 menuItem = [[NSMenuItem alloc] initWithTitle:@"Half Size" action:@selector(menuAction:) keyEquivalent:@"0"]; [menu addItem:menuItem]; | |
422 kHalfScreenCmd = menuItem; | |
423 menuItem = [[NSMenuItem alloc] initWithTitle:@"Normal Size" action:@selector(menuAction:) keyEquivalent:@"1"]; [menu addItem:menuItem]; | |
424 kNormalScreenCmd = menuItem; | |
425 menuItem = [[NSMenuItem alloc] initWithTitle:@"Double Size" action:@selector(menuAction:) keyEquivalent:@"2"]; [menu addItem:menuItem]; | |
426 kDoubleScreenCmd = menuItem; | |
427 menuItem = [[NSMenuItem alloc] initWithTitle:@"Full Size" action:@selector(menuAction:) keyEquivalent:@"f"]; [menu addItem:menuItem]; | |
428 kFullScreenCmd = menuItem; | |
15909 | 429 menuItem = (NSMenuItem *)[NSMenuItem separatorItem]; [menu addItem:menuItem]; |
15570 | 430 |
431 aspectMenu = [[NSMenu alloc] initWithTitle:@"Aspect Ratio"]; | |
432 menuItem = [[NSMenuItem alloc] initWithTitle:@"Keep" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem]; | |
433 if(vo_keepaspect) [menuItem setState:NSOnState]; | |
434 kKeepAspectCmd = menuItem; | |
435 menuItem = [[NSMenuItem alloc] initWithTitle:@"Pan-Scan" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem]; | |
436 if(vo_panscan) [menuItem setState:NSOnState]; | |
437 kPanScanCmd = menuItem; | |
15909 | 438 menuItem = (NSMenuItem *)[NSMenuItem separatorItem]; [aspectMenu addItem:menuItem]; |
15570 | 439 menuItem = [[NSMenuItem alloc] initWithTitle:@"Original" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem]; |
440 kAspectOrgCmd = menuItem; | |
441 menuItem = [[NSMenuItem alloc] initWithTitle:@"4:3" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem]; | |
442 kAspectFullCmd = menuItem; | |
443 menuItem = [[NSMenuItem alloc] initWithTitle:@"16:9" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem]; | |
444 kAspectWideCmd = menuItem; | |
445 menuItem = [[NSMenuItem alloc] initWithTitle:@"Aspect Ratio" action:nil keyEquivalent:@""]; | |
446 [menuItem setSubmenu:aspectMenu]; | |
447 [menu addItem:menuItem]; | |
448 [aspectMenu release]; | |
449 | |
450 //Add to menubar | |
451 menuItem = [[NSMenuItem alloc] initWithTitle:@"Movie" action:nil keyEquivalent:@""]; | |
452 [menuItem setSubmenu:menu]; | |
453 [[NSApp mainMenu] addItem:menuItem]; | |
454 | |
455 //Create Window Menu | |
456 menu = [[NSMenu alloc] initWithTitle:@"Window"]; | |
457 | |
458 menuItem = [[NSMenuItem alloc] initWithTitle:@"Minimize" action:@selector(performMiniaturize:) keyEquivalent:@"m"]; [menu addItem:menuItem]; | |
459 menuItem = [[NSMenuItem alloc] initWithTitle:@"Zoom" action:@selector(performZoom:) keyEquivalent:@""]; [menu addItem:menuItem]; | |
460 | |
461 //Add to menubar | |
462 menuItem = [[NSMenuItem alloc] initWithTitle:@"Window" action:nil keyEquivalent:@""]; | |
463 [menuItem setSubmenu:menu]; | |
464 [[NSApp mainMenu] addItem:menuItem]; | |
465 [NSApp setWindowsMenu:menu]; | |
466 | |
467 [menu release]; | |
468 [menuItem release]; | |
469 } | |
470 | |
471 /* | |
472 Menu Action | |
473 */ | |
474 - (void)menuAction:(id)sender | |
475 { | |
476 uint32_t d_width; | |
477 uint32_t d_height; | |
478 NSRect frame; | |
479 | |
480 aspect((int *)&d_width, (int *)&d_height,A_NOZOOM); | |
15731 | 481 |
482 if(sender == kQuitCmd) | |
483 { | |
484 mplayer_put_key(KEY_ESC); | |
485 } | |
15570 | 486 |
487 if(sender == kHalfScreenCmd) | |
488 { | |
489 if(isFullscreen) { | |
21546
253a1e98bfe3
vo_macosx.m disable window animation when going to fullscreen
nplourde
parents:
21395
diff
changeset
|
490 vo_fs = (!(vo_fs)); [self fullscreen:NO]; |
15570 | 491 } |
492 | |
15855 | 493 winSizeMult = 0.5; |
494 frame.size.width = (d_width*winSizeMult); | |
495 frame.size.height = ((d_width/movie_aspect)*winSizeMult); | |
15570 | 496 [window setContentSize: frame.size]; |
497 [self reshape]; | |
498 } | |
499 if(sender == kNormalScreenCmd) | |
500 { | |
501 if(isFullscreen) { | |
21546
253a1e98bfe3
vo_macosx.m disable window animation when going to fullscreen
nplourde
parents:
21395
diff
changeset
|
502 vo_fs = (!(vo_fs)); [self fullscreen:NO]; |
15570 | 503 } |
504 | |
15855 | 505 winSizeMult = 1; |
15570 | 506 frame.size.width = d_width; |
507 frame.size.height = d_width/movie_aspect; | |
508 [window setContentSize: frame.size]; | |
509 [self reshape]; | |
510 } | |
511 if(sender == kDoubleScreenCmd) | |
512 { | |
513 if(isFullscreen) { | |
21546
253a1e98bfe3
vo_macosx.m disable window animation when going to fullscreen
nplourde
parents:
21395
diff
changeset
|
514 vo_fs = (!(vo_fs)); [self fullscreen:NO]; |
15570 | 515 } |
516 | |
15855 | 517 winSizeMult = 2; |
518 frame.size.width = d_width*winSizeMult; | |
519 frame.size.height = (d_width/movie_aspect)*winSizeMult; | |
15570 | 520 [window setContentSize: frame.size]; |
521 [self reshape]; | |
522 } | |
523 if(sender == kFullScreenCmd) | |
524 { | |
525 vo_fs = (!(vo_fs)); | |
21546
253a1e98bfe3
vo_macosx.m disable window animation when going to fullscreen
nplourde
parents:
21395
diff
changeset
|
526 [self fullscreen:NO]; |
15570 | 527 } |
528 | |
529 if(sender == kKeepAspectCmd) | |
530 { | |
531 vo_keepaspect = (!(vo_keepaspect)); | |
532 if(vo_keepaspect) | |
533 [kKeepAspectCmd setState:NSOnState]; | |
534 else | |
535 [kKeepAspectCmd setState:NSOffState]; | |
15909 | 536 |
537 [self reshape]; | |
15570 | 538 } |
539 | |
540 if(sender == kPanScanCmd) | |
541 { | |
542 vo_panscan = (!(vo_panscan)); | |
543 if(vo_panscan) | |
544 [kPanScanCmd setState:NSOnState]; | |
545 else | |
546 [kPanScanCmd setState:NSOffState]; | |
15902
16534910f0fb
fix various window resizing bug with menu option
nplourde
parents:
15882
diff
changeset
|
547 |
16534910f0fb
fix various window resizing bug with menu option
nplourde
parents:
15882
diff
changeset
|
548 [self panscan]; |
15570 | 549 } |
550 | |
551 if(sender == kAspectOrgCmd) | |
552 { | |
553 movie_aspect = old_movie_aspect; | |
15902
16534910f0fb
fix various window resizing bug with menu option
nplourde
parents:
15882
diff
changeset
|
554 |
16534910f0fb
fix various window resizing bug with menu option
nplourde
parents:
15882
diff
changeset
|
555 if(isFullscreen) |
16534910f0fb
fix various window resizing bug with menu option
nplourde
parents:
15882
diff
changeset
|
556 { |
16534910f0fb
fix various window resizing bug with menu option
nplourde
parents:
15882
diff
changeset
|
557 [self reshape]; |
16534910f0fb
fix various window resizing bug with menu option
nplourde
parents:
15882
diff
changeset
|
558 } |
16534910f0fb
fix various window resizing bug with menu option
nplourde
parents:
15882
diff
changeset
|
559 else |
16534910f0fb
fix various window resizing bug with menu option
nplourde
parents:
15882
diff
changeset
|
560 { |
16534910f0fb
fix various window resizing bug with menu option
nplourde
parents:
15882
diff
changeset
|
561 frame.size.width = d_width*winSizeMult; |
16534910f0fb
fix various window resizing bug with menu option
nplourde
parents:
15882
diff
changeset
|
562 frame.size.height = (d_width/movie_aspect)*winSizeMult; |
16534910f0fb
fix various window resizing bug with menu option
nplourde
parents:
15882
diff
changeset
|
563 [window setContentSize: frame.size]; |
16534910f0fb
fix various window resizing bug with menu option
nplourde
parents:
15882
diff
changeset
|
564 [self reshape]; |
16534910f0fb
fix various window resizing bug with menu option
nplourde
parents:
15882
diff
changeset
|
565 } |
15570 | 566 } |
567 | |
568 if(sender == kAspectFullCmd) | |
569 { | |
570 movie_aspect = 4.0f/3.0f; | |
15882 | 571 |
572 if(isFullscreen) | |
573 { | |
574 [self reshape]; | |
575 } | |
576 else | |
577 { | |
578 frame.size.width = d_width*winSizeMult; | |
579 frame.size.height = (d_width/movie_aspect)*winSizeMult; | |
580 [window setContentSize: frame.size]; | |
581 [self reshape]; | |
582 } | |
15570 | 583 } |
584 | |
585 if(sender == kAspectWideCmd) | |
586 { | |
587 movie_aspect = 16.0f/9.0f; | |
15882 | 588 |
589 if(isFullscreen) | |
590 { | |
591 [self reshape]; | |
592 } | |
593 else | |
594 { | |
595 frame.size.width = d_width*winSizeMult; | |
596 frame.size.height = (d_width/movie_aspect)*winSizeMult; | |
597 [window setContentSize: frame.size]; | |
598 [self reshape]; | |
599 } | |
15570 | 600 } |
601 } | |
602 | |
603 /* | |
15289 | 604 Setup OpenGL |
605 */ | |
606 - (void)prepareOpenGL | |
607 { | |
15339 | 608 glEnable(GL_BLEND); |
15289 | 609 glDisable(GL_DEPTH_TEST); |
610 glDepthMask(GL_FALSE); | |
611 glDisable(GL_CULL_FACE); | |
612 [self reshape]; | |
613 } | |
614 | |
615 /* | |
616 reshape OpenGL viewport | |
617 */ | |
618 - (void)reshape | |
619 { | |
620 uint32_t d_width; | |
621 uint32_t d_height; | |
622 float aspectX; | |
623 float aspectY; | |
624 int padding = 0; | |
625 | |
626 NSRect frame = [self frame]; | |
627 | |
628 glViewport(0, 0, frame.size.width, frame.size.height); | |
629 glMatrixMode(GL_PROJECTION); | |
630 glLoadIdentity(); | |
631 glOrtho(0, frame.size.width, frame.size.height, 0, -1.0, 1.0); | |
632 glMatrixMode(GL_MODELVIEW); | |
633 glLoadIdentity(); | |
634 | |
15729 | 635 //set texture frame |
15289 | 636 if(vo_keepaspect) |
637 { | |
15571 | 638 aspect( (int *)&d_width, (int *)&d_height, A_NOZOOM); |
15289 | 639 d_height = ((float)d_width/movie_aspect); |
640 | |
641 aspectX = (float)((float)frame.size.width/(float)d_width); | |
642 aspectY = (float)((float)(frame.size.height)/(float)d_height); | |
643 | |
644 if((d_height*aspectX)>(frame.size.height)) | |
645 { | |
646 padding = (frame.size.width - d_width*aspectY)/2; | |
15729 | 647 textureFrame = NSMakeRect(padding, 0, d_width*aspectY+padding, d_height*aspectY); |
15289 | 648 } |
649 else | |
650 { | |
651 padding = ((frame.size.height) - d_height*aspectX)/2; | |
15729 | 652 textureFrame = NSMakeRect(0, padding, d_width*aspectX, d_height*aspectX+padding); |
15289 | 653 } |
654 } | |
655 else | |
656 { | |
15729 | 657 textureFrame = frame; |
15289 | 658 } |
659 } | |
660 | |
661 /* | |
662 Render frame | |
663 */ | |
664 - (void) render | |
665 { | |
21395 | 666 int curTime; |
667 static int lastTime; | |
668 | |
15289 | 669 glClear(GL_COLOR_BUFFER_BIT); |
670 | |
671 glEnable(CVOpenGLTextureGetTarget(texture)); | |
672 glBindTexture(CVOpenGLTextureGetTarget(texture), CVOpenGLTextureGetName(texture)); | |
673 | |
674 glColor3f(1,1,1); | |
675 glBegin(GL_QUADS); | |
15729 | 676 glTexCoord2f(upperLeft[0], upperLeft[1]); glVertex2i( textureFrame.origin.x-(vo_panscan_x >> 1), textureFrame.origin.y-(vo_panscan_y >> 1)); |
677 glTexCoord2f(lowerLeft[0], lowerLeft[1]); glVertex2i( textureFrame.origin.x-(vo_panscan_x >> 1), textureFrame.size.height+(vo_panscan_y >> 1)); | |
678 glTexCoord2f(lowerRight[0], lowerRight[1]); glVertex2i( textureFrame.size.width+(vo_panscan_x >> 1), textureFrame.size.height+(vo_panscan_y >> 1)); | |
679 glTexCoord2f(upperRight[0], upperRight[1]); glVertex2i( textureFrame.size.width+(vo_panscan_x >> 1), textureFrame.origin.y-(vo_panscan_y >> 1)); | |
15289 | 680 glEnd(); |
15339 | 681 glDisable(CVOpenGLTextureGetTarget(texture)); |
682 | |
683 //render resize box | |
684 if(!isFullscreen) | |
685 { | |
686 NSRect frame = [self frame]; | |
687 | |
688 glBegin(GL_LINES); | |
689 glColor4f(0.2, 0.2, 0.2, 0.5); | |
690 glVertex2i(frame.size.width-1, frame.size.height-1); glVertex2i(frame.size.width-1, frame.size.height-1); | |
691 glVertex2i(frame.size.width-1, frame.size.height-5); glVertex2i(frame.size.width-5, frame.size.height-1); | |
692 glVertex2i(frame.size.width-1, frame.size.height-9); glVertex2i(frame.size.width-9, frame.size.height-1); | |
693 | |
694 glColor4f(0.4, 0.4, 0.4, 0.5); | |
695 glVertex2i(frame.size.width-1, frame.size.height-2); glVertex2i(frame.size.width-2, frame.size.height-1); | |
696 glVertex2i(frame.size.width-1, frame.size.height-6); glVertex2i(frame.size.width-6, frame.size.height-1); | |
697 glVertex2i(frame.size.width-1, frame.size.height-10); glVertex2i(frame.size.width-10, frame.size.height-1); | |
698 | |
699 glColor4f(0.6, 0.6, 0.6, 0.5); | |
700 glVertex2i(frame.size.width-1, frame.size.height-3); glVertex2i(frame.size.width-3, frame.size.height-1); | |
701 glVertex2i(frame.size.width-1, frame.size.height-7); glVertex2i(frame.size.width-7, frame.size.height-1); | |
702 glVertex2i(frame.size.width-1, frame.size.height-11); glVertex2i(frame.size.width-11, frame.size.height-1); | |
703 glEnd(); | |
704 } | |
15289 | 705 |
706 glFlush(); | |
707 | |
708 //auto hide mouse cursor and futur on-screen control? | |
15327 | 709 if(isFullscreen && !mouseHide && !isRootwin) |
15289 | 710 { |
18057 | 711 int curTime = TickCount()/60; |
712 static int lastTime = 0; | |
15289 | 713 |
714 if( ((curTime - lastTime) >= 5) || (lastTime == 0) ) | |
715 { | |
18057 | 716 CGDisplayHideCursor(kCGDirectMainDisplay); |
15289 | 717 mouseHide = YES; |
718 lastTime = curTime; | |
719 } | |
720 } | |
17546 | 721 |
17725 | 722 //update activity every 30 seconds to prevent |
17546 | 723 //screensaver from starting up. |
21395 | 724 curTime = TickCount()/60; |
725 lastTime = 0; | |
18057 | 726 |
727 if( ((curTime - lastTime) >= 30) || (lastTime == 0) ) | |
17546 | 728 { |
729 UpdateSystemActivity(UsrActivity); | |
730 lastTime = curTime; | |
731 } | |
15289 | 732 } |
733 | |
734 /* | |
735 Create OpenGL texture from current frame & set texco | |
736 */ | |
737 - (void) setCurrentTexture | |
738 { | |
739 CVReturn error = kCVReturnSuccess; | |
740 | |
741 error = CVOpenGLTextureCacheCreateTextureFromImage (NULL, textureCache, currentFrameBuffer, 0, &texture); | |
742 if(error != kCVReturnSuccess) | |
743 mp_msg(MSGT_VO, MSGL_ERR,"Failed to create OpenGL texture(%d)\n", error); | |
744 | |
745 CVOpenGLTextureGetCleanTexCoords(texture, lowerLeft, lowerRight, upperRight, upperLeft); | |
746 } | |
747 | |
748 /* | |
749 redraw win rect | |
750 */ | |
751 - (void) drawRect: (NSRect *) bounds | |
752 { | |
753 [self render]; | |
754 } | |
755 | |
756 /* | |
757 Toggle Fullscreen | |
758 */ | |
759 - (void) fullscreen: (BOOL) animate | |
760 { | |
761 static NSRect old_frame; | |
762 static NSRect old_view_frame; | |
15728 | 763 |
764 if(screen_force) | |
765 screen_frame = [screen_handle frame]; | |
766 else | |
767 screen_frame = [[window screen] frame]; | |
15289 | 768 |
15573 | 769 panscan_calc(); |
770 | |
15289 | 771 //go fullscreen |
772 if(vo_fs) | |
773 { | |
15327 | 774 if(!isRootwin) |
775 { | |
15882 | 776 SetSystemUIMode( kUIModeAllHidden, kUIOptionAutoShowMenuBar); |
18057 | 777 CGDisplayHideCursor(kCGDirectMainDisplay); |
15327 | 778 mouseHide = YES; |
779 } | |
15289 | 780 |
781 old_frame = [window frame]; //save main window size & position | |
15728 | 782 [window setFrame:screen_frame display:YES animate:animate]; //zoom-in window with nice useless sfx |
15289 | 783 old_view_frame = [self bounds]; |
784 | |
785 //fix origin for multi screen setup | |
15728 | 786 screen_frame.origin.x = 0; |
787 screen_frame.origin.y = 0; | |
788 [self setFrame:screen_frame]; | |
15289 | 789 [self setNeedsDisplay:YES]; |
790 [window setHasShadow:NO]; | |
791 isFullscreen = 1; | |
792 } | |
793 else | |
15882 | 794 { |
15902
16534910f0fb
fix various window resizing bug with menu option
nplourde
parents:
15882
diff
changeset
|
795 SetSystemUIMode( kUIModeNormal, 0); |
15882 | 796 |
15289 | 797 isFullscreen = 0; |
18057 | 798 CGDisplayShowCursor(kCGDirectMainDisplay); |
15289 | 799 mouseHide = NO; |
800 | |
801 //revert window to previous setting | |
802 [self setFrame:old_view_frame]; | |
803 [self setNeedsDisplay:YES]; | |
16081
72c352edce8f
restore window shadow when quitting fullscreen mode
nplourde
parents:
15909
diff
changeset
|
804 [window setHasShadow:YES]; |
15289 | 805 [window setFrame:old_frame display:YES animate:animate];//zoom-out window with nice useless sfx |
806 } | |
807 } | |
808 | |
809 /* | |
810 Toggle ontop | |
811 */ | |
812 - (void) ontop | |
813 { | |
15320 | 814 if(vo_ontop) |
815 { | |
816 [window setLevel:NSScreenSaverWindowLevel]; | |
817 isOntop = YES; | |
818 } | |
819 else | |
820 { | |
821 [window setLevel:NSNormalWindowLevel]; | |
822 isOntop = NO; | |
823 } | |
15289 | 824 } |
825 | |
826 /* | |
827 Toggle panscan | |
828 */ | |
829 - (void) panscan | |
830 { | |
15331 | 831 panscan_calc(); |
15289 | 832 } |
833 | |
834 /* | |
15327 | 835 Toggle rootwin |
836 */ | |
837 - (void) rootwin | |
838 { | |
839 if(vo_rootwin) | |
840 { | |
841 [window setLevel:CGWindowLevelForKey(kCGDesktopWindowLevelKey)]; | |
842 [window orderBack:self]; | |
843 isRootwin = YES; | |
844 } | |
845 else | |
846 { | |
847 [window setLevel:NSNormalWindowLevel]; | |
848 isRootwin = NO; | |
849 } | |
850 } | |
851 | |
852 /* | |
15289 | 853 Check event for new event |
854 */ | |
855 - (void) check_events | |
856 { | |
857 event = [NSApp nextEventMatchingMask:NSAnyEventMask untilDate:[NSDate dateWithTimeIntervalSinceNow:0.0001] inMode:NSEventTrackingRunLoopMode dequeue:YES]; | |
858 [NSApp sendEvent:event]; | |
859 } | |
860 | |
861 /* | |
15731 | 862 From NSView, respond to key equivalents. |
863 */ | |
864 - (BOOL)performKeyEquivalent:(NSEvent *)theEvent | |
865 { | |
866 switch([theEvent keyCode]) | |
867 { | |
868 case 0x21: [window setAlphaValue: winAlpha-=0.05]; return YES; | |
869 case 0x1e: [window setAlphaValue: winAlpha+=0.05]; return YES; | |
870 } | |
871 return NO; | |
872 } | |
873 | |
874 /* | |
15289 | 875 Process key event |
876 */ | |
877 - (void) keyDown: (NSEvent *) theEvent | |
878 { | |
879 unsigned int key; | |
880 | |
881 switch([theEvent keyCode]) | |
882 { | |
883 case 0x34: | |
884 case 0x24: key = KEY_ENTER; break; | |
885 case 0x35: key = KEY_ESC; break; | |
886 case 0x33: key = KEY_BACKSPACE; break; | |
887 case 0x3A: key = KEY_BACKSPACE; break; | |
888 case 0x3B: key = KEY_BACKSPACE; break; | |
889 case 0x38: key = KEY_BACKSPACE; break; | |
890 case 0x7A: key = KEY_F+1; break; | |
891 case 0x78: key = KEY_F+2; break; | |
892 case 0x63: key = KEY_F+3; break; | |
893 case 0x76: key = KEY_F+4; break; | |
894 case 0x60: key = KEY_F+5; break; | |
895 case 0x61: key = KEY_F+6; break; | |
896 case 0x62: key = KEY_F+7; break; | |
897 case 0x64: key = KEY_F+8; break; | |
898 case 0x65: key = KEY_F+9; break; | |
899 case 0x6D: key = KEY_F+10; break; | |
900 case 0x67: key = KEY_F+11; break; | |
901 case 0x6F: key = KEY_F+12; break; | |
902 case 0x72: key = KEY_INSERT; break; | |
903 case 0x75: key = KEY_DELETE; break; | |
904 case 0x73: key = KEY_HOME; break; | |
905 case 0x77: key = KEY_END; break; | |
906 case 0x45: key = '+'; break; | |
907 case 0x4E: key = '-'; break; | |
908 case 0x30: key = KEY_TAB; break; | |
909 case 0x74: key = KEY_PAGE_UP; break; | |
910 case 0x79: key = KEY_PAGE_DOWN; break; | |
911 case 0x7B: key = KEY_LEFT; break; | |
912 case 0x7C: key = KEY_RIGHT; break; | |
913 case 0x7D: key = KEY_DOWN; break; | |
914 case 0x7E: key = KEY_UP; break; | |
915 case 0x43: key = '*'; break; | |
916 case 0x4B: key = '/'; break; | |
24107 | 917 case 0x4C: key = KEY_KPENTER; break; |
15289 | 918 case 0x41: key = KEY_KPDEC; break; |
919 case 0x52: key = KEY_KP0; break; | |
920 case 0x53: key = KEY_KP1; break; | |
921 case 0x54: key = KEY_KP2; break; | |
922 case 0x55: key = KEY_KP3; break; | |
923 case 0x56: key = KEY_KP4; break; | |
924 case 0x57: key = KEY_KP5; break; | |
925 case 0x58: key = KEY_KP6; break; | |
926 case 0x59: key = KEY_KP7; break; | |
927 case 0x5B: key = KEY_KP8; break; | |
928 case 0x5C: key = KEY_KP9; break; | |
929 default: key = *[[theEvent characters] UTF8String]; break; | |
930 } | |
931 mplayer_put_key(key); | |
932 } | |
933 | |
934 /* | |
935 Process mouse button event | |
936 */ | |
937 - (void) mouseMoved: (NSEvent *) theEvent | |
938 { | |
15327 | 939 if(isFullscreen && !isRootwin) |
15289 | 940 { |
18057 | 941 CGDisplayShowCursor(kCGDirectMainDisplay); |
15289 | 942 mouseHide = NO; |
943 } | |
944 } | |
945 | |
946 - (void) mouseDown: (NSEvent *) theEvent | |
947 { | |
948 [self mouseEvent: theEvent]; | |
949 } | |
950 | |
24077
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
951 - (void) mouseUp: (NSEvent *) theEvent |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
952 { |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
953 [self mouseEvent: theEvent]; |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
954 } |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
955 |
15289 | 956 - (void) rightMouseDown: (NSEvent *) theEvent |
957 { | |
958 [self mouseEvent: theEvent]; | |
959 } | |
960 | |
24077
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
961 - (void) rightMouseUp: (NSEvent *) theEvent |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
962 { |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
963 [self mouseEvent: theEvent]; |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
964 } |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
965 |
15289 | 966 - (void) otherMouseDown: (NSEvent *) theEvent |
967 { | |
968 [self mouseEvent: theEvent]; | |
969 } | |
970 | |
24077
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
971 - (void) otherMouseUp: (NSEvent *) theEvent |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
972 { |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
973 [self mouseEvent: theEvent]; |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
974 } |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
975 |
15289 | 976 - (void) scrollWheel: (NSEvent *) theEvent |
977 { | |
978 if([theEvent deltaY] > 0) | |
979 mplayer_put_key(MOUSE_BTN3); | |
980 else | |
981 mplayer_put_key(MOUSE_BTN4); | |
982 } | |
983 | |
984 - (void) mouseEvent: (NSEvent *) theEvent | |
985 { | |
24077
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
986 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
|
987 { |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
988 switch([theEvent type]) |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
989 { |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
990 case NSLeftMouseDown: |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
991 case NSRightMouseDown: |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
992 case NSOtherMouseDown: |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
993 mplayer_put_key((MOUSE_BTN0 + [theEvent buttonNumber]) | MP_KEY_DOWN); |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
994 break; |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
995 case NSLeftMouseUp: |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
996 case NSRightMouseUp: |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
997 case NSOtherMouseUp: |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
998 mplayer_put_key(MOUSE_BTN0 + [theEvent buttonNumber]); |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
999 break; |
9ce03980ed0c
added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents:
24076
diff
changeset
|
1000 } |
15289 | 1001 } |
1002 } | |
1003 | |
1004 /* | |
1005 NSResponder | |
1006 */ | |
1007 - (BOOL) acceptsFirstResponder | |
1008 { | |
1009 return YES; | |
1010 } | |
1011 | |
1012 - (BOOL) becomeFirstResponder | |
1013 { | |
1014 return YES; | |
1015 } | |
1016 | |
1017 - (BOOL) resignFirstResponder | |
1018 { | |
1019 return YES; | |
1020 } | |
15325 | 1021 |
1022 - (void)windowWillClose:(NSNotification *)aNotification | |
1023 { | |
21551 | 1024 mpGLView = NULL; |
15325 | 1025 mplayer_put_key(KEY_ESC); |
1026 } | |
1027 @end |