Mercurial > mplayer.hg
annotate libvo/vo_x11.c @ 18889:e60c8c7399d2
get_path as const, patch by Stefan Huehner, stefan AT huehner-org
author | reynaldo |
---|---|
date | Mon, 03 Jul 2006 23:27:37 +0000 |
parents | 8579acff875e |
children | 6a08d0dabca8 |
rev | line source |
---|---|
1 | 1 |
2 #include <stdio.h> | |
3 #include <stdlib.h> | |
4 #include <string.h> | |
5 #include <signal.h> | |
6 | |
7 #include "config.h" | |
8 #include "video_out.h" | |
9 #include "video_out_internal.h" | |
10 | |
11 | |
12 #include <X11/Xlib.h> | |
13 #include <X11/Xutil.h> | |
4036 | 14 |
206
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
15 #ifdef HAVE_XF86VM |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
16 #include <X11/extensions/xf86vmode.h> |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
17 #endif |
1 | 18 #include <errno.h> |
19 | |
31 | 20 #include "x11_common.h" |
21 | |
11690
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
22 #ifdef HAVE_SHM |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
23 #include <sys/ipc.h> |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
24 #include <sys/shm.h> |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
25 #include <X11/extensions/XShm.h> |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
26 |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
27 static int Shmem_Flag; |
12582 | 28 |
11690
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
29 //static int Quiet_Flag; Here also what is this for. It's used but isn't inited ? |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
30 static XShmSegmentInfo Shminfo[1]; |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
31 static int gXErrorFlag; |
12582 | 32 static int CompletionType = -1; |
11690
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
33 |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
34 /* since it doesn't seem to be defined on some platforms */ |
12582 | 35 int XShmGetEventBase(Display *); |
11690
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
36 #endif |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
37 |
354 | 38 #include "fastmemcpy.h" |
616 | 39 #include "sub.h" |
350 | 40 |
18861 | 41 #include "libswscale/swscale.h" |
13787
e047e70a9767
Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
diego
parents:
13056
diff
changeset
|
42 #include "libmpcodecs/vf_scale.h" |
18746 | 43 #define MODE_RGB 0x1 |
44 #define MODE_BGR 0x2 | |
2218 | 45 |
13787
e047e70a9767
Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
diego
parents:
13056
diff
changeset
|
46 #include "mp_msg.h" |
18234
a107276371a8
Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents:
18116
diff
changeset
|
47 #include "help_mp.h" |
4734 | 48 |
6013
7f6e02a16ac4
some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents:
5999
diff
changeset
|
49 #ifdef HAVE_NEW_GUI |
13787
e047e70a9767
Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
diego
parents:
13056
diff
changeset
|
50 #include "Gui/interface.h" |
e047e70a9767
Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
diego
parents:
13056
diff
changeset
|
51 #include "mplayer.h" |
6013
7f6e02a16ac4
some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents:
5999
diff
changeset
|
52 #endif |
7f6e02a16ac4
some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents:
5999
diff
changeset
|
53 |
12582 | 54 static vo_info_t info = { |
55 "X11 ( XImage/Shm )", | |
56 "x11", | |
57 "Aaron Holtzman <aholtzma@ess.engr.uvic.ca>", | |
58 "" | |
1 | 59 }; |
60 | |
12582 | 61 LIBVO_EXTERN(x11) |
1 | 62 /* private prototypes */ |
12582 | 63 static void Display_Image(XImage * myximage, unsigned char *ImageData); |
64 static void (*draw_alpha_fnc) (int x0, int y0, int w, int h, | |
65 unsigned char *src, unsigned char *srca, | |
66 int stride); | |
1 | 67 |
68 /* local data */ | |
69 static unsigned char *ImageData; | |
70 | |
71 /* X11 related variables */ | |
7764 | 72 static XImage *myximage = NULL; |
12582 | 73 static int depth, bpp, mode; |
1 | 74 static XWindowAttributes attribs; |
75 | |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10728
diff
changeset
|
76 static int int_pause; |
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10728
diff
changeset
|
77 |
2969 | 78 static int Flip_Flag; |
4661
4df2400b0527
-fs and or -vm default is nozoom, -zoom does the expected thing
michael
parents:
4658
diff
changeset
|
79 static int zoomFlag; |
2969 | 80 |
1 | 81 |
82 static uint32_t image_width; | |
83 static uint32_t image_height; | |
4641 | 84 static uint32_t in_format; |
12582 | 85 static uint32_t out_format = 0; |
86 static int srcW = -1; | |
87 static int srcH = -1; | |
88 static int aspect; // 1<<16 based fixed point aspect, so that the aspect stays correct during resizing | |
1 | 89 |
12582 | 90 static int old_vo_dwidth = -1; |
91 static int old_vo_dheight = -1; | |
92 | |
93 static void check_events() | |
94 { | |
95 int ret = vo_x11_check_events(mDisplay); | |
6013
7f6e02a16ac4
some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents:
5999
diff
changeset
|
96 |
12582 | 97 /* clear left over borders and redraw frame if we are paused */ |
98 if (ret & VO_EVENT_EXPOSE && int_pause) | |
99 { | |
100 vo_x11_clearwindow_part(mDisplay, vo_window, myximage->width, | |
101 myximage->height, 0); | |
102 flip_page(); | |
103 } else if ((ret & VO_EVENT_RESIZE) || (ret & VO_EVENT_EXPOSE)) | |
104 vo_x11_clearwindow_part(mDisplay, vo_window, myximage->width, | |
105 myximage->height, 0); | |
106 | |
107 } | |
108 | |
109 static void draw_alpha_32(int x0, int y0, int w, int h, unsigned char *src, | |
110 unsigned char *srca, int stride) | |
111 { | |
112 vo_draw_alpha_rgb32(w, h, src, srca, stride, | |
113 ImageData + 4 * (y0 * image_width + x0), | |
114 4 * image_width); | |
1 | 115 } |
116 | |
12582 | 117 static void draw_alpha_24(int x0, int y0, int w, int h, unsigned char *src, |
118 unsigned char *srca, int stride) | |
119 { | |
120 vo_draw_alpha_rgb24(w, h, src, srca, stride, | |
121 ImageData + 3 * (y0 * image_width + x0), | |
122 3 * image_width); | |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
123 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
124 |
12582 | 125 static void draw_alpha_16(int x0, int y0, int w, int h, unsigned char *src, |
126 unsigned char *srca, int stride) | |
127 { | |
128 vo_draw_alpha_rgb16(w, h, src, srca, stride, | |
129 ImageData + 2 * (y0 * image_width + x0), | |
130 2 * image_width); | |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
131 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
132 |
12582 | 133 static void draw_alpha_15(int x0, int y0, int w, int h, unsigned char *src, |
134 unsigned char *srca, int stride) | |
135 { | |
136 vo_draw_alpha_rgb15(w, h, src, srca, stride, | |
137 ImageData + 2 * (y0 * image_width + x0), | |
138 2 * image_width); | |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
139 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
140 |
12582 | 141 static void draw_alpha_null(int x0, int y0, int w, int h, |
142 unsigned char *src, unsigned char *srca, | |
143 int stride) | |
144 { | |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
145 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
146 |
18746 | 147 static struct SwsContext *swsContext = NULL; |
148 static int dst_width; | |
4420
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
149 extern int sws_flags; |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
150 |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
151 static XVisualInfo vinfo; |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
152 |
17566
f580a7755ac5
Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents:
16171
diff
changeset
|
153 static void getMyXImage(void) |
4420
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
154 { |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
155 #ifdef HAVE_SHM |
12582 | 156 if (mLocalDisplay && XShmQueryExtension(mDisplay)) |
157 Shmem_Flag = 1; | |
158 else | |
159 { | |
160 Shmem_Flag = 0; | |
161 mp_msg(MSGT_VO, MSGL_WARN, | |
162 "Shared memory not supported\nReverting to normal Xlib\n"); | |
163 } | |
164 if (Shmem_Flag) | |
165 CompletionType = XShmGetEventBase(mDisplay) + ShmCompletion; | |
4420
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
166 |
12582 | 167 if (Shmem_Flag) |
4420
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
168 { |
12582 | 169 myximage = |
170 XShmCreateImage(mDisplay, vinfo.visual, depth, ZPixmap, NULL, | |
171 &Shminfo[0], image_width, image_height); | |
172 if (myximage == NULL) | |
173 { | |
174 if (myximage != NULL) | |
175 XDestroyImage(myximage); | |
176 mp_msg(MSGT_VO, MSGL_WARN, | |
177 "Shared memory error,disabling ( Ximage error )\n"); | |
178 goto shmemerror; | |
179 } | |
180 Shminfo[0].shmid = shmget(IPC_PRIVATE, | |
181 myximage->bytes_per_line * | |
182 myximage->height, IPC_CREAT | 0777); | |
183 if (Shminfo[0].shmid < 0) | |
184 { | |
185 XDestroyImage(myximage); | |
186 mp_msg(MSGT_VO, MSGL_V, "%s\n", strerror(errno)); | |
187 //perror( strerror( errno ) ); | |
188 mp_msg(MSGT_VO, MSGL_WARN, | |
189 "Shared memory error,disabling ( seg id error )\n"); | |
190 goto shmemerror; | |
191 } | |
192 Shminfo[0].shmaddr = (char *) shmat(Shminfo[0].shmid, 0, 0); | |
3209 | 193 |
12582 | 194 if (Shminfo[0].shmaddr == ((char *) -1)) |
195 { | |
196 XDestroyImage(myximage); | |
197 if (Shminfo[0].shmaddr != ((char *) -1)) | |
198 shmdt(Shminfo[0].shmaddr); | |
199 mp_msg(MSGT_VO, MSGL_WARN, | |
200 "Shared memory error,disabling ( address error )\n"); | |
201 goto shmemerror; | |
202 } | |
203 myximage->data = Shminfo[0].shmaddr; | |
204 ImageData = (unsigned char *) myximage->data; | |
205 Shminfo[0].readOnly = False; | |
206 XShmAttach(mDisplay, &Shminfo[0]); | |
4420
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
207 |
12582 | 208 XSync(mDisplay, False); |
4420
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
209 |
12582 | 210 if (gXErrorFlag) |
211 { | |
212 XDestroyImage(myximage); | |
213 shmdt(Shminfo[0].shmaddr); | |
214 mp_msg(MSGT_VO, MSGL_WARN, "Shared memory error,disabling.\n"); | |
215 gXErrorFlag = 0; | |
216 goto shmemerror; | |
217 } else | |
218 shmctl(Shminfo[0].shmid, IPC_RMID, 0); | |
219 | |
220 { | |
221 static int firstTime = 1; | |
4420
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
222 |
12582 | 223 if (firstTime) |
224 { | |
225 mp_msg(MSGT_VO, MSGL_V, "Sharing memory.\n"); | |
226 firstTime = 0; | |
227 } | |
228 } | |
229 } else | |
230 { | |
231 shmemerror: | |
232 Shmem_Flag = 0; | |
4420
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
233 #endif |
12582 | 234 myximage = XGetImage(mDisplay, vo_window, 0, 0, |
235 image_width, image_height, AllPlanes, | |
236 ZPixmap); | |
237 ImageData = myximage->data; | |
4420
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
238 #ifdef HAVE_SHM |
12582 | 239 } |
4420
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
240 #endif |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
241 } |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
242 |
17566
f580a7755ac5
Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents:
16171
diff
changeset
|
243 static void freeMyXImage(void) |
4420
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
244 { |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
245 #ifdef HAVE_SHM |
12582 | 246 if (Shmem_Flag) |
247 { | |
248 XShmDetach(mDisplay, &Shminfo[0]); | |
249 XDestroyImage(myximage); | |
250 shmdt(Shminfo[0].shmaddr); | |
251 } else | |
4420
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
252 #endif |
12582 | 253 { |
254 XDestroyImage(myximage); | |
255 } | |
256 myximage = NULL; | |
4420
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
257 } |
2218 | 258 |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15540
diff
changeset
|
259 static int config(uint32_t width, uint32_t height, uint32_t d_width, |
12582 | 260 uint32_t d_height, uint32_t flags, char *title, |
261 uint32_t format) | |
1 | 262 { |
1110 | 263 // int screen; |
12582 | 264 int fullscreen = 0; |
265 int vm = 0; | |
266 | |
1110 | 267 // int interval, prefer_blank, allow_exp, nothing; |
12582 | 268 unsigned int fg, bg; |
269 XEvent xev; | |
270 XGCValues xgcv; | |
271 Colormap theCmap; | |
272 XSetWindowAttributes xswa; | |
273 unsigned long xswamask; | |
274 | |
4426
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
275 #ifdef HAVE_XF86VM |
12582 | 276 unsigned int modeline_width, modeline_height; |
277 static uint32_t vm_width; | |
278 static uint32_t vm_height; | |
4426
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
279 #endif |
1 | 280 |
12582 | 281 vo_mouse_autohide = 1; |
282 old_vo_dwidth = -1; | |
283 old_vo_dheight = -1; | |
6013
7f6e02a16ac4
some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents:
5999
diff
changeset
|
284 |
12582 | 285 if (!title) |
17787 | 286 title = "MPlayer X11 (XImage/Shm) render"; |
4813 | 287 |
12582 | 288 in_format = format; |
289 srcW = width; | |
290 srcH = height; | |
18116 | 291 update_xinerama_info(); |
12582 | 292 vo_dx = (vo_screenwidth - d_width) / 2; |
293 vo_dy = (vo_screenheight - d_height) / 2; | |
294 geometry(&vo_dx, &vo_dy, &d_width, &d_height, vo_screenwidth, | |
295 vo_screenheight); | |
18116 | 296 vo_dx += xinerama_x; |
297 vo_dy += xinerama_y; | |
12582 | 298 vo_dwidth = d_width; |
299 vo_dheight = d_height; | |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10728
diff
changeset
|
300 |
15212
05aa13cdf92f
replace VO and VF numeric flags with #defined identifiers
henry
parents:
13787
diff
changeset
|
301 if (flags & (VOFLAG_FULLSCREEN|VOFLAG_MODESWITCHING)) |
12582 | 302 fullscreen = 1; |
15212
05aa13cdf92f
replace VO and VF numeric flags with #defined identifiers
henry
parents:
13787
diff
changeset
|
303 if (flags & VOFLAG_MODESWITCHING) |
12582 | 304 vm = 1; |
15212
05aa13cdf92f
replace VO and VF numeric flags with #defined identifiers
henry
parents:
13787
diff
changeset
|
305 if (flags & VOFLAG_FLIPPING) |
12582 | 306 Flip_Flag = 1; |
15212
05aa13cdf92f
replace VO and VF numeric flags with #defined identifiers
henry
parents:
13787
diff
changeset
|
307 zoomFlag = flags & VOFLAG_SWSCALE; |
12582 | 308 |
309 int_pause = 0; | |
4677
305a0c20bde4
default is allways nozoom again (specify -zoom if u want the sane behavior)
michael
parents:
4662
diff
changeset
|
310 // if(!fullscreen) zoomFlag=1; //it makes no sense to avoid zooming on windowd mode |
12582 | 311 |
2218 | 312 //printf( "w: %d h: %d\n\n",vo_dwidth,vo_dheight ); |
1746 | 313 |
12582 | 314 XGetWindowAttributes(mDisplay, mRootWin, &attribs); |
315 depth = attribs.depth; | |
316 | |
317 if (depth != 15 && depth != 16 && depth != 24 && depth != 32) | |
318 { | |
319 Visual *visual; | |
1746 | 320 |
12582 | 321 depth = vo_find_depth_from_visuals(mDisplay, mScreen, &visual); |
322 } | |
323 if (!XMatchVisualInfo(mDisplay, mScreen, depth, DirectColor, &vinfo) || | |
324 (WinID > 0 | |
325 && vinfo.visualid != XVisualIDFromVisual(attribs.visual))) | |
326 XMatchVisualInfo(mDisplay, mScreen, depth, TrueColor, &vinfo); | |
1746 | 327 |
12582 | 328 /* set image size (which is indeed neither the input nor output size), |
329 if zoom is on it will be changed during draw_slice anyway so we don't duplicate the aspect code here | |
330 */ | |
331 image_width = (width + 7) & (~7); | |
332 image_height = height; | |
4661
4df2400b0527
-fs and or -vm default is nozoom, -zoom does the expected thing
michael
parents:
4658
diff
changeset
|
333 |
12582 | 334 aspect = ((1 << 16) * d_width + d_height / 2) / d_height; |
2218 | 335 |
1752 | 336 #ifdef HAVE_NEW_GUI |
12582 | 337 if (use_gui) |
338 guiGetEvent(guiSetShVideo, 0); // the GUI will set up / resize the window | |
339 else | |
340 #endif | |
341 { | |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
342 #ifdef HAVE_XF86VM |
12582 | 343 if (vm) |
344 { | |
345 if ((d_width == 0) && (d_height == 0)) | |
346 { | |
347 vm_width = image_width; | |
348 vm_height = image_height; | |
349 } else | |
350 { | |
351 vm_width = d_width; | |
352 vm_height = d_height; | |
353 } | |
354 vo_vm_switch(vm_width, vm_height, &modeline_width, | |
355 &modeline_height); | |
356 vo_dx = (vo_screenwidth - modeline_width) / 2; | |
357 vo_dy = (vo_screenheight - modeline_height) / 2; | |
358 vo_dwidth = modeline_width; | |
359 vo_dheight = modeline_height; | |
360 } | |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
361 #endif |
12582 | 362 bg = WhitePixel(mDisplay, mScreen); |
363 fg = BlackPixel(mDisplay, mScreen); | |
1 | 364 |
12582 | 365 theCmap = vo_x11_create_colormap(&vinfo); |
1 | 366 |
12582 | 367 xswa.background_pixel = 0; |
368 xswa.border_pixel = 0; | |
369 xswa.colormap = theCmap; | |
370 xswamask = CWBackPixel | CWBorderPixel | CWColormap; | |
1 | 371 |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
372 #ifdef HAVE_XF86VM |
12582 | 373 if (vm) |
374 { | |
375 xswa.override_redirect = True; | |
376 xswamask |= CWOverrideRedirect; | |
377 } | |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
378 #endif |
12582 | 379 |
380 if (WinID >= 0) | |
381 { | |
382 vo_window = WinID ? ((Window) WinID) : mRootWin; | |
383 if (WinID) | |
384 { | |
15540 | 385 int border; |
386 Window win; | |
12582 | 387 XUnmapWindow(mDisplay, vo_window); |
388 XChangeWindowAttributes(mDisplay, vo_window, xswamask, | |
389 &xswa); | |
390 vo_x11_selectinput_witherr(mDisplay, vo_window, | |
391 StructureNotifyMask | | |
392 KeyPressMask | | |
393 PropertyChangeMask | | |
394 PointerMotionMask | | |
395 ButtonPressMask | | |
396 ButtonReleaseMask | | |
397 ExposureMask); | |
398 XMapWindow(mDisplay, vo_window); | |
15540 | 399 XGetGeometry(mDisplay, vo_window, &mRootWin, |
400 &vo_dx, &vo_dy, &vo_dwidth, &vo_dheight, | |
401 &border, &depth); | |
12582 | 402 } else |
403 XSelectInput(mDisplay, vo_window, ExposureMask); | |
404 } else | |
405 { | |
406 if (vo_window == None) | |
407 { | |
408 vo_window = | |
409 vo_x11_create_smooth_window(mDisplay, mRootWin, | |
410 vinfo.visual, vo_dx, vo_dy, | |
411 vo_dwidth, vo_dheight, | |
412 depth, theCmap); | |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
413 |
12582 | 414 vo_x11_classhint(mDisplay, vo_window, "x11"); |
415 vo_hidecursor(mDisplay, vo_window); | |
416 vo_x11_sizehint(vo_dx, vo_dy, vo_dwidth, vo_dheight, 0); | |
417 XSelectInput(mDisplay, vo_window, StructureNotifyMask); | |
418 XStoreName(mDisplay, vo_window, title); | |
419 XMapWindow(mDisplay, vo_window); | |
7764 | 420 // if(WinID!=0) |
12582 | 421 do |
422 { | |
423 XNextEvent(mDisplay, &xev); | |
424 } | |
425 while (xev.type != MapNotify | |
426 || xev.xmap.event != vo_window); | |
427 | |
18715
30d7ddf08889
Fix window position when changing videos while in fullscreen and for
reimar
parents:
18234
diff
changeset
|
428 vo_x11_nofs_sizepos(vo_dx, vo_dy, vo_dwidth, vo_dheight); |
12582 | 429 if (fullscreen) |
430 vo_x11_fullscreen(); | |
18715
30d7ddf08889
Fix window position when changing videos while in fullscreen and for
reimar
parents:
18234
diff
changeset
|
431 } else |
30d7ddf08889
Fix window position when changing videos while in fullscreen and for
reimar
parents:
18234
diff
changeset
|
432 vo_x11_nofs_sizepos(vo_dx, vo_dy, vo_dwidth, vo_dheight); |
12582 | 433 } |
6043 | 434 |
12582 | 435 XSync(mDisplay, False); |
1 | 436 |
12582 | 437 // we cannot grab mouse events on root window :( |
438 vo_x11_selectinput_witherr(mDisplay, vo_window, | |
439 StructureNotifyMask | KeyPressMask | | |
440 PropertyChangeMask | ExposureMask | | |
441 ((WinID == | |
442 0) ? 0 : (ButtonPressMask | | |
443 ButtonReleaseMask | | |
444 PointerMotionMask))); | |
4805 | 445 |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
446 #ifdef HAVE_XF86VM |
12582 | 447 if (vm) |
448 { | |
449 /* Grab the mouse pointer in our window */ | |
450 if (vo_grabpointer) | |
451 XGrabPointer(mDisplay, vo_window, True, 0, | |
452 GrabModeAsync, GrabModeAsync, | |
453 vo_window, None, CurrentTime); | |
454 XSetInputFocus(mDisplay, vo_window, RevertToNone, CurrentTime); | |
455 } | |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
456 #endif |
12582 | 457 } |
1 | 458 |
12582 | 459 if (vo_gc != None) |
460 XFreeGC(mDisplay, vo_gc); | |
461 vo_gc = XCreateGC(mDisplay, vo_window, 0L, &xgcv); | |
462 | |
463 if (myximage) | |
464 { | |
465 freeMyXImage(); | |
466 sws_freeContext(swsContext); | |
467 } | |
468 getMyXImage(); | |
469 | |
470 if (!WinID) | |
471 { | |
472 vo_dwidth = vo_screenwidth; | |
473 vo_dheight = vo_screenheight; | |
474 } | |
1 | 475 |
12582 | 476 switch ((bpp = myximage->bits_per_pixel)) |
477 { | |
478 case 24: | |
479 draw_alpha_fnc = draw_alpha_24; | |
480 out_format = IMGFMT_BGR24; | |
481 break; | |
482 case 32: | |
483 draw_alpha_fnc = draw_alpha_32; | |
484 out_format = IMGFMT_BGR32; | |
485 break; | |
486 case 15: | |
487 case 16: | |
488 if (depth == 15) | |
489 { | |
490 draw_alpha_fnc = draw_alpha_15; | |
491 out_format = IMGFMT_BGR15; | |
492 } else | |
493 { | |
494 draw_alpha_fnc = draw_alpha_16; | |
495 out_format = IMGFMT_BGR16; | |
496 } | |
497 break; | |
498 case 8: | |
499 draw_alpha_fnc = draw_alpha_null; | |
500 out_format = IMGFMT_BGR8; | |
501 break; | |
502 default: | |
503 draw_alpha_fnc = draw_alpha_null; | |
504 } | |
1 | 505 |
12582 | 506 /* always allocate swsContext as size could change between frames */ |
507 swsContext = | |
508 sws_getContextFromCmdLine(width, height, in_format, width, height, | |
509 out_format); | |
510 if (!swsContext) | |
511 return -1; | |
1 | 512 |
18746 | 513 dst_width = width; |
12582 | 514 //printf( "X11 bpp: %d color mask: R:%lX G:%lX B:%lX\n",bpp,myximage->red_mask,myximage->green_mask,myximage->blue_mask ); |
1 | 515 |
12582 | 516 // If we have blue in the lowest bit then obviously RGB |
517 mode = ((myximage->blue_mask & 0x01) != 0) ? MODE_RGB : MODE_BGR; | |
1 | 518 #ifdef WORDS_BIGENDIAN |
12582 | 519 if (myximage->byte_order != MSBFirst) |
1 | 520 #else |
12582 | 521 if (myximage->byte_order != LSBFirst) |
1 | 522 #endif |
12582 | 523 { |
524 mode = ((myximage->blue_mask & 0x01) != 0) ? MODE_BGR : MODE_RGB; | |
4382 | 525 // printf( "No support for non-native XImage byte order!\n" ); |
1137
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
1110
diff
changeset
|
526 // return -1; |
12582 | 527 } |
5248
f23cea00d19c
print meaningfull error message instead of "hmm, arpi said that isnt used...
michael
parents:
5163
diff
changeset
|
528 #ifdef WORDS_BIGENDIAN |
12582 | 529 if (mode == MODE_BGR && bpp != 32) |
530 { | |
531 mp_msg(MSGT_VO, MSGL_ERR, | |
532 "BGR%d not supported, please contact the developers\n", | |
533 bpp); | |
534 return -1; | |
535 } | |
5248
f23cea00d19c
print meaningfull error message instead of "hmm, arpi said that isnt used...
michael
parents:
5163
diff
changeset
|
536 #else |
12582 | 537 if (mode == MODE_BGR) |
538 { | |
539 mp_msg(MSGT_VO, MSGL_ERR, | |
540 "BGR not supported, please contact the developers\n"); | |
541 return -1; | |
542 } | |
543 #endif | |
1 | 544 |
12582 | 545 if (vo_ontop) |
546 vo_x11_setlayer(mDisplay, vo_window, vo_ontop); | |
11542 | 547 |
12582 | 548 return 0; |
1 | 549 } |
550 | |
12582 | 551 static void Display_Image(XImage * myximage, uint8_t * ImageData) |
1 | 552 { |
3003 | 553 #ifdef HAVE_SHM |
12582 | 554 if (Shmem_Flag) |
555 { | |
556 XShmPutImage(mDisplay, vo_window, vo_gc, myximage, | |
557 0, 0, | |
18746 | 558 (vo_dwidth - dst_width) / 2, |
559 (vo_dheight - myximage->height) / 2, dst_width, | |
12582 | 560 myximage->height, True); |
561 } else | |
1 | 562 #endif |
12582 | 563 { |
564 XPutImage(mDisplay, vo_window, vo_gc, myximage, | |
565 0, 0, | |
18746 | 566 (vo_dwidth - dst_width) / 2, |
567 (vo_dheight - myximage->height) / 2, dst_width, | |
12582 | 568 myximage->height); |
569 } | |
1 | 570 } |
571 | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1137
diff
changeset
|
572 static void draw_osd(void) |
12582 | 573 { |
574 vo_draw_text(image_width, image_height, draw_alpha_fnc); | |
575 } | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1137
diff
changeset
|
576 |
12582 | 577 static void flip_page(void) |
578 { | |
579 Display_Image(myximage, ImageData); | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1137
diff
changeset
|
580 XSync(mDisplay, False); |
31 | 581 } |
1 | 582 |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15540
diff
changeset
|
583 static int draw_slice(uint8_t * src[], int stride[], int w, int h, |
12582 | 584 int x, int y) |
1 | 585 { |
12582 | 586 uint8_t *dst[3]; |
587 int dstStride[3]; | |
6059 | 588 |
12582 | 589 if ((old_vo_dwidth != vo_dwidth |
590 || old_vo_dheight != vo_dheight) /*&& y==0 */ && zoomFlag) | |
591 { | |
592 int newW = vo_dwidth; | |
593 int newH = vo_dheight; | |
594 int newAspect = (newW * (1 << 16) + (newH >> 1)) / newH; | |
18746 | 595 struct SwsContext *oldContext = swsContext; |
4641 | 596 |
12582 | 597 if (newAspect > aspect) |
598 newW = (newH * aspect + (1 << 15)) >> 16; | |
599 else | |
600 newH = ((newW << 16) + (aspect >> 1)) / aspect; | |
4641 | 601 |
12582 | 602 old_vo_dwidth = vo_dwidth; |
603 old_vo_dheight = vo_dheight; | |
604 | |
605 if (sws_flags == 0) | |
606 newW &= (~31); // not needed but, if the user wants the FAST_BILINEAR SCALER, then its needed | |
4627 | 607 |
12582 | 608 swsContext = sws_getContextFromCmdLine(srcW, srcH, in_format, |
609 newW, newH, out_format); | |
610 if (swsContext) | |
611 { | |
612 image_width = (newW + 7) & (~7); | |
613 image_height = newH; | |
4420
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
614 |
12582 | 615 freeMyXImage(); |
616 getMyXImage(); | |
617 sws_freeContext(oldContext); | |
618 } else | |
619 { | |
620 swsContext = oldContext; | |
621 } | |
18746 | 622 dst_width = newW; |
12582 | 623 } |
624 dstStride[1] = dstStride[2] = 0; | |
625 dst[1] = dst[2] = NULL; | |
626 | |
627 if (Flip_Flag) | |
628 { | |
629 dstStride[0] = -image_width * ((bpp + 7) / 8); | |
630 dst[0] = ImageData - dstStride[0] * (image_height - 1); | |
631 sws_scale_ordered(swsContext, src, stride, y, h, dst, dstStride); | |
632 } else | |
633 { | |
634 dstStride[0] = image_width * ((bpp + 7) / 8); | |
635 dst[0] = ImageData; | |
636 sws_scale_ordered(swsContext, src, stride, y, h, dst, dstStride); | |
637 } | |
638 return 0; | |
1 | 639 } |
640 | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15540
diff
changeset
|
641 static int draw_frame(uint8_t * src[]) |
12582 | 642 { |
7683 | 643 #if 0 |
12582 | 644 int stride[3] = { 0, 0, 0 }; |
645 | |
646 if (in_format == IMGFMT_YUY2) | |
647 stride[0] = srcW * 2; | |
648 else if (in_format == IMGFMT_BGR8) | |
649 stride[0] = srcW; | |
650 else if (in_format == IMGFMT_BGR15) | |
651 stride[0] = srcW * 2; | |
652 else if (in_format == IMGFMT_BGR16) | |
653 stride[0] = srcW * 2; | |
654 else if (in_format == IMGFMT_BGR24) | |
655 stride[0] = srcW * 3; | |
656 else if (in_format == IMGFMT_BGR32) | |
657 stride[0] = srcW * 4; | |
658 | |
659 return draw_slice(src, stride, srcW, srcH, 0, 0); | |
7683 | 660 #else |
18234
a107276371a8
Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents:
18116
diff
changeset
|
661 mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_X11_DrawFrameCalled); |
7683 | 662 return -1; |
663 #endif | |
664 } | |
665 | |
12582 | 666 static uint32_t get_image(mp_image_t * mpi) |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
667 { |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
668 if (zoomFlag || |
12582 | 669 !IMGFMT_IS_BGR(mpi->imgfmt) || |
670 (IMGFMT_BGR_DEPTH(mpi->imgfmt) != vo_depthonscreen) || | |
671 ((mpi->type != MP_IMGTYPE_STATIC) | |
672 && (mpi->type != MP_IMGTYPE_TEMP)) | |
673 || (mpi->flags & MP_IMGFLAG_PLANAR) | |
674 || (mpi->flags & MP_IMGFLAG_YUV) || (mpi->width != image_width) | |
675 || (mpi->height != image_height)) | |
676 return (VO_FALSE); | |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
677 |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
678 if (Flip_Flag) |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
679 { |
12582 | 680 mpi->stride[0] = -image_width * ((bpp + 7) / 8); |
681 mpi->planes[0] = ImageData - mpi->stride[0] * (image_height - 1); | |
682 } else | |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
683 { |
12582 | 684 mpi->stride[0] = image_width * ((bpp + 7) / 8); |
685 mpi->planes[0] = ImageData; | |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
686 } |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
687 mpi->flags |= MP_IMGFLAG_DIRECT; |
12582 | 688 |
689 return (VO_TRUE); | |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
690 } |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
691 |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15540
diff
changeset
|
692 static int query_format(uint32_t format) |
1 | 693 { |
12582 | 694 mp_msg(MSGT_VO, MSGL_DBG2, |
695 "vo_x11: query_format was called: %x (%s)\n", format, | |
696 vo_format_name(format)); | |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
697 if (IMGFMT_IS_BGR(format)) |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
698 { |
12582 | 699 if (IMGFMT_BGR_DEPTH(format) <= 8) |
700 return 0; // TODO 8bpp not yet fully implemented | |
701 if (IMGFMT_BGR_DEPTH(format) == vo_depthonscreen) | |
15212
05aa13cdf92f
replace VO and VF numeric flags with #defined identifiers
henry
parents:
13787
diff
changeset
|
702 return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_OSD | VFCAP_SWSCALE | VFCAP_FLIP | |
12582 | 703 VFCAP_ACCEPT_STRIDE; |
704 else | |
15212
05aa13cdf92f
replace VO and VF numeric flags with #defined identifiers
henry
parents:
13787
diff
changeset
|
705 return VFCAP_CSP_SUPPORTED | VFCAP_OSD | VFCAP_SWSCALE | VFCAP_FLIP | |
12582 | 706 VFCAP_ACCEPT_STRIDE; |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
707 } |
325 | 708 |
12582 | 709 switch (format) |
710 { | |
6692
ad521fb49a5e
-vm -fs -zoom fix, set correct vm screenres in aspect code (similar to xv fix).
atmos4
parents:
6180
diff
changeset
|
711 // case IMGFMT_BGR8: |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
712 // case IMGFMT_BGR15: |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
713 // case IMGFMT_BGR16: |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
714 // case IMGFMT_BGR24: |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
715 // case IMGFMT_BGR32: |
6694
9291268a3603
1000l, back out hack-n-slay 8bpp code from my local tree.
atmos4
parents:
6693
diff
changeset
|
716 // return 0x2; |
4905
eb1a28f1236a
yuy2 support disabled to workaround stupid colorspace selection
michael
parents:
4889
diff
changeset
|
717 // case IMGFMT_YUY2: |
12582 | 718 case IMGFMT_I420: |
719 case IMGFMT_IYUV: | |
720 case IMGFMT_YV12: | |
15212
05aa13cdf92f
replace VO and VF numeric flags with #defined identifiers
henry
parents:
13787
diff
changeset
|
721 return VFCAP_CSP_SUPPORTED | VFCAP_OSD | VFCAP_SWSCALE | VFCAP_ACCEPT_STRIDE; |
12582 | 722 } |
723 return 0; | |
1 | 724 } |
725 | |
726 | |
7683 | 727 static void uninit(void) |
1 | 728 { |
12582 | 729 if (!myximage) |
730 return; | |
731 | |
732 freeMyXImage(); | |
4426
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
733 |
206
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
734 #ifdef HAVE_XF86VM |
12582 | 735 vo_vm_close(mDisplay); |
206
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
736 #endif |
4426
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
737 |
12582 | 738 zoomFlag = 0; |
739 vo_x11_uninit(); | |
4677
305a0c20bde4
default is allways nozoom again (specify -zoom if u want the sane behavior)
michael
parents:
4662
diff
changeset
|
740 |
12582 | 741 sws_freeContext(swsContext); |
1 | 742 } |
743 | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15540
diff
changeset
|
744 static int preinit(const char *arg) |
4352 | 745 { |
12582 | 746 if (arg) |
4737
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4734
diff
changeset
|
747 { |
12582 | 748 mp_msg(MSGT_VO, MSGL_ERR, "vo_x11: Unknown subdevice: %s\n", arg); |
749 return ENOSYS; | |
4737
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4734
diff
changeset
|
750 } |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
751 |
12582 | 752 if (!vo_init()) |
753 return -1; // Can't open X11 | |
4737
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4734
diff
changeset
|
754 return 0; |
4352 | 755 } |
1 | 756 |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15540
diff
changeset
|
757 static int control(uint32_t request, void *data, ...) |
4352 | 758 { |
12582 | 759 switch (request) |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7765
diff
changeset
|
760 { |
12582 | 761 case VOCTRL_PAUSE: |
762 return (int_pause = 1); | |
763 case VOCTRL_RESUME: | |
764 return (int_pause = 0); | |
765 case VOCTRL_QUERY_FORMAT: | |
766 return query_format(*((uint32_t *) data)); | |
767 case VOCTRL_GUISUPPORT: | |
768 return VO_TRUE; | |
769 case VOCTRL_GET_IMAGE: | |
770 return get_image(data); | |
771 case VOCTRL_SET_EQUALIZER: | |
772 { | |
773 va_list ap; | |
774 int value; | |
775 | |
776 va_start(ap, data); | |
777 value = va_arg(ap, int); | |
778 | |
779 va_end(ap); | |
780 return vo_x11_set_equalizer(data, value); | |
781 } | |
782 case VOCTRL_GET_EQUALIZER: | |
783 { | |
784 va_list ap; | |
785 int *value; | |
786 | |
787 va_start(ap, data); | |
788 value = va_arg(ap, int *); | |
789 | |
790 va_end(ap); | |
791 return vo_x11_get_equalizer(data, value); | |
792 } | |
793 case VOCTRL_ONTOP: | |
794 vo_x11_ontop(); | |
795 return VO_TRUE; | |
796 case VOCTRL_FULLSCREEN: | |
797 { | |
798 vo_x11_fullscreen(); | |
799 vo_x11_clearwindow(mDisplay, vo_window); | |
800 } | |
801 return VO_TRUE; | |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7765
diff
changeset
|
802 } |
12582 | 803 return VO_NOTIMPL; |
4352 | 804 } |