annotate libvo/vo_xv.c @ 12585:8e748658cd71

sync tag bump
author wight
date Mon, 14 Jun 2004 10:58:54 +0000
parents 162c80b2d432
children 3cd9add91f97
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
7757
03c707b25fdc -fixed-vo support, based on patch by .so :)
arpi
parents: 7694
diff changeset
1 /* vo_xv.c, X11 Xv interface */
676
428755f858f7 multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents: 616
diff changeset
2
1265
f1f35276f635 switching double buffering at runtime with -double
arpi
parents: 1186
diff changeset
3 // Number of buffers _FOR_DOUBLEBUFFERING_MODE_
f1f35276f635 switching double buffering at runtime with -double
arpi
parents: 1186
diff changeset
4 // Use option -double to enable double buffering! (default: single buffer)
6758
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
5 #define NUM_BUFFERS 3
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
6
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
7 /*
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
8 Buffer allocation:
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
9
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
10 -nodr:
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
11 1: TEMP
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
12 2: 2*TEMP
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
13
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
14 -dr:
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
15 1: TEMP
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
16 3: 2*STATIC+TEMP
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
17 */
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
18
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
19 #include <stdio.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
20 #include <stdlib.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
21 #include <string.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
22
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
23 #include "config.h"
5935
5074aa8fae5a printf to mp_msg
albeu
parents: 5835
diff changeset
24 #include "mp_msg.h"
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
25 #include "video_out.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
26 #include "video_out_internal.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
27
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
28
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
29 #include <X11/Xlib.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
30 #include <X11/Xutil.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
31 #include <errno.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
32
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
33 #include "x11_common.h"
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
34
354
7de9e48c83a5 memcpy() moved mmx.h -> fastmemcpy.h
arpi_esp
parents: 350
diff changeset
35 #include "fastmemcpy.h"
616
41d6eec69b60 clean up
pontscho
parents: 614
diff changeset
36 #include "sub.h"
2054
a74a82334f60 Use aspect()
atmos4
parents: 2031
diff changeset
37 #include "aspect.h"
350
601822cc8c52 applied MMX2 memcpy() patch by Nick Kurshev
arpi_esp
parents: 326
diff changeset
38
5955
caac20b1ca79 fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents: 5945
diff changeset
39 #ifdef HAVE_NEW_GUI
caac20b1ca79 fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents: 5945
diff changeset
40 #include "../Gui/interface.h"
caac20b1ca79 fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents: 5945
diff changeset
41 #endif
caac20b1ca79 fix xmga fs, resize to movie size and mouse auto hide + dga
pontscho
parents: 5945
diff changeset
42
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
43 static vo_info_t info = {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
44 "X11/Xv",
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
45 "xv",
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
46 "Gerd Knorr <kraxel@goldbach.in-berlin.de> and others",
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
47 ""
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
48 };
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
49
8148
5b39e79af5fe removed get_info, using the same sheme as in libmpcodecs instead
alex
parents: 7857
diff changeset
50 LIBVO_EXTERN(xv)
6719
5291d74a60c9 xv support under cygwin - patch by Sycotic Smith <sycotic at linuxmail.org>
alex
parents: 6417
diff changeset
51 #ifdef HAVE_SHM
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
52 #include <sys/ipc.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
53 #include <sys/shm.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
54 #include <X11/extensions/XShm.h>
6416
2e323cde8ad1 Allow building vo_xv without SHM support
atmos4
parents: 6382
diff changeset
55 /* since it doesn't seem to be defined on some platforms */
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
56 int XShmGetEventBase(Display *);
6416
2e323cde8ad1 Allow building vo_xv without SHM support
atmos4
parents: 6382
diff changeset
57
2e323cde8ad1 Allow building vo_xv without SHM support
atmos4
parents: 6382
diff changeset
58 static XShmSegmentInfo Shminfo[NUM_BUFFERS];
6417
44bca09c1edd 100l accidently removed a line too much (Shmem_Flag)
atmos4
parents: 6416
diff changeset
59 static int Shmem_Flag;
6416
2e323cde8ad1 Allow building vo_xv without SHM support
atmos4
parents: 6382
diff changeset
60 #endif
2e323cde8ad1 Allow building vo_xv without SHM support
atmos4
parents: 6382
diff changeset
61
10855
eeae5c1b8fff fix some warnings (define order)
pl
parents: 10839
diff changeset
62 // Note: depends on the inclusion of X11/extensions/XShm.h
eeae5c1b8fff fix some warnings (define order)
pl
parents: 10839
diff changeset
63 #include <X11/extensions/Xv.h>
eeae5c1b8fff fix some warnings (define order)
pl
parents: 10839
diff changeset
64 #include <X11/extensions/Xvlib.h>
eeae5c1b8fff fix some warnings (define order)
pl
parents: 10839
diff changeset
65
eeae5c1b8fff fix some warnings (define order)
pl
parents: 10839
diff changeset
66 // FIXME: dynamically allocate this stuff
eeae5c1b8fff fix some warnings (define order)
pl
parents: 10839
diff changeset
67 static void allocate_xvimage(int);
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
68 static unsigned int ver, rel, req, ev, err;
10855
eeae5c1b8fff fix some warnings (define order)
pl
parents: 10839
diff changeset
69 static unsigned int formats, adaptors, xv_port, xv_format;
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
70 static XvAdaptorInfo *ai = NULL;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
71 static XvImageFormatValues *fo;
10855
eeae5c1b8fff fix some warnings (define order)
pl
parents: 10839
diff changeset
72
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
73 static int current_buf = 0;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
74 static int current_ip_buf = 0;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
75 static int num_buffers = 1; // default
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
76 static XvImage *xvimage[NUM_BUFFERS];
10855
eeae5c1b8fff fix some warnings (define order)
pl
parents: 10839
diff changeset
77
eeae5c1b8fff fix some warnings (define order)
pl
parents: 10839
diff changeset
78
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
79 static uint32_t image_width;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
80 static uint32_t image_height;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
81 static uint32_t image_format;
4629
745a40983b36 BGR24 support, including flip flag
arpi
parents: 4596
diff changeset
82 static int flip_flag;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
83
10757
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10359
diff changeset
84 static int int_pause;
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10359
diff changeset
85
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
86 static Window mRoot;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
87 static uint32_t drwX, drwY, drwBorderWidth, drwDepth;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
88 static uint32_t dwidth, dheight;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
89
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
90 static void (*draw_alpha_fnc) (int x0, int y0, int w, int h,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
91 unsigned char *src, unsigned char *srca,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
92 int stride);
1647
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
93
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
94 static void draw_alpha_yv12(int x0, int y0, int w, int h,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
95 unsigned char *src, unsigned char *srca,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
96 int stride)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
97 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
98 x0 += image_width * (vo_panscan_x >> 1) / (vo_dwidth + vo_panscan_x);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
99 vo_draw_alpha_yv12(w, h, src, srca, stride,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
100 xvimage[current_buf]->data +
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
101 xvimage[current_buf]->offsets[0] +
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
102 xvimage[current_buf]->pitches[0] * y0 + x0,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
103 xvimage[current_buf]->pitches[0]);
1647
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
104 }
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
105
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
106 static void draw_alpha_yuy2(int x0, int y0, int w, int h,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
107 unsigned char *src, unsigned char *srca,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
108 int stride)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
109 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
110 x0 += image_width * (vo_panscan_x >> 1) / (vo_dwidth + vo_panscan_x);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
111 vo_draw_alpha_yuy2(w, h, src, srca, stride,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
112 xvimage[current_buf]->data +
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
113 xvimage[current_buf]->offsets[0] +
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
114 xvimage[current_buf]->pitches[0] * y0 + 2 * x0,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
115 xvimage[current_buf]->pitches[0]);
1647
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
116 }
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
117
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
118 static void draw_alpha_uyvy(int x0, int y0, int w, int h,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
119 unsigned char *src, unsigned char *srca,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
120 int stride)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
121 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
122 x0 += image_width * (vo_panscan_x >> 1) / (vo_dwidth + vo_panscan_x);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
123 vo_draw_alpha_yuy2(w, h, src, srca, stride,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
124 xvimage[current_buf]->data +
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
125 xvimage[current_buf]->offsets[0] +
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
126 xvimage[current_buf]->pitches[0] * y0 + 2 * x0 + 1,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
127 xvimage[current_buf]->pitches[0]);
1647
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
128 }
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
129
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
130 static void draw_alpha_null(int x0, int y0, int w, int h,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
131 unsigned char *src, unsigned char *srca,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
132 int stride)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
133 {
1647
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
134 }
22480104ddfd added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents: 1501
diff changeset
135
6786
b16cb6cbff5a eq reworked
alex
parents: 6781
diff changeset
136
7757
03c707b25fdc -fixed-vo support, based on patch by .so :)
arpi
parents: 7694
diff changeset
137 static void deallocate_xvimage(int foo);
03c707b25fdc -fixed-vo support, based on patch by .so :)
arpi
parents: 7694
diff changeset
138
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
139 /*
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
140 * connect to server, create and map window,
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
141 * allocate colors and (shared) memory
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
142 */
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
143 static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
144 uint32_t d_height, uint32_t flags, char *title,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
145 uint32_t format)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
146 {
922
db06ae8967eb Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents: 844
diff changeset
147 // int screen;
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
148 char *hello = (title == NULL) ? "Xv render" : title;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
149
922
db06ae8967eb Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents: 844
diff changeset
150 // char *name = ":0.0";
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
151 XSizeHints hint;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
152 XVisualInfo vinfo;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
153 XGCValues xgcv;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
154 XSetWindowAttributes xswa;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
155 XWindowAttributes attribs;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
156 unsigned long xswamask;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
157 int depth;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
158
4426
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
159 #ifdef HAVE_XF86VM
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
160 int vm = 0;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
161 unsigned int modeline_width, modeline_height;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
162 static uint32_t vm_width;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
163 static uint32_t vm_height;
4426
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
164 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
165
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
166 panscan_init();
6304
ee65527096c2 pan&scan support with -vo xv by ?? <mplayer@svennevid.net>
arpi
parents: 6295
diff changeset
167
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
168 aspect_save_orig(width, height);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
169 aspect_save_prescale(d_width, d_height);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
170
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
171 image_height = height;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
172 image_width = width;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
173 image_format = format;
2249
48f0ac1e9d13 Update to new (cleaner, more bugfree, better) aspect api. vo_gl vo_gl2 and vo_xmga are untested!
atmos4
parents: 2055
diff changeset
174
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
175 vo_mouse_autohide = 1;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
176
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
177 int_pause = 0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
178
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
179 vo_dx = (vo_screenwidth - d_width) / 2;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
180 vo_dy = (vo_screenheight - d_height) / 2;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
181 geometry(&vo_dx, &vo_dy, &d_width, &d_height, vo_screenwidth,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
182 vo_screenheight);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
183 vo_dwidth = d_width;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
184 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: 10359
diff changeset
185
4978
ae66f5ca2225 small bugfix.
pontscho
parents: 4815
diff changeset
186 #ifdef HAVE_XF86VM
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
187 if (flags & 0x02)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
188 vm = 1;
4978
ae66f5ca2225 small bugfix.
pontscho
parents: 4815
diff changeset
189 #endif
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
190 flip_flag = flags & 8;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
191 num_buffers =
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
192 vo_doublebuffering ? (vo_directrendering ? NUM_BUFFERS : 2) : 1;
5509
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
193
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
194 /* check image formats */
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
195 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
196 unsigned int i;
10855
eeae5c1b8fff fix some warnings (define order)
pl
parents: 10839
diff changeset
197
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
198 xv_format = 0;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
199 for (i = 0; i < formats; i++)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
200 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
201 mp_msg(MSGT_VO, MSGL_V,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
202 "Xvideo image format: 0x%x (%4.4s) %s\n", fo[i].id,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
203 (char *) &fo[i].id,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
204 (fo[i].format == XvPacked) ? "packed" : "planar");
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
205 if (fo[i].id == format)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
206 xv_format = fo[i].id;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
207 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
208 if (!xv_format)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
209 return -1;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
210 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
211 aspect_save_screenres(vo_screenwidth, vo_screenheight);
2249
48f0ac1e9d13 Update to new (cleaner, more bugfree, better) aspect api. vo_gl vo_gl2 and vo_xmga are untested!
atmos4
parents: 2055
diff changeset
212
1775
e8a6425a1cde fix gui support
pontscho
parents: 1647
diff changeset
213 #ifdef HAVE_NEW_GUI
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
214 if (use_gui)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
215 guiGetEvent(guiSetShVideo, 0); // let the GUI to setup/resize our window
4426
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
216 else
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
217 #endif
723
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
218 {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
219 hint.x = vo_dx;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
220 hint.y = vo_dy;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
221 aspect(&d_width, &d_height, A_NOZOOM);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
222 hint.width = d_width;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
223 hint.height = d_height;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
224 #ifdef HAVE_XF86VM
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
225 if (vm)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
226 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
227 if ((d_width == 0) && (d_height == 0))
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
228 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
229 vm_width = image_width;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
230 vm_height = image_height;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
231 } else
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
232 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
233 vm_width = d_width;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
234 vm_height = d_height;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
235 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
236 vo_vm_switch(vm_width, vm_height, &modeline_width,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
237 &modeline_height);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
238 hint.x = (vo_screenwidth - modeline_width) / 2;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
239 hint.y = (vo_screenheight - modeline_height) / 2;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
240 hint.width = modeline_width;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
241 hint.height = modeline_height;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
242 aspect_save_screenres(modeline_width, modeline_height);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
243 } else
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
244 #endif
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
245 if (vo_fs)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
246 {
2054
a74a82334f60 Use aspect()
atmos4
parents: 2031
diff changeset
247 #ifdef X11_FULLSCREEN
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
248 /* this code replaces X11_FULLSCREEN hack in mplayer.c
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
249 * aspect() is available through aspect.h for all vos.
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
250 * besides zooming should only be done with -zoom,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
251 * but I leave the old -fs behaviour so users don't get
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
252 * irritated for now (and send lots o' mails ;) ::atmos
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
253 */
2031
624df8ea0e0e New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents: 1924
diff changeset
254
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
255 aspect(&d_width, &d_height, A_ZOOM);
2031
624df8ea0e0e New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents: 1924
diff changeset
256 #endif
624df8ea0e0e New aspect prescale code, parses aspect value from mpeg sequence header or commandline.
atmos4
parents: 1924
diff changeset
257
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
258 }
5945
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
259 // dwidth=d_width; dheight=d_height; //XXX: what are the copy vars used for?
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
260 vo_dwidth = d_width;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
261 vo_dheight = d_height;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
262 hint.flags = PPosition | PSize /* | PBaseSize */ ;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
263 hint.base_width = hint.width;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
264 hint.base_height = hint.height;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
265 XGetWindowAttributes(mDisplay, DefaultRootWindow(mDisplay),
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
266 &attribs);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
267 depth = attribs.depth;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
268 if (depth != 15 && depth != 16 && depth != 24 && depth != 32)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
269 depth = 24;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
270 XMatchVisualInfo(mDisplay, mScreen, depth, TrueColor, &vinfo);
723
c3e0bdb64027 add gui support
pontscho
parents: 676
diff changeset
271
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
272 xswa.background_pixel = 0;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
273 xswa.border_pixel = 0;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
274 xswamask = CWBackPixel | CWBorderPixel;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
275
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
276 if (WinID >= 0)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
277 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
278 vo_window = WinID ? ((Window) WinID) : mRootWin;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
279 if (WinID)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
280 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
281 XUnmapWindow(mDisplay, vo_window);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
282 XChangeWindowAttributes(mDisplay, vo_window, xswamask,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
283 &xswa);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
284 vo_x11_selectinput_witherr(mDisplay, vo_window,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
285 StructureNotifyMask |
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
286 KeyPressMask |
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
287 PropertyChangeMask |
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
288 PointerMotionMask |
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
289 ButtonPressMask |
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
290 ButtonReleaseMask |
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
291 ExposureMask);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
292 XMapWindow(mDisplay, vo_window);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
293 } else
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
294 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
295 drwX = vo_dx;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
296 drwY = vo_dy;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
297 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
298 } else if (vo_window == None)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
299 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
300 vo_window =
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
301 vo_x11_create_smooth_window(mDisplay, mRootWin,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
302 vinfo.visual, hint.x, hint.y,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
303 hint.width, hint.height, depth,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
304 CopyFromParent);
3830
fc1db33734e7 WinID cleanup, support for Xv
arpi
parents: 3558
diff changeset
305
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
306 vo_x11_classhint(mDisplay, vo_window, "xv");
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
307 vo_hidecursor(mDisplay, vo_window);
3830
fc1db33734e7 WinID cleanup, support for Xv
arpi
parents: 3558
diff changeset
308
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
309 vo_x11_selectinput_witherr(mDisplay, vo_window,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
310 StructureNotifyMask | KeyPressMask |
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
311 PropertyChangeMask | ((WinID == 0) ?
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
312 0
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
313 :
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
314 (PointerMotionMask
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
315 |
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
316 ButtonPressMask
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
317 |
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
318 ButtonReleaseMask
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
319 |
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
320 ExposureMask)));
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
321 XSetStandardProperties(mDisplay, vo_window, hello, hello, None,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
322 NULL, 0, &hint);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
323 XSetWMNormalHints(mDisplay, vo_window, &hint);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
324 XMapWindow(mDisplay, vo_window);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
325 if (flags & 1)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
326 vo_x11_fullscreen();
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
327 else
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
328 {
3990
87538547c8f4 xinerama fix by attila
atmos4
parents: 3830
diff changeset
329 #ifdef HAVE_XINERAMA
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
330 vo_x11_xinerama_move(mDisplay, vo_window);
3990
87538547c8f4 xinerama fix by attila
atmos4
parents: 3830
diff changeset
331 #endif
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
332 vo_x11_sizehint(hint.x, hint.y, hint.width, hint.height,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
333 0);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
334 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
335 } else
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
336 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
337 // vo_fs set means we were already at fullscreen
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
338 vo_x11_sizehint(hint.x, hint.y, hint.width, hint.height, 0);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
339 if (!vo_fs)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
340 XMoveResizeWindow(mDisplay, vo_window, hint.x, hint.y,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
341 hint.width, hint.height);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
342 if (flags & 1 && !vo_fs)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
343 vo_x11_fullscreen(); // handle -fs on non-first file
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
344 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
345
9161
cedace61d1ad -fixed-vo vs. panscan vs. 'f' vs. -fs fix
arpi
parents: 9027
diff changeset
346 // vo_x11_sizehint( hint.x, hint.y, hint.width, hint.height,0 );
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
347
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
348 if (vo_gc != None)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
349 XFreeGC(mDisplay, vo_gc);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
350 vo_gc = XCreateGC(mDisplay, vo_window, 0L, &xgcv);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
351 XFlush(mDisplay);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
352 XSync(mDisplay, False);
4426
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
353 #ifdef HAVE_XF86VM
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
354 if (vm)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
355 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
356 /* Grab the mouse pointer in our window */
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
357 if (vo_grabpointer)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
358 XGrabPointer(mDisplay, vo_window, True, 0,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
359 GrabModeAsync, GrabModeAsync,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
360 vo_window, None, CurrentTime);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
361 XSetInputFocus(mDisplay, vo_window, RevertToNone, CurrentTime);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
362 }
4426
1ceadec3ea67 using the common -vm code, patch by Santi B«±jar <tiarda@yahoo.es>
arpi
parents: 4406
diff changeset
363 #endif
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
364 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
365
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
366 mp_msg(MSGT_VO, MSGL_V, "using Xvideo port %d for hw scaling\n",
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
367 xv_port);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
368
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
369 switch (xv_format)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
370 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
371 case IMGFMT_YV12:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
372 case IMGFMT_I420:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
373 case IMGFMT_IYUV:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
374 draw_alpha_fnc = draw_alpha_yv12;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
375 break;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
376 case IMGFMT_YUY2:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
377 case IMGFMT_YVYU:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
378 draw_alpha_fnc = draw_alpha_yuy2;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
379 break;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
380 case IMGFMT_UYVY:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
381 draw_alpha_fnc = draw_alpha_uyvy;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
382 break;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
383 default:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
384 draw_alpha_fnc = draw_alpha_null;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
385 }
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
386
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
387 if (vo_config_count)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
388 for (current_buf = 0; current_buf < num_buffers; ++current_buf)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
389 deallocate_xvimage(current_buf);
7757
03c707b25fdc -fixed-vo support, based on patch by .so :)
arpi
parents: 7694
diff changeset
390
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
391 for (current_buf = 0; current_buf < num_buffers; ++current_buf)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
392 allocate_xvimage(current_buf);
676
428755f858f7 multi buffering added (modify NUM_BUFFERS in the source)
arpi_esp
parents: 616
diff changeset
393
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
394 current_buf = 0;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
395 current_ip_buf = 0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
396
6764
7755d1d59394 fix hue bug with nvidia's shit. i teszted with g400,radeon7500,tnt2ultra,geforce2mx200
pontscho
parents: 6760
diff changeset
397 #if 0
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
398 set_gamma_correction();
6764
7755d1d59394 fix hue bug with nvidia's shit. i teszted with g400,radeon7500,tnt2ultra,geforce2mx200
pontscho
parents: 6760
diff changeset
399 #endif
1818
18ba1f7373c5 fullscreen bug fixed
pontscho
parents: 1794
diff changeset
400
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
401 aspect(&vo_dwidth, &vo_dheight, A_NOZOOM);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
402 if (((flags & 1) && (WinID <= 0)) || vo_fs)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
403 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
404 aspect(&vo_dwidth, &vo_dheight, A_ZOOM);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
405 drwX =
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
406 (vo_screenwidth -
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
407 (vo_dwidth >
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
408 vo_screenwidth ? vo_screenwidth : vo_dwidth)) / 2;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
409 drwY =
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
410 (vo_screenheight -
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
411 (vo_dheight >
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
412 vo_screenheight ? vo_screenheight : vo_dheight)) / 2;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
413 vo_dwidth =
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
414 (vo_dwidth > vo_screenwidth ? vo_screenwidth : vo_dwidth);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
415 vo_dheight =
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
416 (vo_dheight > vo_screenheight ? vo_screenheight : vo_dheight);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
417 mp_msg(MSGT_VO, MSGL_V, "[xv-fs] dx: %d dy: %d dw: %d dh: %d\n",
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
418 drwX, drwY, vo_dwidth, vo_dheight);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
419 }
6382
86d5fc5b54e2 fix panscan support and add Jesper Svennevid's <mplayer@svennevid.net> patch
pontscho
parents: 6366
diff changeset
420
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
421 panscan_calc();
9381
007a1bdce1f4 reversed small part of the r1.135 commit, it broke -fs (random black screen)
arpi
parents: 9326
diff changeset
422
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
423 XClearWindow(mDisplay, vo_window);
9381
007a1bdce1f4 reversed small part of the r1.135 commit, it broke -fs (random black screen)
arpi
parents: 9326
diff changeset
424 #if 0
9161
cedace61d1ad -fixed-vo vs. panscan vs. 'f' vs. -fs fix
arpi
parents: 9027
diff changeset
425 #ifdef HAVE_SHM
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
426 if (Shmem_Flag)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
427 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
428 XvShmPutImage(mDisplay, xv_port, vo_window, vo_gc,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
429 xvimage[current_buf], 0, 0, image_width,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
430 image_height, drwX, drwY, 1, 1, False);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
431 XvShmPutImage(mDisplay, xv_port, vo_window, vo_gc,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
432 xvimage[current_buf], 0, 0, image_width,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
433 image_height, drwX, drwY, vo_dwidth,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
434 (vo_fs ? vo_dheight - 1 : vo_dheight), False);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
435 } else
9161
cedace61d1ad -fixed-vo vs. panscan vs. 'f' vs. -fs fix
arpi
parents: 9027
diff changeset
436 #endif
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
437 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
438 XvPutImage(mDisplay, xv_port, vo_window, vo_gc,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
439 xvimage[current_buf], 0, 0, image_width, image_height,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
440 drwX, drwY, 1, 1);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
441 XvPutImage(mDisplay, xv_port, vo_window, vo_gc,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
442 xvimage[current_buf], 0, 0, image_width, image_height,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
443 drwX, drwY, vo_dwidth,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
444 (vo_fs ? vo_dheight - 1 : vo_dheight));
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
445 }
9381
007a1bdce1f4 reversed small part of the r1.135 commit, it broke -fs (random black screen)
arpi
parents: 9326
diff changeset
446 #endif
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
447
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
448 mp_msg(MSGT_VO, MSGL_V, "[xv] dx: %d dy: %d dw: %d dh: %d\n", drwX,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
449 drwY, vo_dwidth, vo_dheight);
5945
f9fe22a52e80 fix aspect ratio handling
pontscho
parents: 5935
diff changeset
450
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
451 saver_off(mDisplay); // turning off screen saver
11542
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 11183
diff changeset
452
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
453 if (vo_ontop)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
454 vo_x11_setlayer(mDisplay, vo_window, vo_ontop);
11542
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 11183
diff changeset
455
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
456 return 0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
457 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
458
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
459 static void allocate_xvimage(int foo)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
460 {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
461 /*
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
462 * allocate XvImages. FIXME: no error checking, without
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
463 * mit-shm this will bomb... trzing to fix ::atmos
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
464 */
6416
2e323cde8ad1 Allow building vo_xv without SHM support
atmos4
parents: 6382
diff changeset
465 #ifdef HAVE_SHM
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
466 if (mLocalDisplay && XShmQueryExtension(mDisplay))
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
467 Shmem_Flag = 1;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
468 else
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
469 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
470 Shmem_Flag = 0;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
471 mp_msg(MSGT_VO, MSGL_INFO,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
472 "Shared memory not supported\nReverting to normal Xv\n");
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
473 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
474 if (Shmem_Flag)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
475 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
476 xvimage[foo] =
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
477 (XvImage *) XvShmCreateImage(mDisplay, xv_port, xv_format,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
478 NULL, image_width, image_height,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
479 &Shminfo[foo]);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
480
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
481 Shminfo[foo].shmid =
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
482 shmget(IPC_PRIVATE, xvimage[foo]->data_size, IPC_CREAT | 0777);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
483 Shminfo[foo].shmaddr = (char *) shmat(Shminfo[foo].shmid, 0, 0);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
484 Shminfo[foo].readOnly = False;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
485
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
486 xvimage[foo]->data = Shminfo[foo].shmaddr;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
487 XShmAttach(mDisplay, &Shminfo[foo]);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
488 XSync(mDisplay, False);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
489 shmctl(Shminfo[foo].shmid, IPC_RMID, 0);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
490 } else
6416
2e323cde8ad1 Allow building vo_xv without SHM support
atmos4
parents: 6382
diff changeset
491 #endif
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
492 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
493 xvimage[foo] =
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
494 (XvImage *) XvCreateImage(mDisplay, xv_port, xv_format, NULL,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
495 image_width, image_height);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
496 xvimage[foo]->data = malloc(xvimage[foo]->data_size);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
497 XSync(mDisplay, False);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
498 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
499 memset(xvimage[foo]->data, 128, xvimage[foo]->data_size);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
500 return;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
501 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
502
1794
fa2b852f494d add dealloc func
pontscho
parents: 1775
diff changeset
503 static void deallocate_xvimage(int foo)
fa2b852f494d add dealloc func
pontscho
parents: 1775
diff changeset
504 {
6416
2e323cde8ad1 Allow building vo_xv without SHM support
atmos4
parents: 6382
diff changeset
505 #ifdef HAVE_SHM
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
506 if (Shmem_Flag)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
507 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
508 XShmDetach(mDisplay, &Shminfo[foo]);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
509 shmdt(Shminfo[foo].shmaddr);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
510 } else
6416
2e323cde8ad1 Allow building vo_xv without SHM support
atmos4
parents: 6382
diff changeset
511 #endif
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
512 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
513 free(xvimage[foo]->data);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
514 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
515 XFree(xvimage[foo]);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
516
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
517 XFlush(mDisplay);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
518 XSync(mDisplay, False);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
519 return;
1794
fa2b852f494d add dealloc func
pontscho
parents: 1775
diff changeset
520 }
fa2b852f494d add dealloc func
pontscho
parents: 1775
diff changeset
521
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
522 static void check_events(void)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
523 {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
524 int e = vo_x11_check_events(mDisplay);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
525
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
526 if (e & VO_EVENT_EXPOSE && vo_fs)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
527 vo_x11_clearwindow(mDisplay, vo_window);
10757
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10359
diff changeset
528
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
529 if (e & VO_EVENT_RESIZE)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
530 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
531 if (vo_fs)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
532 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
533 e |= VO_EVENT_EXPOSE;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
534 XClearWindow(mDisplay, vo_window);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
535 XFlush(mDisplay);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
536 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
537
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
538 XGetGeometry(mDisplay, vo_window, &mRoot, &drwX, &drwY, &vo_dwidth,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
539 &vo_dheight, &drwBorderWidth, &drwDepth);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
540 drwX = drwY = 0;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
541 mp_msg(MSGT_VO, MSGL_V, "[xv] dx: %d dy: %d dw: %d dh: %d\n", drwX,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
542 drwY, vo_dwidth, vo_dheight);
10757
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10359
diff changeset
543
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
544 aspect(&dwidth, &dheight, A_NOZOOM);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
545 if (vo_fs)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
546 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
547 aspect(&dwidth, &dheight, A_ZOOM);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
548 drwX =
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
549 (vo_screenwidth -
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
550 (dwidth > vo_screenwidth ? vo_screenwidth : dwidth)) / 2;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
551 drwY =
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
552 (vo_screenheight -
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
553 (dheight >
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
554 vo_screenheight ? vo_screenheight : dheight)) / 2;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
555 vo_dwidth =
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
556 (dwidth > vo_screenwidth ? vo_screenwidth : dwidth);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
557 vo_dheight =
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
558 (dheight > vo_screenheight ? vo_screenheight : dheight);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
559 mp_msg(MSGT_VO, MSGL_V,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
560 "[xv-fs] dx: %d dy: %d dw: %d dh: %d\n", drwX, drwY,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
561 vo_dwidth, vo_dheight);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
562 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
563 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
564
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
565 if ((e & VO_EVENT_EXPOSE || e & VO_EVENT_RESIZE) && int_pause)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
566 flip_page();
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
567 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
568
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1265
diff changeset
569 static void draw_osd(void)
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
570 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
571 vo_draw_text(image_width -
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
572 image_width * vo_panscan_x / (vo_dwidth + vo_panscan_x),
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
573 image_height, draw_alpha_fnc);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
574 }
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1265
diff changeset
575
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
576 static void flip_page(void)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
577 {
6304
ee65527096c2 pan&scan support with -vo xv by ?? <mplayer@svennevid.net>
arpi
parents: 6295
diff changeset
578
6416
2e323cde8ad1 Allow building vo_xv without SHM support
atmos4
parents: 6382
diff changeset
579 #ifdef HAVE_SHM
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
580 if (Shmem_Flag)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
581 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
582 XvShmPutImage(mDisplay, xv_port, vo_window, vo_gc,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
583 xvimage[current_buf], 0, 0, image_width,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
584 image_height, drwX - (vo_panscan_x >> 1),
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
585 drwY - (vo_panscan_y >> 1), vo_dwidth + vo_panscan_x,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
586 (vo_fs ? vo_dheight - 1 : vo_dheight) + vo_panscan_y,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
587 False);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
588 } else
6416
2e323cde8ad1 Allow building vo_xv without SHM support
atmos4
parents: 6382
diff changeset
589 #endif
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
590 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
591 XvPutImage(mDisplay, xv_port, vo_window, vo_gc,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
592 xvimage[current_buf], 0, 0, image_width, image_height,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
593 drwX - (vo_panscan_x >> 1), drwY - (vo_panscan_y >> 1),
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
594 vo_dwidth + vo_panscan_x,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
595 (vo_fs ? vo_dheight - 1 : vo_dheight) + vo_panscan_y);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
596 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
597 if (num_buffers > 1)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
598 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
599 current_buf =
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
600 vo_directrendering ? 0 : ((current_buf + 1) % num_buffers);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
601 XFlush(mDisplay);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
602 } else
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
603 XSync(mDisplay, False);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
604 return;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
605 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
606
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
607 static uint32_t draw_slice(uint8_t * image[], int stride[], int w, int h,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
608 int x, int y)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
609 {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
610 uint8_t *dst;
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
611
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
612 dst = xvimage[current_buf]->data + xvimage[current_buf]->offsets[0] +
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
613 xvimage[current_buf]->pitches[0] * y + x;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
614 memcpy_pic(dst, image[0], w, h, xvimage[current_buf]->pitches[0],
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
615 stride[0]);
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
616
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
617 x /= 2;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
618 y /= 2;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
619 w /= 2;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
620 h /= 2;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
621
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
622 dst = xvimage[current_buf]->data + xvimage[current_buf]->offsets[1] +
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
623 xvimage[current_buf]->pitches[1] * y + x;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
624 if (image_format != IMGFMT_YV12)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
625 memcpy_pic(dst, image[1], w, h, xvimage[current_buf]->pitches[1],
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
626 stride[1]);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
627 else
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
628 memcpy_pic(dst, image[2], w, h, xvimage[current_buf]->pitches[1],
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
629 stride[2]);
5316
ce6f625f6682 I420 UV swapping fixed
arpi
parents: 5311
diff changeset
630
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
631 dst = xvimage[current_buf]->data + xvimage[current_buf]->offsets[2] +
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
632 xvimage[current_buf]->pitches[2] * y + x;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
633 if (image_format == IMGFMT_YV12)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
634 memcpy_pic(dst, image[1], w, h, xvimage[current_buf]->pitches[1],
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
635 stride[1]);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
636 else
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
637 memcpy_pic(dst, image[2], w, h, xvimage[current_buf]->pitches[1],
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
638 stride[2]);
6231
3acbdbc8f212 - some cleanup, removed unused code
arpi
parents: 6174
diff changeset
639
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
640 return 0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
641 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
642
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
643 static uint32_t draw_frame(uint8_t * src[])
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
644 {
7684
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
645 printf("draw_frame() called!!!!!!");
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
646 return -1;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
647 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
648
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
649 static uint32_t draw_image(mp_image_t * mpi)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
650 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
651 if (mpi->flags & MP_IMGFLAG_DIRECT)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
652 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
653 // direct rendering:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
654 current_buf = (int) (mpi->priv); // hack!
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
655 return VO_TRUE;
6760
d4db17f7271a DR1 with IPB fixed
arpi
parents: 6758
diff changeset
656 }
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
657 if (mpi->flags & MP_IMGFLAG_DRAW_CALLBACK)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
658 return VO_TRUE; // done
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
659 if (mpi->flags & MP_IMGFLAG_PLANAR)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
660 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
661 draw_slice(mpi->planes, mpi->stride, mpi->w, mpi->h, 0, 0);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
662 return VO_TRUE;
7684
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
663 }
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
664 if (mpi->flags & MP_IMGFLAG_YUV)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
665 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
666 // packed YUV:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
667 memcpy_pic(xvimage[current_buf]->data +
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
668 xvimage[current_buf]->offsets[0], mpi->planes[0],
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
669 mpi->w * (mpi->bpp / 8), mpi->h,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
670 xvimage[current_buf]->pitches[0], mpi->stride[0]);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
671 return VO_TRUE;
7684
d4ded16d66dc draw_image()
arpi
parents: 7539
diff changeset
672 }
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
673 return VO_FALSE; // not (yet) supported
6760
d4db17f7271a DR1 with IPB fixed
arpi
parents: 6758
diff changeset
674 }
d4db17f7271a DR1 with IPB fixed
arpi
parents: 6758
diff changeset
675
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
676 static uint32_t get_image(mp_image_t * mpi)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
677 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
678 int buf = current_buf; // we shouldn't change current_buf unless we do DR!
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
679
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
680 if (mpi->type == MP_IMGTYPE_STATIC && num_buffers > 1)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
681 return VO_FALSE; // it is not static
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
682 if (mpi->imgfmt != image_format)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
683 return VO_FALSE; // needs conversion :(
4980
0e6e50c02f7b direct rendering support
arpi
parents: 4978
diff changeset
684 // if(mpi->flags&MP_IMGFLAG_READABLE) return VO_FALSE; // slow video ram
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
685 if (mpi->flags & MP_IMGFLAG_READABLE &&
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
686 (mpi->type == MP_IMGTYPE_IPB || mpi->type == MP_IMGTYPE_IP))
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
687 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
688 // reference (I/P) frame of IP or IPB:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
689 if (num_buffers < 2)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
690 return VO_FALSE; // not enough
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
691 current_ip_buf ^= 1;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
692 // for IPB with 2 buffers we can DR only one of the 2 P frames:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
693 if (mpi->type == MP_IMGTYPE_IPB && num_buffers < 3
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
694 && current_ip_buf)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
695 return VO_FALSE;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
696 buf = current_ip_buf;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
697 if (mpi->type == MP_IMGTYPE_IPB)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
698 ++buf; // preserve space for B
6758
ecc71f27bfd7 DR1 IP/IPB supoprt (I/P only with -double) -- OSD *must be* disabled! :)
arpi
parents: 6755
diff changeset
699 }
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
700 if (mpi->height > xvimage[buf]->height)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
701 return VO_FALSE; //buffer to small
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
702 if (mpi->width * (mpi->bpp / 8) > xvimage[buf]->pitches[0])
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
703 return VO_FALSE; //buffer to small
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
704 if ((mpi->flags & (MP_IMGFLAG_ACCEPT_STRIDE | MP_IMGFLAG_ACCEPT_WIDTH))
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
705 || (mpi->width * (mpi->bpp / 8) == xvimage[buf]->pitches[0]))
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
706 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
707 current_buf = buf;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
708 mpi->planes[0] =
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
709 xvimage[current_buf]->data + xvimage[current_buf]->offsets[0];
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
710 mpi->stride[0] = xvimage[current_buf]->pitches[0];
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
711 mpi->width = mpi->stride[0] / (mpi->bpp / 8);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
712 if (mpi->flags & MP_IMGFLAG_PLANAR)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
713 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
714 if (mpi->flags & MP_IMGFLAG_SWAPPED)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
715 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
716 // I420
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
717 mpi->planes[1] =
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
718 xvimage[current_buf]->data +
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
719 xvimage[current_buf]->offsets[1];
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
720 mpi->planes[2] =
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
721 xvimage[current_buf]->data +
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
722 xvimage[current_buf]->offsets[2];
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
723 mpi->stride[1] = xvimage[current_buf]->pitches[1];
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
724 mpi->stride[2] = xvimage[current_buf]->pitches[2];
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
725 } else
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
726 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
727 // YV12
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
728 mpi->planes[1] =
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
729 xvimage[current_buf]->data +
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
730 xvimage[current_buf]->offsets[2];
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
731 mpi->planes[2] =
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
732 xvimage[current_buf]->data +
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
733 xvimage[current_buf]->offsets[1];
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
734 mpi->stride[1] = xvimage[current_buf]->pitches[2];
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
735 mpi->stride[2] = xvimage[current_buf]->pitches[1];
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
736 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
737 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
738 mpi->flags |= MP_IMGFLAG_DIRECT;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
739 mpi->priv = (void *) current_buf;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
740 // printf("mga: get_image() SUCCESS -> Direct Rendering ENABLED\n");
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
741 return VO_TRUE;
4980
0e6e50c02f7b direct rendering support
arpi
parents: 4978
diff changeset
742 }
0e6e50c02f7b direct rendering support
arpi
parents: 4978
diff changeset
743 return VO_FALSE;
0e6e50c02f7b direct rendering support
arpi
parents: 4978
diff changeset
744 }
0e6e50c02f7b direct rendering support
arpi
parents: 4978
diff changeset
745
182
80a7b40f201a *** empty log message ***
pontscho
parents: 31
diff changeset
746 static uint32_t query_format(uint32_t format)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
747 {
10855
eeae5c1b8fff fix some warnings (define order)
pl
parents: 10839
diff changeset
748 uint32_t i;
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
749 int flag = VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN | VFCAP_OSD | VFCAP_ACCEPT_STRIDE; // FIXME! check for DOWN
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
750
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
751 /* check image formats */
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
752 for (i = 0; i < formats; i++)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
753 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
754 if (fo[i].id == format)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
755 return flag; //xv_format = fo[i].id;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
756 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
757 return 0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
758 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
759
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
760 static void uninit(void)
1852
58dd326fcc4a fix xshape, mixer, fullscreen, etc
pontscho
parents: 1818
diff changeset
761 {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
762 int i;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
763
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
764 if (!vo_config_count)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
765 return;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
766 XvFreeAdaptorInfo(ai);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
767 ai = NULL;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
768 saver_on(mDisplay); // screen saver back on
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
769 for (i = 0; i < num_buffers; i++)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
770 deallocate_xvimage(i);
6016
be9cd7d845c2 -zoom, -fs with x[11|mga|v] fix -- round two
pontscho
parents: 6009
diff changeset
771 #ifdef HAVE_XF86VM
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
772 vo_vm_close(mDisplay);
6016
be9cd7d845c2 -zoom, -fs with x[11|mga|v] fix -- round two
pontscho
parents: 6009
diff changeset
773 #endif
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
774 vo_x11_uninit();
322
4e69a8e2700a Screensaver and monitor powersafe function is switched off when playing a
laaz
parents: 249
diff changeset
775 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
776
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4351
diff changeset
777 static uint32_t preinit(const char *arg)
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4351
diff changeset
778 {
5509
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
779 XvPortID xv_p;
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
780 int busy_ports = 0;
10855
eeae5c1b8fff fix some warnings (define order)
pl
parents: 10839
diff changeset
781 unsigned int i;
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
782
10826
ea6a03614754 add port parameter to -vo xv
attila
parents: 10757
diff changeset
783 xv_port = 0;
ea6a03614754 add port parameter to -vo xv
attila
parents: 10757
diff changeset
784
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
785 if (arg)
4737
32e1f5042f65 I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents: 4658
diff changeset
786 {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
787 if ((strlen(arg) >= 6) && !strncmp(arg, "port=", 5))
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
788 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
789 xv_port = atoi(arg + 5);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
790 } else
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
791 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
792 mp_msg(MSGT_VO, MSGL_ERR, "vo_xv: Unknown subdevice: %s\n",
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
793 arg);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
794 return ENOSYS;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
795 }
4737
32e1f5042f65 I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents: 4658
diff changeset
796 }
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
797 if (!vo_init())
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
798 return -1;
5509
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
799
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
800 /* check for Xvideo extension */
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
801 if (Success != XvQueryExtension(mDisplay, &ver, &rel, &req, &ev, &err))
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
802 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
803 mp_msg(MSGT_VO, MSGL_ERR,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
804 "Sorry, Xv not supported by this X11 version/driver\n");
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
805 mp_msg(MSGT_VO, MSGL_ERR,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
806 "******** Try with -vo x11 or -vo sdl *********\n");
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
807 return -1;
5509
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
808 }
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
809
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
810 /* check for Xvideo support */
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
811 if (Success !=
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
812 XvQueryAdaptors(mDisplay, DefaultRootWindow(mDisplay), &adaptors,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
813 &ai))
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
814 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
815 mp_msg(MSGT_VO, MSGL_ERR, "Xv: XvQueryAdaptors failed\n");
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
816 return -1;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
817 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
818
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
819 /* check adaptors */
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
820 if (xv_port)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
821 {
10839
0f2182b3261f hopefully final xv ports.
attila
parents: 10834
diff changeset
822 int port_found;
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
823
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
824 for (port_found = 0, i = 0; !port_found && i < adaptors; i++)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
825 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
826 if ((ai[i].type & XvInputMask) && (ai[i].type & XvImageMask))
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
827 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
828 for (xv_p = ai[i].base_id;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
829 xv_p < ai[i].base_id + ai[i].num_ports; ++xv_p)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
830 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
831 if (xv_p == xv_port)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
832 {
10839
0f2182b3261f hopefully final xv ports.
attila
parents: 10834
diff changeset
833 port_found = 1;
0f2182b3261f hopefully final xv ports.
attila
parents: 10834
diff changeset
834 break;
0f2182b3261f hopefully final xv ports.
attila
parents: 10834
diff changeset
835 }
0f2182b3261f hopefully final xv ports.
attila
parents: 10834
diff changeset
836 }
0f2182b3261f hopefully final xv ports.
attila
parents: 10834
diff changeset
837 }
0f2182b3261f hopefully final xv ports.
attila
parents: 10834
diff changeset
838 }
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
839 if (port_found)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
840 {
10839
0f2182b3261f hopefully final xv ports.
attila
parents: 10834
diff changeset
841 if (XvGrabPort(mDisplay, xv_port, CurrentTime))
0f2182b3261f hopefully final xv ports.
attila
parents: 10834
diff changeset
842 xv_port = 0;
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
843 } else
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
844 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
845 mp_msg(MSGT_VO, MSGL_WARN,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
846 "Xv: Invalid port parameter, overriding with port 0\n");
10839
0f2182b3261f hopefully final xv ports.
attila
parents: 10834
diff changeset
847 xv_port = 0;
0f2182b3261f hopefully final xv ports.
attila
parents: 10834
diff changeset
848 }
10826
ea6a03614754 add port parameter to -vo xv
attila
parents: 10757
diff changeset
849 }
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
850
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
851 for (i = 0; i < adaptors && xv_port == 0; i++)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
852 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
853 if ((ai[i].type & XvInputMask) && (ai[i].type & XvImageMask))
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
854 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
855 for (xv_p = ai[i].base_id;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
856 xv_p < ai[i].base_id + ai[i].num_ports; ++xv_p)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
857 if (!XvGrabPort(mDisplay, xv_p, CurrentTime))
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
858 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
859 xv_port = xv_p;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
860 break;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
861 } else
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
862 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
863 mp_msg(MSGT_VO, MSGL_WARN,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
864 "Xv: could not grab port %i\n", (int) xv_p);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
865 ++busy_ports;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
866 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
867 }
5509
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
868 }
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
869 if (!xv_port)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
870 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
871 if (busy_ports)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
872 mp_msg(MSGT_VO, MSGL_ERR,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
873 "Could not find free Xvideo port - maybe another process is already using it.\n"
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
874 "Close all video applications, and try again. If that does not help,\n"
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
875 "see 'mplayer -vo help' for other (non-xv) video out drivers.\n");
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
876 else
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
877 mp_msg(MSGT_VO, MSGL_ERR,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
878 "It seems there is no Xvideo support for your video card available.\n"
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
879 "Run 'xvinfo' to verify its Xv support and read DOCS/HTML/en/devices.html#xv!\n"
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
880 "See 'mplayer -vo help' for other (non-xv) video out drivers. Try -vo x11\n");
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
881 return -1;
5509
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
882 }
1e90dd889c34 initialization moved to preinit(), query_format now really checks for supported formats
arpi
parents: 5466
diff changeset
883
7857
3c690d2ad1ac MPlayer being unable to display video properly on many nVidia graphics cards.
arpi
parents: 7848
diff changeset
884 {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
885 int howmany, i;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
886 const XvAttribute *const attributes =
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
887 XvQueryPortAttributes(mDisplay, xv_port, &howmany);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
888
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
889 for (i = 0; i < howmany && attributes; i++)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
890 if (!strcmp(attributes[i].name, "XV_AUTOPAINT_COLORKEY"))
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
891 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
892 const Atom autopaint =
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
893 XInternAtom(mDisplay, "XV_AUTOPAINT_COLORKEY", False);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
894 XvSetPortAttribute(mDisplay, xv_port, autopaint, 1);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
895 break;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
896 }
7857
3c690d2ad1ac MPlayer being unable to display video properly on many nVidia graphics cards.
arpi
parents: 7848
diff changeset
897 }
3c690d2ad1ac MPlayer being unable to display video properly on many nVidia graphics cards.
arpi
parents: 7848
diff changeset
898
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
899 fo = XvListImageFormats(mDisplay, xv_port, (int *) &formats);
5566
e01c664def74 VFCAP added
arpi
parents: 5509
diff changeset
900
4737
32e1f5042f65 I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents: 4658
diff changeset
901 return 0;
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4351
diff changeset
902 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
903
4596
c35d7ce151b3 10000hl to Holm... control MUST BE static...
arpi
parents: 4592
diff changeset
904 static uint32_t control(uint32_t request, void *data, ...)
4592
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4433
diff changeset
905 {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
906 switch (request)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
907 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
908 case VOCTRL_PAUSE:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
909 return (int_pause = 1);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
910 case VOCTRL_RESUME:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
911 return (int_pause = 0);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
912 case VOCTRL_QUERY_FORMAT:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
913 return query_format(*((uint32_t *) data));
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
914 case VOCTRL_GET_IMAGE:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
915 return get_image(data);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
916 case VOCTRL_DRAW_IMAGE:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
917 return draw_image(data);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
918 case VOCTRL_GUISUPPORT:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
919 return VO_TRUE;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
920 case VOCTRL_GET_PANSCAN:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
921 if (!vo_config_count || !vo_fs)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
922 return VO_FALSE;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
923 return VO_TRUE;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
924 case VOCTRL_FULLSCREEN:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
925 vo_x11_fullscreen();
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
926 /* indended, fallthrough to update panscan on fullscreen/windowed switch */
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
927 case VOCTRL_SET_PANSCAN:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
928 if ((vo_fs && (vo_panscan != vo_panscan_amount))
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
929 || (!vo_fs && vo_panscan_amount))
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
930 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
931 int old_y = vo_panscan_y;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
932
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
933 panscan_calc();
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
934
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
935 if (old_y != vo_panscan_y)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
936 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
937 vo_x11_clearwindow_part(mDisplay, vo_window,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
938 vo_dwidth + vo_panscan_x - 1,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
939 vo_dheight + vo_panscan_y - 1,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
940 1);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
941 flip_page();
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
942 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
943 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
944 return VO_TRUE;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
945 case VOCTRL_SET_EQUALIZER:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
946 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
947 va_list ap;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
948 int value;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
949
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
950 va_start(ap, data);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
951 value = va_arg(ap, int);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
952
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
953 va_end(ap);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
954
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
955 return (vo_xv_set_eq(xv_port, data, value));
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
956 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
957 case VOCTRL_GET_EQUALIZER:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
958 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
959 va_list ap;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
960 int *value;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
961
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
962 va_start(ap, data);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
963 value = va_arg(ap, int *);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
964
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
965 va_end(ap);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
966
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
967 return (vo_xv_get_eq(xv_port, data, value));
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
968 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
969 case VOCTRL_ONTOP:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
970 vo_x11_ontop();
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
971 return VO_TRUE;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
972 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
973 return VO_NOTIMPL;
4592
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4433
diff changeset
974 }