annotate libvo/vo_xvidix.c @ 25746:330af0160c2d

Fix code to prevent from accessing queue->packets[-1].pts that causes a crash. Found and patched by Reimar.
author ulion
date Thu, 17 Jan 2008 02:18:49 +0000
parents 3aee342be929
children 46f0b4d34fa1
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
1 /*
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
2 VIDIX accelerated overlay in a X window
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
3
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
4 (C) Alex Beregszaszi & Zoltan Ponekker & Nick Kurshev
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
5
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
6 WS window manager by Pontscho/Fresh!
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
7
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
8 Based on vo_gl.c and vo_vesa.c and vo_xmga.c (.so mastah! ;))
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
9 */
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
10
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
11 #include <stdio.h>
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
12 #include <stdlib.h>
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
13 #include <string.h>
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
14 #include <math.h>
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
15 #include <errno.h>
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
16
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
17 #include "config.h"
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
18 #include "video_out.h"
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
19 #include "video_out_internal.h"
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
20
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
21 #include <X11/Xlib.h>
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
22 #include <X11/Xutil.h>
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
23 //#include <X11/keysym.h>
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
24
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
25 #ifdef HAVE_XINERAMA
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
26 #include <X11/extensions/Xinerama.h>
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
27 #endif
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
28
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
29 #include "x11_common.h"
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
30 #include "aspect.h"
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
31 #include "mp_msg.h"
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
32
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
33 #include "vosub_vidix.h"
13787
e047e70a9767 Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
diego
parents: 13056
diff changeset
34 #include "vidix/vidixlib.h"
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
35
6009
bb1f3552f118 wm detection -- round two
pontscho
parents: 5976
diff changeset
36 #ifdef HAVE_NEW_GUI
23077
17bf4f4b0715 Gui --> gui
diego
parents: 22232
diff changeset
37 #include "gui/interface.h"
6009
bb1f3552f118 wm detection -- round two
pontscho
parents: 5976
diff changeset
38 #endif
bb1f3552f118 wm detection -- round two
pontscho
parents: 5976
diff changeset
39
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
40
25216
3aee342be929 Make vo info structs const
reimar
parents: 24159
diff changeset
41 static const vo_info_t info = {
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
42 "X11 (VIDIX)",
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
43 "xvidix",
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
44 "Alex Beregszaszi",
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
45 ""
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
46 };
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
47
8148
5b39e79af5fe removed get_info, using the same sheme as in libmpcodecs instead
alex
parents: 8123
diff changeset
48 LIBVO_EXTERN(xvidix)
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
49 #define UNUSED(x) ((void)(x)) /* Removes warning about unused arguments */
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
50 /* X11 related variables */
4363
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
51 /* Colorkey handling */
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
52 static XGCValues mGCV;
10988
c2bff70784d5 user settable colorkey
alex
parents: 10734
diff changeset
53 static int colorkey;
4363
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
54 static vidix_grkey_t gr_key;
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
55
4363
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
56 /* VIDIX related */
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
57 static char *vidix_name;
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
58
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
59 /* Image parameters */
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
60 static uint32_t image_width;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
61 static uint32_t image_height;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
62 static uint32_t image_format;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
63
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
64 /* Window parameters */
6299
4446af3c1a75 set_window() fixing detection of changement of the window position
attila
parents: 6095
diff changeset
65 static uint32_t window_x, window_y;
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
66 static uint32_t window_width, window_height;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
67
4363
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
68 /* used by XGetGeometry & XTranslateCoordinates for moving/resizing window */
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
69 static uint32_t drwX, drwY, drwWidth, drwHeight, drwBorderWidth,
4981
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4805
diff changeset
70 drwDepth, drwcX, drwcY, dwidth, dheight;
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
71
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
72 extern void set_video_eq(int cap);
6755
a31b9f15cbff - fix audio equalizer
pontscho
parents: 6649
diff changeset
73
8991
04bd618db347 xinerama fix part 1 - count your paranthesis
attila
parents: 8577
diff changeset
74
7124
eca7dbad0166 finally removed query_vaa, bes_da and vo_tune_info - the obsoleted libvo api
alex
parents: 6953
diff changeset
75 static void set_window(int force_update)
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
76 {
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 6043
diff changeset
77 Window mRoot;
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
78
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
79 if (WinID)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
80 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
81 XGetGeometry(mDisplay, vo_window, &mRoot, &drwX, &drwY, &drwWidth,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
82 &drwHeight, &drwBorderWidth, &drwDepth);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
83 drwX = drwY = 0;
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6299
diff changeset
84
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
85 XTranslateCoordinates(mDisplay, vo_window, mRoot, 0, 0,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
86 &drwcX, &drwcY, &mRoot);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
87 aspect(&dwidth, &dheight, A_NOZOOM);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
88 if (!vo_fs)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
89 mp_msg(MSGT_VO, MSGL_V,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
90 "[xvidix] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
91 drwcX, drwcY, drwX, drwY, drwWidth, drwHeight);
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
92
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
93 /* following stuff copied from vo_xmga.c */
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
94 } else
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
95 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
96 aspect(&dwidth, &dheight, A_NOZOOM);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
97 drwcX = drwX = vo_dx;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
98 drwcY = drwY = vo_dy;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
99 drwWidth = vo_dwidth;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
100 drwHeight = vo_dheight;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
101 }
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
102
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
103 #if X11_FULLSCREEN
4981
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4805
diff changeset
104 if (vo_fs)
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
105 {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
106 aspect(&dwidth, &dheight, A_ZOOM);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
107 drwX =
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
108 (vo_screenwidth -
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
109 (dwidth > vo_screenwidth ? vo_screenwidth : dwidth)) / 2;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
110 drwcX = drwX;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
111 drwY =
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
112 (vo_screenheight -
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
113 (dheight > vo_screenheight ? vo_screenheight : dheight)) / 2;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
114 drwcY = drwY;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
115 drwWidth = (dwidth > vo_screenwidth ? vo_screenwidth : dwidth);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
116 drwHeight =
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
117 (dheight > vo_screenheight ? vo_screenheight : dheight);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
118 mp_msg(MSGT_VO, MSGL_V,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
119 "[xvidix-fs] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
120 drwcX, drwcY, drwX, drwY, drwWidth, drwHeight);
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
121 }
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
122 #endif
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
123
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
124 vo_dwidth = drwWidth;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
125 vo_dheight = drwHeight;
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6299
diff changeset
126
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
127 #ifdef HAVE_XINERAMA
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
128 if (XineramaIsActive(mDisplay))
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
129 {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
130 XineramaScreenInfo *screens;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
131 int num_screens;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
132 int i = 0;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
133
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
134 screens = XineramaQueryScreens(mDisplay, &num_screens);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
135
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
136 /* find the screen we are on */
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
137 while (i < num_screens &&
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
138 ((screens[i].x_org < drwcX) || (screens[i].y_org < drwcY) ||
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
139 (screens[i].x_org + screens[i].width >= drwcX) ||
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
140 (screens[i].y_org + screens[i].height >= drwcY)))
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
141 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
142 i++;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
143 }
8991
04bd618db347 xinerama fix part 1 - count your paranthesis
attila
parents: 8577
diff changeset
144
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
145 if (i < num_screens)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
146 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
147 /* save the screen we are on */
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
148 xinerama_screen = i;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
149 } else
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
150 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
151 /* oops.. couldnt find the screen we are on
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
152 * because the upper left corner left the
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
153 * visual range. assume we are still on the
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
154 * same screen
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
155 */
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
156 i = xinerama_screen;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
157 }
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
158
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
159 /* set drwcX and drwcY to the right values */
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
160 drwcX = drwcX - screens[i].x_org;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
161 drwcY = drwcY - screens[i].y_org;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
162 XFree(screens);
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
163 }
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
164 #endif
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
165
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
166 if (vo_panscan > 0.0f && vo_fs)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
167 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
168 drwcX -= vo_panscan_x >> 1;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
169 drwcY -= vo_panscan_y >> 1;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
170 drwX -= vo_panscan_x >> 1;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
171 drwY -= vo_panscan_y >> 1;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
172 drwWidth += vo_panscan_x;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
173 drwHeight += vo_panscan_y;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
174 }
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6299
diff changeset
175
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
176 /* set new values in VIDIX */
6299
4446af3c1a75 set_window() fixing detection of changement of the window position
attila
parents: 6095
diff changeset
177 if (force_update || (window_x != drwcX) || (window_y != drwcY) ||
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
178 (window_width != drwWidth) || (window_height != drwHeight))
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
179 {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
180 // do a backup of window coordinates
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
181 window_x = drwcX;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
182 window_y = drwcY;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
183 vo_dx = drwcX;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
184 vo_dy = drwcY;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
185 window_width = drwWidth;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
186 window_height = drwHeight;
4198
7e2bf04c9a7c added vidix_start() and vidix_stop() for better runtime-resize support ;)
alex
parents: 4194
diff changeset
187
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
188 /* FIXME: implement runtime resize/move if possible, this way is very ugly! */
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
189 vidix_stop();
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
190 if (vidix_init(image_width, image_height, vo_dx, vo_dy,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
191 window_width, window_height, image_format,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
192 vo_depthonscreen, vo_screenwidth,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
193 vo_screenheight) != 0)
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
194 {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
195 mp_msg(MSGT_VO, MSGL_FATAL,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
196 "Can't initialize VIDIX driver: %s\n", strerror(errno));
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
197 abort();
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
198 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
199 vidix_start();
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
200 }
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
201
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
202 mp_msg(MSGT_VO, MSGL_V,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
203 "[xvidix] window properties: pos: %dx%d, size: %dx%d\n", vo_dx,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
204 vo_dy, window_width, window_height);
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
205
4271
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
206 /* mDrawColorKey: */
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
207
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
208 /* fill drawable with specified color */
11216
30eccb0d1a64 fixed -nocolorkey
alex
parents: 11158
diff changeset
209 if (!(vo_colorkey & 0xff000000))
11158
85f4534d1edb Colorkeying can be disabled. Fbdev, svga and vesa vidix colorkeying support
alex
parents: 10988
diff changeset
210 {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
211 XSetBackground(mDisplay, vo_gc, 0L);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
212 XClearWindow(mDisplay, vo_window);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
213 XSetForeground(mDisplay, vo_gc, colorkey);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
214 XFillRectangle(mDisplay, vo_window, vo_gc, drwX, drwY, drwWidth,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
215 (vo_fs ? drwHeight - 1 : drwHeight));
11158
85f4534d1edb Colorkeying can be disabled. Fbdev, svga and vesa vidix colorkeying support
alex
parents: 10988
diff changeset
216 }
4271
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
217 /* flush, update drawable */
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
218 XFlush(mDisplay);
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
219
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
220 return;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
221 }
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
222
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
223 /* connect to server, create and map window,
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
224 * allocate colors and (shared) memory
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
225 */
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 15540
diff changeset
226 static int config(uint32_t width, uint32_t height, uint32_t d_width,
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
227 uint32_t d_height, uint32_t flags, char *title,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
228 uint32_t format)
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
229 {
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
230 XVisualInfo vinfo;
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
231
8123
9fc45fe0d444 *HUGE* set of compiler warning fixes, unused variables removal
arpi
parents: 7931
diff changeset
232 // XSizeHints hint;
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
233 XSetWindowAttributes xswa;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
234 unsigned long xswamask;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
235 XWindowAttributes attribs;
10988
c2bff70784d5 user settable colorkey
alex
parents: 10734
diff changeset
236 int window_depth, r, g, b;
4125
88de258b3ea9 fixed vidix_name handling (subdevice)
alex
parents: 4123
diff changeset
237
5738
ef3c2f82ea70 minor changes
alex
parents: 5651
diff changeset
238 title = "MPlayer VIDIX X11 Overlay";
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
239
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
240 image_height = height;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
241 image_width = width;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
242 image_format = format;
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
243 vo_mouse_autohide = 1;
4459
71b864031c3f Alex! Never write bottlenecks, ok?
nick
parents: 4441
diff changeset
244
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
245 window_width = d_width;
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
246 window_height = d_height;
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
247
6009
bb1f3552f118 wm detection -- round two
pontscho
parents: 5976
diff changeset
248 // vo_fs = flags&0x01;
bb1f3552f118 wm detection -- round two
pontscho
parents: 5976
diff changeset
249 // if (vo_fs)
bb1f3552f118 wm detection -- round two
pontscho
parents: 5976
diff changeset
250 // { vo_old_width=d_width; vo_old_height=d_height; }
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
251
10988
c2bff70784d5 user settable colorkey
alex
parents: 10734
diff changeset
252 r = (vo_colorkey & 0x00ff0000) >> 16;
c2bff70784d5 user settable colorkey
alex
parents: 10734
diff changeset
253 g = (vo_colorkey & 0x0000ff00) >> 8;
c2bff70784d5 user settable colorkey
alex
parents: 10734
diff changeset
254 b = vo_colorkey & 0x000000ff;
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
255 switch (vo_depthonscreen)
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
256 {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
257 case 32:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
258 colorkey = vo_colorkey;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
259 break;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
260 case 24:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
261 colorkey = vo_colorkey & 0x00ffffff;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
262 break;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
263 case 16:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
264 colorkey = ((r >> 3) << 11) | ((g >> 2) << 5) | (b >> 3);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
265 break;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
266 case 15:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
267 colorkey = ((r >> 3) << 10) | ((g >> 3) << 5) | (b >> 3);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
268 break;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
269 default:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
270 mp_msg(MSGT_VO, MSGL_ERR,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
271 "Sorry, this (%d) color depth is not supported\n",
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
272 vo_depthonscreen);
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
273 }
13946
e632b43f0598 Reduce excessive verbosity.
diego
parents: 13787
diff changeset
274 mp_msg(MSGT_VO, MSGL_V, "Using colorkey: %x\n", colorkey);
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
275
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
276 #ifdef HAVE_NEW_GUI
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
277 if (use_gui)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
278 guiGetEvent(guiSetShVideo, 0); // the GUI will set up / resize the window
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
279 else
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
280 {
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
281 #endif
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
282
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
283 #ifdef X11_FULLSCREEN
15212
05aa13cdf92f replace VO and VF numeric flags with #defined identifiers
henry
parents: 13946
diff changeset
284 if ((flags & VOFLAG_FULLSCREEN) || (flags & VOFLAG_SWSCALE))
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
285 aspect(&d_width, &d_height, A_ZOOM);
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
286 #endif
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
287 dwidth = d_width;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
288 dheight = d_height;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
289 /* Make the window */
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
290 XGetWindowAttributes(mDisplay, DefaultRootWindow(mDisplay),
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
291 &attribs);
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
292
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
293 /* from vo_x11 */
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
294 window_depth = attribs.depth;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
295 if ((window_depth != 15) && (window_depth != 16)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
296 && (window_depth != 24) && (window_depth != 32))
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
297 window_depth = 24;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
298 XMatchVisualInfo(mDisplay, mScreen, window_depth, TrueColor,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
299 &vinfo);
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
300
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
301 xswa.background_pixel = BlackPixel(mDisplay, mScreen);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
302 xswa.border_pixel = 0;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
303 xswa.colormap =
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
304 XCreateColormap(mDisplay, RootWindow(mDisplay, mScreen),
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
305 vinfo.visual, AllocNone);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
306 xswa.event_mask =
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
307 StructureNotifyMask | ExposureMask | KeyPressMask |
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
308 PropertyChangeMask | ((WinID == 0) ? 0
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
309 : (ButtonPressMask | ButtonReleaseMask |
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
310 PointerMotionMask));
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
311 xswamask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask;
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
312
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
313 if (WinID >= 0)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
314 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
315 vo_window =
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
316 WinID ? ((Window) WinID) : RootWindow(mDisplay, mScreen);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
317 if (WinID)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
318 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
319 XUnmapWindow(mDisplay, vo_window);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
320 XChangeWindowAttributes(mDisplay, vo_window, xswamask,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
321 &xswa);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
322 vo_x11_selectinput_witherr(mDisplay, vo_window,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
323 StructureNotifyMask |
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
324 KeyPressMask |
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
325 PropertyChangeMask |
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
326 PointerMotionMask |
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
327 ButtonPressMask |
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
328 ButtonReleaseMask |
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
329 ExposureMask);
15540
91d210e8a19c Make -wid behave more consistent.
al
parents: 15212
diff changeset
330 XMapWindow(mDisplay, vo_window);
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
331 } else
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
332 XSelectInput(mDisplay, vo_window, ExposureMask);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
333 } else
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
334 {
23655
00aa61cde84a Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents: 23077
diff changeset
335 vo_x11_create_vo_window(&vinfo, vo_dx, vo_dy,
00aa61cde84a Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents: 23077
diff changeset
336 window_width, window_height, flags,
00aa61cde84a Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents: 23077
diff changeset
337 CopyFromParent, "xvidix", title);
00aa61cde84a Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents: 23077
diff changeset
338 XChangeWindowAttributes(mDisplay, vo_window, xswamask, &xswa);
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
339 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
340
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
341 if (vo_gc != None)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
342 XFreeGC(mDisplay, vo_gc);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
343 vo_gc = XCreateGC(mDisplay, vo_window, GCForeground, &mGCV);
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
344 #ifdef HAVE_NEW_GUI
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
345 }
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
346 #endif
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
347
15212
05aa13cdf92f replace VO and VF numeric flags with #defined identifiers
henry
parents: 13946
diff changeset
348 if ((!WinID) && (flags & VOFLAG_FULLSCREEN))
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
349 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
350 vo_dx = 0;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
351 vo_dy = 0;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
352 vo_dwidth = vo_screenwidth;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
353 vo_dheight = vo_screenheight;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
354 vo_fs = 1;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
355 }
4271
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
356
4255
5a4a4b272d10 vidix_grkey_support checking for colorkeying
alex
parents: 4241
diff changeset
357 if (vidix_grkey_support())
5a4a4b272d10 vidix_grkey_support checking for colorkeying
alex
parents: 4241
diff changeset
358 {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
359 vidix_grkey_get(&gr_key);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
360 gr_key.key_op = KEYS_PUT;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
361 if (!(vo_colorkey & 0xff000000))
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
362 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
363 gr_key.ckey.op = CKEY_TRUE;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
364 gr_key.ckey.red = r;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
365 gr_key.ckey.green = g;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
366 gr_key.ckey.blue = b;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
367 } else
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
368 gr_key.ckey.op = CKEY_FALSE;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
369 vidix_grkey_set(&gr_key);
4255
5a4a4b272d10 vidix_grkey_support checking for colorkeying
alex
parents: 4241
diff changeset
370 }
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
371
7124
eca7dbad0166 finally removed query_vaa, bes_da and vo_tune_info - the obsoleted libvo api
alex
parents: 6953
diff changeset
372 set_window(1);
6755
a31b9f15cbff - fix audio equalizer
pontscho
parents: 6649
diff changeset
373
4805
79b753e2e84a mondom fix bazmeg.
pontscho
parents: 4784
diff changeset
374 XSync(mDisplay, False);
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
375
6382
86d5fc5b54e2 fix panscan support and add Jesper Svennevid's <mplayer@svennevid.net> patch
pontscho
parents: 6311
diff changeset
376 panscan_calc();
86d5fc5b54e2 fix panscan support and add Jesper Svennevid's <mplayer@svennevid.net> patch
pontscho
parents: 6311
diff changeset
377
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
378 if (vo_ontop)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
379 vo_x11_setlayer(mDisplay, vo_window, vo_ontop);
11542
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 11462
diff changeset
380
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
381 return (0);
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
382 }
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
383
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
384 static void check_events(void)
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
385 {
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
386 const int event = vo_x11_check_events(mDisplay);
4125
88de258b3ea9 fixed vidix_name handling (subdevice)
alex
parents: 4123
diff changeset
387
4271
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
388 if ((event & VO_EVENT_RESIZE) || (event & VO_EVENT_EXPOSE))
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
389 set_window(0);
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
390
4125
88de258b3ea9 fixed vidix_name handling (subdevice)
alex
parents: 4123
diff changeset
391 return;
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
392 }
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
393
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
394 /* draw_osd, flip_page, draw_slice, draw_frame should be
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
395 overwritten with vidix functions (vosub_vidix.c) */
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
396 static void draw_osd(void)
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
397 {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
398 mp_msg(MSGT_VO, MSGL_FATAL,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
399 "[xvidix] error: didn't used vidix draw_osd!\n");
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
400 return;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
401 }
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
402
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
403 static void flip_page(void)
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
404 {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
405 mp_msg(MSGT_VO, MSGL_FATAL,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
406 "[xvidix] error: didn't used vidix flip_page!\n");
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
407 return;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
408 }
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
409
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 15540
diff changeset
410 static int draw_slice(uint8_t * src[], int stride[],
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
411 int w, int h, int x, int y)
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
412 {
4271
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
413 UNUSED(src);
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
414 UNUSED(stride);
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
415 UNUSED(w);
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
416 UNUSED(h);
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
417 UNUSED(x);
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
418 UNUSED(y);
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
419 mp_msg(MSGT_VO, MSGL_FATAL,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
420 "[xvidix] error: didn't used vidix draw_slice!\n");
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
421 return (-1);
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
422 }
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
423
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 15540
diff changeset
424 static int draw_frame(uint8_t * src[])
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
425 {
4271
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
426 UNUSED(src);
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
427 mp_msg(MSGT_VO, MSGL_FATAL,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
428 "[xvidix] error: didn't used vidix draw_frame!\n");
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
429 return (-1);
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
430 }
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
431
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 15540
diff changeset
432 static int query_format(uint32_t format)
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
433 {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
434 return (vidix_query_fourcc(format));
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
435 }
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
436
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
437 static void uninit(void)
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
438 {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
439 if (!vo_config_count)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
440 return;
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
441 vidix_term();
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
442
8577
e0b934c87745 10l memory leak
alex
parents: 8254
diff changeset
443 if (vidix_name)
e0b934c87745 10l memory leak
alex
parents: 8254
diff changeset
444 {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
445 free(vidix_name);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
446 vidix_name = NULL;
8577
e0b934c87745 10l memory leak
alex
parents: 8254
diff changeset
447 }
4441
90814d64a840 removed obosolete Terminate_Display_Process. using vo_x11_uninit. support UYVY format
alex
parents: 4434
diff changeset
448
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 6043
diff changeset
449 vo_x11_uninit();
4271
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
450 }
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4316
diff changeset
451
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 15540
diff changeset
452 static int preinit(const char *arg)
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4316
diff changeset
453 {
6016
be9cd7d845c2 -zoom, -fs with x[11|mga|v] fix -- round two
pontscho
parents: 6009
diff changeset
454
4363
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
455 if (arg)
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
456 vidix_name = strdup(arg);
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
457 else
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
458 {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
459 mp_msg(MSGT_VO, MSGL_INFO,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
460 "No vidix driver name provided, probing available ones (-v option for details)!\n");
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
461 vidix_name = NULL;
4363
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
462 }
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
463
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
464 if (!vo_init())
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
465 return (-1);
7777
ed7b05575aab -fixed-vo support
pontscho
parents: 7124
diff changeset
466
4363
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
467 if (vidix_preinit(vidix_name, &video_out_xvidix) != 0)
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
468 return (1);
4363
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
469
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
470 return (0);
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4316
diff changeset
471 }
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4316
diff changeset
472
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 15540
diff changeset
473 static int control(uint32_t request, void *data, ...)
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4316
diff changeset
474 {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
475 switch (request)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
476 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
477 case VOCTRL_QUERY_FORMAT:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
478 return query_format(*((uint32_t *) data));
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
479 case VOCTRL_GUISUPPORT:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
480 return VO_TRUE;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
481 case VOCTRL_GET_PANSCAN:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
482 if (!vo_config_count || !vo_fs)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
483 return VO_FALSE;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
484 return VO_TRUE;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
485 case VOCTRL_ONTOP:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
486 vo_x11_ontop();
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
487 return VO_TRUE;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
488 case VOCTRL_FULLSCREEN:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
489 vo_x11_fullscreen();
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
490 case VOCTRL_SET_PANSCAN:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
491 if (vo_fs && (vo_panscan != vo_panscan_amount))
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 panscan_calc();
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
494 set_window(0);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
495 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
496 return VO_TRUE;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
497 case VOCTRL_SET_EQUALIZER:
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 va_list ap;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
500 int value;
6786
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
501
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
502 va_start(ap, data);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
503 value = va_arg(ap, int);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
504
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
505 va_end(ap);
6786
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
506
20110
d27e00bb61b8 Remove spurious casts to int. Blessed by Reimar.
rathann
parents: 18715
diff changeset
507 return vidix_control(request, data, value);
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
508 }
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
509 case VOCTRL_GET_EQUALIZER:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
510 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
511 va_list ap;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
512 int *value;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
513
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
514 va_start(ap, data);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
515 value = va_arg(ap, int *);
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 va_end(ap);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
518
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
519 return vidix_control(request, data, value);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
520 }
22232
d0b60d14d8d7 Move common vo initialization code to video_out.c
reimar
parents: 20110
diff changeset
521 case VOCTRL_UPDATE_SCREENINFO:
d0b60d14d8d7 Move common vo initialization code to video_out.c
reimar
parents: 20110
diff changeset
522 aspect_save_screenres(vo_screenwidth, vo_screenheight);
d0b60d14d8d7 Move common vo initialization code to video_out.c
reimar
parents: 20110
diff changeset
523 return VO_TRUE;
d0b60d14d8d7 Move common vo initialization code to video_out.c
reimar
parents: 20110
diff changeset
524
12582
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 return vidix_control(request, data);
6531
7bd342baa785 yvu9,if09,y8,y800 support and multifile fix
alex
parents: 6382
diff changeset
527 // return VO_NOTIMPL;
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4316
diff changeset
528 }