annotate libvo/vo_xvidix.c @ 11619:179138947307

This patch contains bugfixes for the esd audio output driver that I uncovered while trying to send sound to a remote esd server over a wireless (11 mbs, just enough to handle to sound) link. First, the sound was full "ticking" sounds. I found a bug that prevented the "send the remainder of this block" code from ever being called - so large chunks of audio were simply being ignored. Fixing this bug removed the "ticking" from audio streams. Fixing this bug, however, uncovered another problem - when the socket buffer was full, doing a blocking write to finish the buffer would take far too long and would turn video into a chunky mess. I'd imagine this blocking write would be fine for an audio-only stream, but it turns out to hold up the video far too much. The solution in this patch is to write as much data as possible to the socket, and then return as soon as possible, reporting the number of bytes actually written accurately back to mplayer. I've tested it on both local and remote esd servers, and it works well. Patch by Benjamin Osheroff <ben@gimbo.net>
author attila
date Wed, 10 Dec 2003 12:19:13 +0000
parents 85e503ddf65f
children 162c80b2d432
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"
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
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
bb1f3552f118 wm detection -- round two
pontscho
parents: 5976
diff changeset
37 #include "../Gui/interface.h"
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
8148
5b39e79af5fe removed get_info, using the same sheme as in libmpcodecs instead
alex
parents: 8123
diff changeset
41 static vo_info_t info =
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
42 {
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
43 "X11 (VIDIX)",
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
44 "xvidix",
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
45 "Alex Beregszaszi",
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
46 ""
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
47 };
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
48
8148
5b39e79af5fe removed get_info, using the same sheme as in libmpcodecs instead
alex
parents: 8123
diff changeset
49 LIBVO_EXTERN(xvidix)
5b39e79af5fe removed get_info, using the same sheme as in libmpcodecs instead
alex
parents: 8123
diff changeset
50
4271
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
51 #define UNUSED(x) ((void)(x)) /* Removes warning about unused arguments */
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
52
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
53 /* X11 related variables */
4363
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
54 /* Colorkey handling */
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
55 static XGCValues mGCV;
10988
c2bff70784d5 user settable colorkey
alex
parents: 10734
diff changeset
56 static int colorkey;
4363
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
57 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
58
4363
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
59 /* VIDIX related */
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
60 static char *vidix_name;
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
61
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
62 /* Image parameters */
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
63 static uint32_t image_width;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
64 static uint32_t image_height;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
65 static uint32_t image_format;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
66
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
67 /* Window parameters */
6299
4446af3c1a75 set_window() fixing detection of changement of the window position
attila
parents: 6095
diff changeset
68 static uint32_t window_x, window_y;
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
69 static uint32_t window_width, window_height;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
70
4363
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
71 /* used by XGetGeometry & XTranslateCoordinates for moving/resizing window */
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
72 static uint32_t drwX, drwY, drwWidth, drwHeight, drwBorderWidth,
4981
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4805
diff changeset
73 drwDepth, drwcX, drwcY, dwidth, dheight;
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
74
6755
a31b9f15cbff - fix audio equalizer
pontscho
parents: 6649
diff changeset
75 extern void set_video_eq( int cap );
a31b9f15cbff - fix audio equalizer
pontscho
parents: 6649
diff changeset
76
8991
04bd618db347 xinerama fix part 1 - count your paranthesis
attila
parents: 8577
diff changeset
77 #ifdef HAVE_XINERAMA
04bd618db347 xinerama fix part 1 - count your paranthesis
attila
parents: 8577
diff changeset
78 extern int xinerama_screen;
04bd618db347 xinerama fix part 1 - count your paranthesis
attila
parents: 8577
diff changeset
79 #endif
04bd618db347 xinerama fix part 1 - count your paranthesis
attila
parents: 8577
diff changeset
80
7124
eca7dbad0166 finally removed query_vaa, bes_da and vo_tune_info - the obsoleted libvo api
alex
parents: 6953
diff changeset
81 static void set_window(int force_update)
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
82 {
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 6043
diff changeset
83 Window mRoot;
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
84 if ( WinID )
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
85 {
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
86 XGetGeometry(mDisplay, vo_window, &mRoot, &drwX, &drwY, &drwWidth,
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
87 &drwHeight, &drwBorderWidth, &drwDepth);
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
88 drwX = drwY = 0;
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6299
diff changeset
89
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
90 XTranslateCoordinates(mDisplay, vo_window, mRoot, 0, 0,
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
91 &drwcX, &drwcY, &mRoot);
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
92 aspect(&dwidth,&dheight,A_NOZOOM);
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
93 if (!vo_fs)
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
94 mp_msg(MSGT_VO, MSGL_V, "[xvidix] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
95 drwcX, drwcY, drwX, drwY, drwWidth, drwHeight);
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
96
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
97 /* following stuff copied from vo_xmga.c */
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
98 }
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
99 else
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
100 {
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
101 aspect(&dwidth,&dheight,A_NOZOOM);
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
102 drwcX=drwX=vo_dx; drwcY=drwY=vo_dy; drwWidth=vo_dwidth; drwHeight=vo_dheight;
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
103 }
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
104
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
105 #if X11_FULLSCREEN
4981
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4805
diff changeset
106 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
107 {
5320
0409c865d9e4 -fs aspect fix by KotH
arpi
parents: 5047
diff changeset
108 aspect(&dwidth,&dheight,A_ZOOM);
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
109 drwX = (vo_screenwidth - (dwidth > vo_screenwidth ? vo_screenwidth : dwidth)) / 2;
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
110 drwcX = drwX;
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
111 drwY = (vo_screenheight - (dheight > vo_screenheight ? vo_screenheight : dheight)) / 2;
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
112 drwcY = drwY;
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
113 drwWidth = (dwidth > vo_screenwidth ? vo_screenwidth : dwidth);
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
114 drwHeight = (dheight > vo_screenheight ? vo_screenheight : dheight);
4271
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
115 mp_msg(MSGT_VO, MSGL_V, "[xvidix-fs] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
116 drwcX, drwcY, drwX, drwY, drwWidth, drwHeight);
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
117 }
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
118 #endif
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
119
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6299
diff changeset
120 vo_dwidth=drwWidth; vo_dheight=drwHeight;
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6299
diff changeset
121
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
122 #ifdef HAVE_XINERAMA
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
123 if (XineramaIsActive(mDisplay))
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 XineramaScreenInfo *screens;
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
126 int num_screens;
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
127 int i = 0;
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
128
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
129 screens = XineramaQueryScreens(mDisplay, &num_screens);
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
130
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
131 /* find the screen we are on */
8991
04bd618db347 xinerama fix part 1 - count your paranthesis
attila
parents: 8577
diff changeset
132 while (i<num_screens &&
04bd618db347 xinerama fix part 1 - count your paranthesis
attila
parents: 8577
diff changeset
133 ((screens[i].x_org < drwcX) || (screens[i].y_org < drwcY) ||
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
134 (screens[i].x_org + screens[i].width >= drwcX) ||
8991
04bd618db347 xinerama fix part 1 - count your paranthesis
attila
parents: 8577
diff changeset
135 (screens[i].y_org + screens[i].height >= drwcY)))
04bd618db347 xinerama fix part 1 - count your paranthesis
attila
parents: 8577
diff changeset
136 {
04bd618db347 xinerama fix part 1 - count your paranthesis
attila
parents: 8577
diff changeset
137 i++;
04bd618db347 xinerama fix part 1 - count your paranthesis
attila
parents: 8577
diff changeset
138 }
04bd618db347 xinerama fix part 1 - count your paranthesis
attila
parents: 8577
diff changeset
139
04bd618db347 xinerama fix part 1 - count your paranthesis
attila
parents: 8577
diff changeset
140 if(i<num_screens)
04bd618db347 xinerama fix part 1 - count your paranthesis
attila
parents: 8577
diff changeset
141 {
04bd618db347 xinerama fix part 1 - count your paranthesis
attila
parents: 8577
diff changeset
142 /* save the screen we are on */
04bd618db347 xinerama fix part 1 - count your paranthesis
attila
parents: 8577
diff changeset
143 xinerama_screen = i;
04bd618db347 xinerama fix part 1 - count your paranthesis
attila
parents: 8577
diff changeset
144 } else {
04bd618db347 xinerama fix part 1 - count your paranthesis
attila
parents: 8577
diff changeset
145 /* oops.. couldnt find the screen we are on
04bd618db347 xinerama fix part 1 - count your paranthesis
attila
parents: 8577
diff changeset
146 * because the upper left corner left the
04bd618db347 xinerama fix part 1 - count your paranthesis
attila
parents: 8577
diff changeset
147 * visual range. assume we are still on the
04bd618db347 xinerama fix part 1 - count your paranthesis
attila
parents: 8577
diff changeset
148 * same screen
04bd618db347 xinerama fix part 1 - count your paranthesis
attila
parents: 8577
diff changeset
149 */
04bd618db347 xinerama fix part 1 - count your paranthesis
attila
parents: 8577
diff changeset
150 i = xinerama_screen;
04bd618db347 xinerama fix part 1 - count your paranthesis
attila
parents: 8577
diff changeset
151 }
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
152
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
153 /* set drwcX and drwcY to the right values */
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
154 drwcX = drwcX - screens[i].x_org;
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
155 drwcY = drwcY - screens[i].y_org;
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
156 XFree(screens);
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
157 }
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
158 #endif
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
159
6382
86d5fc5b54e2 fix panscan support and add Jesper Svennevid's <mplayer@svennevid.net> patch
pontscho
parents: 6311
diff changeset
160 if ( vo_panscan > 0.0f && vo_fs )
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6299
diff changeset
161 {
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6299
diff changeset
162 drwcX-=vo_panscan_x >> 1;
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6299
diff changeset
163 drwcY-=vo_panscan_y >> 1;
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6299
diff changeset
164 drwX-=vo_panscan_x >> 1;
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6299
diff changeset
165 drwY-=vo_panscan_y >> 1;
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6299
diff changeset
166 drwWidth+=vo_panscan_x;
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6299
diff changeset
167 drwHeight+=vo_panscan_y;
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6299
diff changeset
168 }
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6299
diff changeset
169
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
170 /* set new values in VIDIX */
6299
4446af3c1a75 set_window() fixing detection of changement of the window position
attila
parents: 6095
diff changeset
171 if (force_update || (window_x != drwcX) || (window_y != drwcY) ||
4271
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
172 (window_width != drwWidth) || (window_height != drwHeight))
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
173 {
6299
4446af3c1a75 set_window() fixing detection of changement of the window position
attila
parents: 6095
diff changeset
174 // do a backup of window coordinates
4446af3c1a75 set_window() fixing detection of changement of the window position
attila
parents: 6095
diff changeset
175 window_x = drwcX;
4446af3c1a75 set_window() fixing detection of changement of the window position
attila
parents: 6095
diff changeset
176 window_y = drwcY;
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
177 vo_dx = drwcX;
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
178 vo_dy = drwcY;
4194
37c35f4ef9e2 Fixed resize bug.
nick
parents: 4133
diff changeset
179 window_width = drwWidth;
37c35f4ef9e2 Fixed resize bug.
nick
parents: 4133
diff changeset
180 window_height = drwHeight;
4198
7e2bf04c9a7c added vidix_start() and vidix_stop() for better runtime-resize support ;)
alex
parents: 4194
diff changeset
181
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
182 /* FIXME: implement runtime resize/move if possible, this way is very ugly! */
4198
7e2bf04c9a7c added vidix_start() and vidix_stop() for better runtime-resize support ;)
alex
parents: 4194
diff changeset
183 vidix_stop();
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
184 if (vidix_init(image_width, image_height, vo_dx, vo_dy,
4434
e956fa7f79c7 Use new tune info
nick
parents: 4433
diff changeset
185 window_width, window_height, image_format, vo_depthonscreen,
7124
eca7dbad0166 finally removed query_vaa, bes_da and vo_tune_info - the obsoleted libvo api
alex
parents: 6953
diff changeset
186 vo_screenwidth, vo_screenheight) != 0)
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
187 {
6598
ea9418aec756 fixed vidix terminating if init error occured, bug found by KotH
alex
parents: 6563
diff changeset
188 mp_msg(MSGT_VO, MSGL_FATAL, "Can't initialize VIDIX driver: %s\n", strerror(errno));
10734
b105d7aba10d remove exit_player and exit references
alex
parents: 10512
diff changeset
189 abort();
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
190 }
4198
7e2bf04c9a7c added vidix_start() and vidix_stop() for better runtime-resize support ;)
alex
parents: 4194
diff changeset
191 vidix_start();
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
192 }
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
193
6550
991e03ca5ceb added OSD support for yvu9/y800, corrected query_format \(added flag VFCAP_OSD\), fixed multifile support \(no more control infinite loop and destroying old window\) and some cosmetics
alex
parents: 6531
diff changeset
194 mp_msg(MSGT_VO, MSGL_V, "[xvidix] window properties: pos: %dx%d, size: %dx%d\n",
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
195 vo_dx, vo_dy, window_width, window_height);
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
196
4271
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
197 /* mDrawColorKey: */
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
198
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
199 /* fill drawable with specified color */
11216
30eccb0d1a64 fixed -nocolorkey
alex
parents: 11158
diff changeset
200 if (!(vo_colorkey & 0xff000000))
11158
85f4534d1edb Colorkeying can be disabled. Fbdev, svga and vesa vidix colorkeying support
alex
parents: 10988
diff changeset
201 {
10988
c2bff70784d5 user settable colorkey
alex
parents: 10734
diff changeset
202 XSetBackground(mDisplay, vo_gc, 0L);
4805
79b753e2e84a mondom fix bazmeg.
pontscho
parents: 4784
diff changeset
203 XClearWindow( mDisplay,vo_window );
10988
c2bff70784d5 user settable colorkey
alex
parents: 10734
diff changeset
204 XSetForeground(mDisplay, vo_gc, colorkey);
4805
79b753e2e84a mondom fix bazmeg.
pontscho
parents: 4784
diff changeset
205 XFillRectangle(mDisplay, vo_window, vo_gc, drwX, drwY, drwWidth,
4981
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4805
diff changeset
206 (vo_fs ? drwHeight - 1 : drwHeight));
11158
85f4534d1edb Colorkeying can be disabled. Fbdev, svga and vesa vidix colorkeying support
alex
parents: 10988
diff changeset
207 }
4271
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
208 /* flush, update drawable */
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
209 XFlush(mDisplay);
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
210
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
211 return;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
212 }
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
213
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
214 /* connect to server, create and map window,
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
215 * allocate colors and (shared) memory
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
216 */
4433
df8e0f71cc3c new info for tuning
nick
parents: 4363
diff changeset
217 static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
7124
eca7dbad0166 finally removed query_vaa, bes_da and vo_tune_info - the obsoleted libvo api
alex
parents: 6953
diff changeset
218 uint32_t d_height, uint32_t flags, char *title, uint32_t format)
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
219 {
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
220 XVisualInfo vinfo;
8123
9fc45fe0d444 *HUGE* set of compiler warning fixes, unused variables removal
arpi
parents: 7931
diff changeset
221 // XSizeHints hint;
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
222 XSetWindowAttributes xswa;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
223 unsigned long xswamask;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
224 XWindowAttributes attribs;
10988
c2bff70784d5 user settable colorkey
alex
parents: 10734
diff changeset
225 int window_depth, r, g, b;
4125
88de258b3ea9 fixed vidix_name handling (subdevice)
alex
parents: 4123
diff changeset
226
5738
ef3c2f82ea70 minor changes
alex
parents: 5651
diff changeset
227 title = "MPlayer VIDIX X11 Overlay";
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
228
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6299
diff changeset
229 panscan_init();
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6299
diff changeset
230
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
231 image_height = height;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
232 image_width = width;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
233 image_format = format;
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
234 vo_mouse_autohide=1;
4459
71b864031c3f Alex! Never write bottlenecks, ok?
nick
parents: 4441
diff changeset
235
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
236 aspect_save_orig(width, height);
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
237 aspect_save_prescale(d_width, d_height);
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
238 aspect_save_screenres(vo_screenwidth, vo_screenheight);
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
239
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
240 vo_dx = 0;
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
241 vo_dy = 0;
9947
b552e7939ca2 adding geometry support for xvidix
attila
parents: 8991
diff changeset
242 vo_dx=( vo_screenwidth - d_width ) / 2; vo_dy=( vo_screenheight - d_height ) / 2;
b552e7939ca2 adding geometry support for xvidix
attila
parents: 8991
diff changeset
243 geometry(&vo_dx, &vo_dy, &d_width, &d_height, vo_screenwidth, vo_screenheight);
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
244 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
245 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
246
6009
bb1f3552f118 wm detection -- round two
pontscho
parents: 5976
diff changeset
247 // vo_fs = flags&0x01;
bb1f3552f118 wm detection -- round two
pontscho
parents: 5976
diff changeset
248 // if (vo_fs)
bb1f3552f118 wm detection -- round two
pontscho
parents: 5976
diff changeset
249 // { vo_old_width=d_width; vo_old_height=d_height; }
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
250
10988
c2bff70784d5 user settable colorkey
alex
parents: 10734
diff changeset
251 r = (vo_colorkey & 0x00ff0000) >> 16;
c2bff70784d5 user settable colorkey
alex
parents: 10734
diff changeset
252 g = (vo_colorkey & 0x0000ff00) >> 8;
c2bff70784d5 user settable colorkey
alex
parents: 10734
diff changeset
253 b = vo_colorkey & 0x000000ff;
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
254 switch(vo_depthonscreen)
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
255 {
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
256 case 32:
10988
c2bff70784d5 user settable colorkey
alex
parents: 10734
diff changeset
257 colorkey = vo_colorkey;
c2bff70784d5 user settable colorkey
alex
parents: 10734
diff changeset
258 break;
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
259 case 24:
10988
c2bff70784d5 user settable colorkey
alex
parents: 10734
diff changeset
260 colorkey = vo_colorkey & 0x00ffffff;
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
261 break;
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
262 case 16:
10988
c2bff70784d5 user settable colorkey
alex
parents: 10734
diff changeset
263 colorkey = ((r >> 3) << 11) | ((g >> 2) << 5) | (b >> 3);
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
264 break;
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
265 case 15:
10988
c2bff70784d5 user settable colorkey
alex
parents: 10734
diff changeset
266 colorkey = ((r >> 3) << 10) | ((g >> 3) << 5) | (b >> 3);
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
267 break;
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
268 default:
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
269 mp_msg(MSGT_VO, MSGL_ERR, "Sorry, this (%d) color depth is not supported\n",
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
270 vo_depthonscreen);
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
271 }
10988
c2bff70784d5 user settable colorkey
alex
parents: 10734
diff changeset
272 mp_msg(MSGT_VO, MSGL_INFO, "Using colorkey: %x\n", colorkey);
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
273
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
274 aspect(&d_width, &d_height, A_NOZOOM);
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
275
6009
bb1f3552f118 wm detection -- round two
pontscho
parents: 5976
diff changeset
276 vo_dwidth=d_width; vo_dheight=d_height;
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
277
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
278 #ifdef HAVE_NEW_GUI
6009
bb1f3552f118 wm detection -- round two
pontscho
parents: 5976
diff changeset
279 if(use_gui) guiGetEvent( guiSetShVideo,0 ); // the GUI will set up / resize the window
bb1f3552f118 wm detection -- round two
pontscho
parents: 5976
diff changeset
280 else
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
281 {
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
282 #endif
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
283
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
284 #ifdef X11_FULLSCREEN
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
285 if ( ( flags&1 )||(flags & 0x04) ) 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
5047
2c0b97e0293e Compute aspect ratio only once
nick
parents: 5045
diff changeset
287 dwidth = d_width;
2c0b97e0293e Compute aspect ratio only once
nick
parents: 5045
diff changeset
288 dheight = d_height;
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
289 /* Make the window */
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
290 XGetWindowAttributes(mDisplay, DefaultRootWindow(mDisplay), &attribs);
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
291
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
292 /* from vo_x11 */
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
293 window_depth = attribs.depth;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
294 if ((window_depth != 15) && (window_depth != 16) && (window_depth != 24)
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
295 && (window_depth != 32))
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
296 window_depth = 24;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
297 XMatchVisualInfo(mDisplay, mScreen, window_depth, TrueColor, &vinfo);
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
298
5976
ff3e5901b2cc small patch that fixes the purple window when the f key is pressed - by Attila Kinali <kinali@gmx.net>
arpi
parents: 5823
diff changeset
299 xswa.background_pixel = BlackPixel(mDisplay, mScreen);
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
300 xswa.border_pixel = 0;
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
301 xswa.colormap = XCreateColormap(mDisplay, RootWindow(mDisplay, mScreen),
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
302 vinfo.visual, AllocNone);
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
303 xswa.event_mask = StructureNotifyMask | ExposureMask | KeyPressMask | PropertyChangeMask |
5823
daa705aff4f3 -rootwin fix...
arpi
parents: 5738
diff changeset
304 ((WinID==0)?0:(ButtonPressMask | ButtonReleaseMask | PointerMotionMask));
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
305 xswamask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask;
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
306
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
307 if (WinID >= 0)
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
308 {
4805
79b753e2e84a mondom fix bazmeg.
pontscho
parents: 4784
diff changeset
309 vo_window = WinID ? ((Window)WinID) : RootWindow(mDisplay, mScreen);
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
310 if ( WinID )
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
311 {
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
312 XUnmapWindow(mDisplay, vo_window);
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
313 XChangeWindowAttributes(mDisplay, vo_window, xswamask, &xswa);
6953
ce67cc1f0beb ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents: 6843
diff changeset
314 vo_x11_selectinput_witherr( mDisplay,vo_window,StructureNotifyMask | KeyPressMask | PropertyChangeMask | PointerMotionMask | ButtonPressMask | ButtonReleaseMask | ExposureMask );
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
315 } else XSelectInput( mDisplay,vo_window,ExposureMask );
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
316 }
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
317 else
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
318 {
7777
ed7b05575aab -fixed-vo support
pontscho
parents: 7124
diff changeset
319 if ( vo_window == None )
ed7b05575aab -fixed-vo support
pontscho
parents: 7124
diff changeset
320 {
ed7b05575aab -fixed-vo support
pontscho
parents: 7124
diff changeset
321 vo_window = XCreateWindow(mDisplay, RootWindow(mDisplay, mScreen),
ed7b05575aab -fixed-vo support
pontscho
parents: 7124
diff changeset
322 vo_dx, vo_dy, window_width, window_height, xswa.border_pixel,
ed7b05575aab -fixed-vo support
pontscho
parents: 7124
diff changeset
323 vinfo.depth, InputOutput, vinfo.visual, xswamask, &xswa);
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
324
7777
ed7b05575aab -fixed-vo support
pontscho
parents: 7124
diff changeset
325 vo_x11_classhint(mDisplay, vo_window, "xvidix");
ed7b05575aab -fixed-vo support
pontscho
parents: 7124
diff changeset
326 vo_hidecursor(mDisplay, vo_window);
ed7b05575aab -fixed-vo support
pontscho
parents: 7124
diff changeset
327 vo_x11_sizehint( vo_dx,vo_dy,vo_dwidth,vo_dheight,0 );
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
328
7777
ed7b05575aab -fixed-vo support
pontscho
parents: 7124
diff changeset
329 XStoreName(mDisplay, vo_window, title);
ed7b05575aab -fixed-vo support
pontscho
parents: 7124
diff changeset
330 XMapWindow(mDisplay, vo_window);
6009
bb1f3552f118 wm detection -- round two
pontscho
parents: 5976
diff changeset
331
7777
ed7b05575aab -fixed-vo support
pontscho
parents: 7124
diff changeset
332 if ( flags&1 ) vo_x11_fullscreen();
6009
bb1f3552f118 wm detection -- round two
pontscho
parents: 5976
diff changeset
333
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
334 #ifdef HAVE_XINERAMA
7777
ed7b05575aab -fixed-vo support
pontscho
parents: 7124
diff changeset
335 vo_x11_xinerama_move(mDisplay, vo_window);
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
336 #endif
7777
ed7b05575aab -fixed-vo support
pontscho
parents: 7124
diff changeset
337 } else if ( !(flags&1) ) XMoveResizeWindow( mDisplay,vo_window,vo_dx,vo_dy,vo_dwidth,vo_dheight );
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
338 }
7777
ed7b05575aab -fixed-vo support
pontscho
parents: 7124
diff changeset
339
ed7b05575aab -fixed-vo support
pontscho
parents: 7124
diff changeset
340 if ( vo_gc != None ) XFreeGC( mDisplay,vo_gc );
4805
79b753e2e84a mondom fix bazmeg.
pontscho
parents: 4784
diff changeset
341 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
342 #ifdef HAVE_NEW_GUI
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
343 }
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
344 #endif
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
345
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
346 if ( ( !WinID )&&( flags&1 ) ) { vo_dx=0; vo_dy=0; vo_dwidth=vo_screenwidth; vo_dheight=vo_screenheight; vo_fs=1; }
4271
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
347
4255
5a4a4b272d10 vidix_grkey_support checking for colorkeying
alex
parents: 4241
diff changeset
348 if (vidix_grkey_support())
5a4a4b272d10 vidix_grkey_support checking for colorkeying
alex
parents: 4241
diff changeset
349 {
5a4a4b272d10 vidix_grkey_support checking for colorkeying
alex
parents: 4241
diff changeset
350 vidix_grkey_get(&gr_key);
5a4a4b272d10 vidix_grkey_support checking for colorkeying
alex
parents: 4241
diff changeset
351 gr_key.key_op = KEYS_PUT;
11216
30eccb0d1a64 fixed -nocolorkey
alex
parents: 11158
diff changeset
352 if (!(vo_colorkey & 0xff000000))
11158
85f4534d1edb Colorkeying can be disabled. Fbdev, svga and vesa vidix colorkeying support
alex
parents: 10988
diff changeset
353 {
85f4534d1edb Colorkeying can be disabled. Fbdev, svga and vesa vidix colorkeying support
alex
parents: 10988
diff changeset
354 gr_key.ckey.op = CKEY_TRUE;
85f4534d1edb Colorkeying can be disabled. Fbdev, svga and vesa vidix colorkeying support
alex
parents: 10988
diff changeset
355 gr_key.ckey.red = r;
85f4534d1edb Colorkeying can be disabled. Fbdev, svga and vesa vidix colorkeying support
alex
parents: 10988
diff changeset
356 gr_key.ckey.green = g;
85f4534d1edb Colorkeying can be disabled. Fbdev, svga and vesa vidix colorkeying support
alex
parents: 10988
diff changeset
357 gr_key.ckey.blue = b;
85f4534d1edb Colorkeying can be disabled. Fbdev, svga and vesa vidix colorkeying support
alex
parents: 10988
diff changeset
358 }
85f4534d1edb Colorkeying can be disabled. Fbdev, svga and vesa vidix colorkeying support
alex
parents: 10988
diff changeset
359 else
85f4534d1edb Colorkeying can be disabled. Fbdev, svga and vesa vidix colorkeying support
alex
parents: 10988
diff changeset
360 gr_key.ckey.op = CKEY_FALSE;
4255
5a4a4b272d10 vidix_grkey_support checking for colorkeying
alex
parents: 4241
diff changeset
361 vidix_grkey_set(&gr_key);
5a4a4b272d10 vidix_grkey_support checking for colorkeying
alex
parents: 4241
diff changeset
362 }
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
363
7124
eca7dbad0166 finally removed query_vaa, bes_da and vo_tune_info - the obsoleted libvo api
alex
parents: 6953
diff changeset
364 set_window(1);
6755
a31b9f15cbff - fix audio equalizer
pontscho
parents: 6649
diff changeset
365
4805
79b753e2e84a mondom fix bazmeg.
pontscho
parents: 4784
diff changeset
366 XFlush(mDisplay);
79b753e2e84a mondom fix bazmeg.
pontscho
parents: 4784
diff changeset
367 XSync(mDisplay, False);
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
368
6382
86d5fc5b54e2 fix panscan support and add Jesper Svennevid's <mplayer@svennevid.net> patch
pontscho
parents: 6311
diff changeset
369 panscan_calc();
86d5fc5b54e2 fix panscan support and add Jesper Svennevid's <mplayer@svennevid.net> patch
pontscho
parents: 6311
diff changeset
370
11542
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 11462
diff changeset
371 if (vo_ontop) vo_x11_setlayer(mDisplay, vo_window, vo_ontop);
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 11462
diff changeset
372
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
373 saver_off(mDisplay); /* turning off screen saver */
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
374
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
375 return(0);
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
376 }
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
377
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
378 static void check_events(void)
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
379 {
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
380 const int event = vo_x11_check_events(mDisplay);
4125
88de258b3ea9 fixed vidix_name handling (subdevice)
alex
parents: 4123
diff changeset
381
4271
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
382 if ((event & VO_EVENT_RESIZE) || (event & VO_EVENT_EXPOSE))
7124
eca7dbad0166 finally removed query_vaa, bes_da and vo_tune_info - the obsoleted libvo api
alex
parents: 6953
diff changeset
383 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
384
4125
88de258b3ea9 fixed vidix_name handling (subdevice)
alex
parents: 4123
diff changeset
385 return;
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
386 }
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
387
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
388 /* draw_osd, flip_page, draw_slice, draw_frame should be
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
389 overwritten with vidix functions (vosub_vidix.c) */
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
390 static void draw_osd(void)
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
391 {
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
392 mp_msg(MSGT_VO, MSGL_FATAL, "[xvidix] error: didn't used vidix draw_osd!\n");
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
393 return;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
394 }
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
395
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
396 static void flip_page(void)
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
397 {
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
398 mp_msg(MSGT_VO, MSGL_FATAL, "[xvidix] error: didn't used vidix flip_page!\n");
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
399 return;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
400 }
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
401
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
402 static uint32_t draw_slice(uint8_t *src[], int stride[],
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
403 int w, int h, int x, int y)
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
404 {
4271
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
405 UNUSED(src);
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
406 UNUSED(stride);
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
407 UNUSED(w);
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
408 UNUSED(h);
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
409 UNUSED(x);
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
410 UNUSED(y);
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
411 mp_msg(MSGT_VO, MSGL_FATAL, "[xvidix] error: didn't used vidix draw_slice!\n");
6550
991e03ca5ceb added OSD support for yvu9/y800, corrected query_format \(added flag VFCAP_OSD\), fixed multifile support \(no more control infinite loop and destroying old window\) and some cosmetics
alex
parents: 6531
diff changeset
412 return(-1);
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 static uint32_t draw_frame(uint8_t *src[])
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
416 {
4271
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
417 UNUSED(src);
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
418 mp_msg(MSGT_VO, MSGL_FATAL, "[xvidix] error: didn't used vidix draw_frame!\n");
6550
991e03ca5ceb added OSD support for yvu9/y800, corrected query_format \(added flag VFCAP_OSD\), fixed multifile support \(no more control infinite loop and destroying old window\) and some cosmetics
alex
parents: 6531
diff changeset
419 return(-1);
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
420 }
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
421
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
422 static uint32_t query_format(uint32_t format)
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
423 {
4363
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
424 return(vidix_query_fourcc(format));
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
425 }
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
426
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
427 static void uninit(void)
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
428 {
6563
4a0b45902fc9 fixed uninit (it got never called before)
alex
parents: 6550
diff changeset
429 if ( !vo_config_count ) return;
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
430 vidix_term();
8577
e0b934c87745 10l memory leak
alex
parents: 8254
diff changeset
431
e0b934c87745 10l memory leak
alex
parents: 8254
diff changeset
432 if (vidix_name)
e0b934c87745 10l memory leak
alex
parents: 8254
diff changeset
433 {
e0b934c87745 10l memory leak
alex
parents: 8254
diff changeset
434 free(vidix_name);
e0b934c87745 10l memory leak
alex
parents: 8254
diff changeset
435 vidix_name = NULL;
e0b934c87745 10l memory leak
alex
parents: 8254
diff changeset
436 }
4441
90814d64a840 removed obosolete Terminate_Display_Process. using vo_x11_uninit. support UYVY format
alex
parents: 4434
diff changeset
437
4316
9f8a618e87c3 fix screen saver bug under gui
pontscho
parents: 4271
diff changeset
438 saver_on(mDisplay); /* screen saver back on */
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 6043
diff changeset
439 vo_x11_uninit();
4271
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
440 }
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4316
diff changeset
441
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4316
diff changeset
442 static uint32_t preinit(const char *arg)
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4316
diff changeset
443 {
6016
be9cd7d845c2 -zoom, -fs with x[11|mga|v] fix -- round two
pontscho
parents: 6009
diff changeset
444
4363
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
445 if (arg)
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
446 vidix_name = strdup(arg);
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
447 else
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
448 {
11462
2e367138d4b5 message expanded with hint to use -v option
gabucino
parents: 11216
diff changeset
449 mp_msg(MSGT_VO, MSGL_INFO, "No vidix driver name provided, probing available ones (-v option for details)!\n");
4363
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
450 vidix_name = NULL;
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
451 }
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
452
7931
48c71b6c7389 vo_init() moved to/fixed in preinit()
arpi
parents: 7777
diff changeset
453 if (!vo_init()) return(-1);
7777
ed7b05575aab -fixed-vo support
pontscho
parents: 7124
diff changeset
454
4363
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
455 if (vidix_preinit(vidix_name, &video_out_xvidix) != 0)
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
456 return(1);
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
457
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
458 return(0);
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4316
diff changeset
459 }
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4316
diff changeset
460
4596
c35d7ce151b3 10000hl to Holm... control MUST BE static...
arpi
parents: 4592
diff changeset
461 static uint32_t control(uint32_t request, void *data, ...)
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4316
diff changeset
462 {
4592
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4570
diff changeset
463 switch (request) {
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4570
diff changeset
464 case VOCTRL_QUERY_FORMAT:
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4570
diff changeset
465 return query_format(*((uint32_t*)data));
5738
ef3c2f82ea70 minor changes
alex
parents: 5651
diff changeset
466 case VOCTRL_GUISUPPORT:
ef3c2f82ea70 minor changes
alex
parents: 5651
diff changeset
467 return VO_TRUE;
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6299
diff changeset
468 case VOCTRL_GET_PANSCAN:
6311
da2dda48b7ec add mute support ( step 1 ) and fixed panscan bugs (1000l for me)
pontscho
parents: 6307
diff changeset
469 if ( !vo_config_count || !vo_fs ) return VO_FALSE;
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6299
diff changeset
470 return VO_TRUE;
11542
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 11462
diff changeset
471 case VOCTRL_ONTOP:
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 11462
diff changeset
472 vo_x11_ontop();
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 11462
diff changeset
473 return VO_TRUE;
6382
86d5fc5b54e2 fix panscan support and add Jesper Svennevid's <mplayer@svennevid.net> patch
pontscho
parents: 6311
diff changeset
474 case VOCTRL_FULLSCREEN:
86d5fc5b54e2 fix panscan support and add Jesper Svennevid's <mplayer@svennevid.net> patch
pontscho
parents: 6311
diff changeset
475 vo_x11_fullscreen();
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6299
diff changeset
476 case VOCTRL_SET_PANSCAN:
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6299
diff changeset
477 if ( vo_fs && ( vo_panscan != vo_panscan_amount ) )
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6299
diff changeset
478 {
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6299
diff changeset
479 panscan_calc();
7124
eca7dbad0166 finally removed query_vaa, bes_da and vo_tune_info - the obsoleted libvo api
alex
parents: 6953
diff changeset
480 set_window(0);
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6299
diff changeset
481 }
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6299
diff changeset
482 return VO_TRUE;
6786
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
483 case VOCTRL_SET_EQUALIZER:
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
484 {
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
485 va_list ap;
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
486 int value;
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
487
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
488 va_start(ap, data);
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
489 value = va_arg(ap, int);
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
490 va_end(ap);
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
491
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
492 return vidix_control(request, data, (int *)value);
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
493 }
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
494 case VOCTRL_GET_EQUALIZER:
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
495 {
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
496 va_list ap;
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
497 int *value;
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
498
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
499 va_start(ap, data);
6843
arpi
parents: 6786
diff changeset
500 value = va_arg(ap, int*);
6786
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
501 va_end(ap);
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
502
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
503 return vidix_control(request, data, value);
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
504 }
4592
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4570
diff changeset
505 }
6550
991e03ca5ceb added OSD support for yvu9/y800, corrected query_format \(added flag VFCAP_OSD\), fixed multifile support \(no more control infinite loop and destroying old window\) and some cosmetics
alex
parents: 6531
diff changeset
506 return vidix_control(request, data);
6531
7bd342baa785 yvu9,if09,y8,y800 support and multifile fix
alex
parents: 6382
diff changeset
507 // return VO_NOTIMPL;
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4316
diff changeset
508 }