annotate libvo/vo_macosx.m @ 16171:fd51fd1ff231

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