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