annotate libvo/vo_xvidix.c @ 22705:f8fe4c872e9e

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