Mercurial > mplayer.hg
annotate libvo/vo_x11.c @ 19349:dd724d088ff1
remove trailing spaces + remove some obviously redudant words
author | gpoirier |
---|---|
date | Mon, 07 Aug 2006 13:31:18 +0000 |
parents | 6a08d0dabca8 |
children | 08c72bfa73e3 |
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; |
12582 | 386 XUnmapWindow(mDisplay, vo_window); |
387 XChangeWindowAttributes(mDisplay, vo_window, xswamask, | |
388 &xswa); | |
389 vo_x11_selectinput_witherr(mDisplay, vo_window, | |
390 StructureNotifyMask | | |
391 KeyPressMask | | |
392 PropertyChangeMask | | |
393 PointerMotionMask | | |
394 ButtonPressMask | | |
395 ButtonReleaseMask | | |
396 ExposureMask); | |
397 XMapWindow(mDisplay, vo_window); | |
15540 | 398 XGetGeometry(mDisplay, vo_window, &mRootWin, |
399 &vo_dx, &vo_dy, &vo_dwidth, &vo_dheight, | |
400 &border, &depth); | |
12582 | 401 } else |
402 XSelectInput(mDisplay, vo_window, ExposureMask); | |
403 } else | |
404 { | |
405 if (vo_window == None) | |
406 { | |
407 vo_window = | |
408 vo_x11_create_smooth_window(mDisplay, mRootWin, | |
409 vinfo.visual, vo_dx, vo_dy, | |
410 vo_dwidth, vo_dheight, | |
411 depth, theCmap); | |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
412 |
12582 | 413 vo_x11_classhint(mDisplay, vo_window, "x11"); |
414 vo_hidecursor(mDisplay, vo_window); | |
415 vo_x11_sizehint(vo_dx, vo_dy, vo_dwidth, vo_dheight, 0); | |
416 XSelectInput(mDisplay, vo_window, StructureNotifyMask); | |
417 XStoreName(mDisplay, vo_window, title); | |
418 XMapWindow(mDisplay, vo_window); | |
7764 | 419 // if(WinID!=0) |
12582 | 420 do |
421 { | |
422 XNextEvent(mDisplay, &xev); | |
423 } | |
424 while (xev.type != MapNotify | |
425 || xev.xmap.event != vo_window); | |
426 | |
18715
30d7ddf08889
Fix window position when changing videos while in fullscreen and for
reimar
parents:
18234
diff
changeset
|
427 vo_x11_nofs_sizepos(vo_dx, vo_dy, vo_dwidth, vo_dheight); |
12582 | 428 if (fullscreen) |
429 vo_x11_fullscreen(); | |
18715
30d7ddf08889
Fix window position when changing videos while in fullscreen and for
reimar
parents:
18234
diff
changeset
|
430 } else |
30d7ddf08889
Fix window position when changing videos while in fullscreen and for
reimar
parents:
18234
diff
changeset
|
431 vo_x11_nofs_sizepos(vo_dx, vo_dy, vo_dwidth, vo_dheight); |
12582 | 432 } |
6043 | 433 |
12582 | 434 XSync(mDisplay, False); |
1 | 435 |
12582 | 436 // we cannot grab mouse events on root window :( |
437 vo_x11_selectinput_witherr(mDisplay, vo_window, | |
438 StructureNotifyMask | KeyPressMask | | |
439 PropertyChangeMask | ExposureMask | | |
440 ((WinID == | |
441 0) ? 0 : (ButtonPressMask | | |
442 ButtonReleaseMask | | |
443 PointerMotionMask))); | |
4805 | 444 |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
445 #ifdef HAVE_XF86VM |
12582 | 446 if (vm) |
447 { | |
448 /* Grab the mouse pointer in our window */ | |
449 if (vo_grabpointer) | |
450 XGrabPointer(mDisplay, vo_window, True, 0, | |
451 GrabModeAsync, GrabModeAsync, | |
452 vo_window, None, CurrentTime); | |
453 XSetInputFocus(mDisplay, vo_window, RevertToNone, CurrentTime); | |
454 } | |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
455 #endif |
12582 | 456 } |
1 | 457 |
12582 | 458 if (vo_gc != None) |
459 XFreeGC(mDisplay, vo_gc); | |
460 vo_gc = XCreateGC(mDisplay, vo_window, 0L, &xgcv); | |
461 | |
462 if (myximage) | |
463 { | |
464 freeMyXImage(); | |
465 sws_freeContext(swsContext); | |
466 } | |
467 getMyXImage(); | |
468 | |
469 if (!WinID) | |
470 { | |
471 vo_dwidth = vo_screenwidth; | |
472 vo_dheight = vo_screenheight; | |
473 } | |
1 | 474 |
12582 | 475 switch ((bpp = myximage->bits_per_pixel)) |
476 { | |
477 case 24: | |
478 draw_alpha_fnc = draw_alpha_24; | |
479 out_format = IMGFMT_BGR24; | |
480 break; | |
481 case 32: | |
482 draw_alpha_fnc = draw_alpha_32; | |
483 out_format = IMGFMT_BGR32; | |
484 break; | |
485 case 15: | |
486 case 16: | |
487 if (depth == 15) | |
488 { | |
489 draw_alpha_fnc = draw_alpha_15; | |
490 out_format = IMGFMT_BGR15; | |
491 } else | |
492 { | |
493 draw_alpha_fnc = draw_alpha_16; | |
494 out_format = IMGFMT_BGR16; | |
495 } | |
496 break; | |
497 case 8: | |
498 draw_alpha_fnc = draw_alpha_null; | |
499 out_format = IMGFMT_BGR8; | |
500 break; | |
501 default: | |
502 draw_alpha_fnc = draw_alpha_null; | |
503 } | |
1 | 504 |
12582 | 505 /* always allocate swsContext as size could change between frames */ |
506 swsContext = | |
507 sws_getContextFromCmdLine(width, height, in_format, width, height, | |
508 out_format); | |
509 if (!swsContext) | |
510 return -1; | |
1 | 511 |
18746 | 512 dst_width = width; |
12582 | 513 //printf( "X11 bpp: %d color mask: R:%lX G:%lX B:%lX\n",bpp,myximage->red_mask,myximage->green_mask,myximage->blue_mask ); |
1 | 514 |
12582 | 515 // If we have blue in the lowest bit then obviously RGB |
516 mode = ((myximage->blue_mask & 0x01) != 0) ? MODE_RGB : MODE_BGR; | |
1 | 517 #ifdef WORDS_BIGENDIAN |
12582 | 518 if (myximage->byte_order != MSBFirst) |
1 | 519 #else |
12582 | 520 if (myximage->byte_order != LSBFirst) |
1 | 521 #endif |
12582 | 522 { |
523 mode = ((myximage->blue_mask & 0x01) != 0) ? MODE_BGR : MODE_RGB; | |
4382 | 524 // 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
|
525 // return -1; |
12582 | 526 } |
5248
f23cea00d19c
print meaningfull error message instead of "hmm, arpi said that isnt used...
michael
parents:
5163
diff
changeset
|
527 #ifdef WORDS_BIGENDIAN |
12582 | 528 if (mode == MODE_BGR && bpp != 32) |
529 { | |
530 mp_msg(MSGT_VO, MSGL_ERR, | |
531 "BGR%d not supported, please contact the developers\n", | |
532 bpp); | |
533 return -1; | |
534 } | |
5248
f23cea00d19c
print meaningfull error message instead of "hmm, arpi said that isnt used...
michael
parents:
5163
diff
changeset
|
535 #else |
12582 | 536 if (mode == MODE_BGR) |
537 { | |
538 mp_msg(MSGT_VO, MSGL_ERR, | |
539 "BGR not supported, please contact the developers\n"); | |
540 return -1; | |
541 } | |
542 #endif | |
1 | 543 |
12582 | 544 if (vo_ontop) |
545 vo_x11_setlayer(mDisplay, vo_window, vo_ontop); | |
11542 | 546 |
12582 | 547 return 0; |
1 | 548 } |
549 | |
12582 | 550 static void Display_Image(XImage * myximage, uint8_t * ImageData) |
1 | 551 { |
3003 | 552 #ifdef HAVE_SHM |
12582 | 553 if (Shmem_Flag) |
554 { | |
555 XShmPutImage(mDisplay, vo_window, vo_gc, myximage, | |
556 0, 0, | |
18746 | 557 (vo_dwidth - dst_width) / 2, |
558 (vo_dheight - myximage->height) / 2, dst_width, | |
12582 | 559 myximage->height, True); |
560 } else | |
1 | 561 #endif |
12582 | 562 { |
563 XPutImage(mDisplay, vo_window, vo_gc, myximage, | |
564 0, 0, | |
18746 | 565 (vo_dwidth - dst_width) / 2, |
566 (vo_dheight - myximage->height) / 2, dst_width, | |
12582 | 567 myximage->height); |
568 } | |
1 | 569 } |
570 | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1137
diff
changeset
|
571 static void draw_osd(void) |
12582 | 572 { |
573 vo_draw_text(image_width, image_height, draw_alpha_fnc); | |
574 } | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1137
diff
changeset
|
575 |
12582 | 576 static void flip_page(void) |
577 { | |
578 Display_Image(myximage, ImageData); | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1137
diff
changeset
|
579 XSync(mDisplay, False); |
31 | 580 } |
1 | 581 |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15540
diff
changeset
|
582 static int draw_slice(uint8_t * src[], int stride[], int w, int h, |
12582 | 583 int x, int y) |
1 | 584 { |
12582 | 585 uint8_t *dst[3]; |
586 int dstStride[3]; | |
6059 | 587 |
12582 | 588 if ((old_vo_dwidth != vo_dwidth |
589 || old_vo_dheight != vo_dheight) /*&& y==0 */ && zoomFlag) | |
590 { | |
591 int newW = vo_dwidth; | |
592 int newH = vo_dheight; | |
593 int newAspect = (newW * (1 << 16) + (newH >> 1)) / newH; | |
18746 | 594 struct SwsContext *oldContext = swsContext; |
4641 | 595 |
12582 | 596 if (newAspect > aspect) |
597 newW = (newH * aspect + (1 << 15)) >> 16; | |
598 else | |
599 newH = ((newW << 16) + (aspect >> 1)) / aspect; | |
4641 | 600 |
12582 | 601 old_vo_dwidth = vo_dwidth; |
602 old_vo_dheight = vo_dheight; | |
603 | |
604 if (sws_flags == 0) | |
605 newW &= (~31); // not needed but, if the user wants the FAST_BILINEAR SCALER, then its needed | |
4627 | 606 |
12582 | 607 swsContext = sws_getContextFromCmdLine(srcW, srcH, in_format, |
608 newW, newH, out_format); | |
609 if (swsContext) | |
610 { | |
611 image_width = (newW + 7) & (~7); | |
612 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
|
613 |
12582 | 614 freeMyXImage(); |
615 getMyXImage(); | |
616 sws_freeContext(oldContext); | |
617 } else | |
618 { | |
619 swsContext = oldContext; | |
620 } | |
18746 | 621 dst_width = newW; |
12582 | 622 } |
623 dstStride[1] = dstStride[2] = 0; | |
624 dst[1] = dst[2] = NULL; | |
625 | |
626 if (Flip_Flag) | |
627 { | |
628 dstStride[0] = -image_width * ((bpp + 7) / 8); | |
629 dst[0] = ImageData - dstStride[0] * (image_height - 1); | |
630 sws_scale_ordered(swsContext, src, stride, y, h, dst, dstStride); | |
631 } else | |
632 { | |
633 dstStride[0] = image_width * ((bpp + 7) / 8); | |
634 dst[0] = ImageData; | |
635 sws_scale_ordered(swsContext, src, stride, y, h, dst, dstStride); | |
636 } | |
637 return 0; | |
1 | 638 } |
639 | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15540
diff
changeset
|
640 static int draw_frame(uint8_t * src[]) |
12582 | 641 { |
7683 | 642 #if 0 |
12582 | 643 int stride[3] = { 0, 0, 0 }; |
644 | |
645 if (in_format == IMGFMT_YUY2) | |
646 stride[0] = srcW * 2; | |
647 else if (in_format == IMGFMT_BGR8) | |
648 stride[0] = srcW; | |
649 else if (in_format == IMGFMT_BGR15) | |
650 stride[0] = srcW * 2; | |
651 else if (in_format == IMGFMT_BGR16) | |
652 stride[0] = srcW * 2; | |
653 else if (in_format == IMGFMT_BGR24) | |
654 stride[0] = srcW * 3; | |
655 else if (in_format == IMGFMT_BGR32) | |
656 stride[0] = srcW * 4; | |
657 | |
658 return draw_slice(src, stride, srcW, srcH, 0, 0); | |
7683 | 659 #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
|
660 mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_X11_DrawFrameCalled); |
7683 | 661 return -1; |
662 #endif | |
663 } | |
664 | |
12582 | 665 static uint32_t get_image(mp_image_t * mpi) |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
666 { |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
667 if (zoomFlag || |
12582 | 668 !IMGFMT_IS_BGR(mpi->imgfmt) || |
669 (IMGFMT_BGR_DEPTH(mpi->imgfmt) != vo_depthonscreen) || | |
670 ((mpi->type != MP_IMGTYPE_STATIC) | |
671 && (mpi->type != MP_IMGTYPE_TEMP)) | |
672 || (mpi->flags & MP_IMGFLAG_PLANAR) | |
673 || (mpi->flags & MP_IMGFLAG_YUV) || (mpi->width != image_width) | |
674 || (mpi->height != image_height)) | |
675 return (VO_FALSE); | |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
676 |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
677 if (Flip_Flag) |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
678 { |
12582 | 679 mpi->stride[0] = -image_width * ((bpp + 7) / 8); |
680 mpi->planes[0] = ImageData - mpi->stride[0] * (image_height - 1); | |
681 } else | |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
682 { |
12582 | 683 mpi->stride[0] = image_width * ((bpp + 7) / 8); |
684 mpi->planes[0] = ImageData; | |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
685 } |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
686 mpi->flags |= MP_IMGFLAG_DIRECT; |
12582 | 687 |
688 return (VO_TRUE); | |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
689 } |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
690 |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15540
diff
changeset
|
691 static int query_format(uint32_t format) |
1 | 692 { |
12582 | 693 mp_msg(MSGT_VO, MSGL_DBG2, |
694 "vo_x11: query_format was called: %x (%s)\n", format, | |
695 vo_format_name(format)); | |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
696 if (IMGFMT_IS_BGR(format)) |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
697 { |
12582 | 698 if (IMGFMT_BGR_DEPTH(format) <= 8) |
699 return 0; // TODO 8bpp not yet fully implemented | |
700 if (IMGFMT_BGR_DEPTH(format) == vo_depthonscreen) | |
15212
05aa13cdf92f
replace VO and VF numeric flags with #defined identifiers
henry
parents:
13787
diff
changeset
|
701 return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_OSD | VFCAP_SWSCALE | VFCAP_FLIP | |
12582 | 702 VFCAP_ACCEPT_STRIDE; |
703 else | |
15212
05aa13cdf92f
replace VO and VF numeric flags with #defined identifiers
henry
parents:
13787
diff
changeset
|
704 return VFCAP_CSP_SUPPORTED | VFCAP_OSD | VFCAP_SWSCALE | VFCAP_FLIP | |
12582 | 705 VFCAP_ACCEPT_STRIDE; |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
706 } |
325 | 707 |
12582 | 708 switch (format) |
709 { | |
6692
ad521fb49a5e
-vm -fs -zoom fix, set correct vm screenres in aspect code (similar to xv fix).
atmos4
parents:
6180
diff
changeset
|
710 // case IMGFMT_BGR8: |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
711 // case IMGFMT_BGR15: |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
712 // case IMGFMT_BGR16: |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
713 // case IMGFMT_BGR24: |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
714 // case IMGFMT_BGR32: |
6694
9291268a3603
1000l, back out hack-n-slay 8bpp code from my local tree.
atmos4
parents:
6693
diff
changeset
|
715 // return 0x2; |
4905
eb1a28f1236a
yuy2 support disabled to workaround stupid colorspace selection
michael
parents:
4889
diff
changeset
|
716 // case IMGFMT_YUY2: |
12582 | 717 case IMGFMT_I420: |
718 case IMGFMT_IYUV: | |
719 case IMGFMT_YV12: | |
15212
05aa13cdf92f
replace VO and VF numeric flags with #defined identifiers
henry
parents:
13787
diff
changeset
|
720 return VFCAP_CSP_SUPPORTED | VFCAP_OSD | VFCAP_SWSCALE | VFCAP_ACCEPT_STRIDE; |
12582 | 721 } |
722 return 0; | |
1 | 723 } |
724 | |
725 | |
7683 | 726 static void uninit(void) |
1 | 727 { |
12582 | 728 if (!myximage) |
729 return; | |
730 | |
731 freeMyXImage(); | |
4426
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
732 |
206
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
733 #ifdef HAVE_XF86VM |
12582 | 734 vo_vm_close(mDisplay); |
206
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
735 #endif |
4426
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
736 |
12582 | 737 zoomFlag = 0; |
738 vo_x11_uninit(); | |
4677
305a0c20bde4
default is allways nozoom again (specify -zoom if u want the sane behavior)
michael
parents:
4662
diff
changeset
|
739 |
12582 | 740 sws_freeContext(swsContext); |
1 | 741 } |
742 | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15540
diff
changeset
|
743 static int preinit(const char *arg) |
4352 | 744 { |
12582 | 745 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
|
746 { |
12582 | 747 mp_msg(MSGT_VO, MSGL_ERR, "vo_x11: Unknown subdevice: %s\n", arg); |
748 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
|
749 } |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
750 |
12582 | 751 if (!vo_init()) |
752 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
|
753 return 0; |
4352 | 754 } |
1 | 755 |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15540
diff
changeset
|
756 static int control(uint32_t request, void *data, ...) |
4352 | 757 { |
12582 | 758 switch (request) |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7765
diff
changeset
|
759 { |
12582 | 760 case VOCTRL_PAUSE: |
761 return (int_pause = 1); | |
762 case VOCTRL_RESUME: | |
763 return (int_pause = 0); | |
764 case VOCTRL_QUERY_FORMAT: | |
765 return query_format(*((uint32_t *) data)); | |
766 case VOCTRL_GUISUPPORT: | |
767 return VO_TRUE; | |
768 case VOCTRL_GET_IMAGE: | |
769 return get_image(data); | |
770 case VOCTRL_SET_EQUALIZER: | |
771 { | |
772 va_list ap; | |
773 int value; | |
774 | |
775 va_start(ap, data); | |
776 value = va_arg(ap, int); | |
777 | |
778 va_end(ap); | |
779 return vo_x11_set_equalizer(data, value); | |
780 } | |
781 case VOCTRL_GET_EQUALIZER: | |
782 { | |
783 va_list ap; | |
784 int *value; | |
785 | |
786 va_start(ap, data); | |
787 value = va_arg(ap, int *); | |
788 | |
789 va_end(ap); | |
790 return vo_x11_get_equalizer(data, value); | |
791 } | |
792 case VOCTRL_ONTOP: | |
793 vo_x11_ontop(); | |
794 return VO_TRUE; | |
795 case VOCTRL_FULLSCREEN: | |
796 { | |
797 vo_x11_fullscreen(); | |
798 vo_x11_clearwindow(mDisplay, vo_window); | |
799 } | |
800 return VO_TRUE; | |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7765
diff
changeset
|
801 } |
12582 | 802 return VO_NOTIMPL; |
4352 | 803 } |