annotate libvo/vo_xvidix.c @ 9941:c6c03483595b

at least it works now, but it's horrible slow and broken. double buffer and direct rendering support are needed to make this remotely usable...
author rfelker
date Sat, 19 Apr 2003 18:57:16 +0000
parents 04bd618db347
children b552e7939ca2
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"
8254
772d6d27fd66 warning patch by (Dominik Mierzejewski <dominik at rangers dot eu dot org>)
michael
parents: 8148
diff changeset
35 #include "../mplayer.h" /* exit_player() */
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
36
6009
bb1f3552f118 wm detection -- round two
pontscho
parents: 5976
diff changeset
37 #ifdef HAVE_NEW_GUI
bb1f3552f118 wm detection -- round two
pontscho
parents: 5976
diff changeset
38 #include "../Gui/interface.h"
bb1f3552f118 wm detection -- round two
pontscho
parents: 5976
diff changeset
39 #endif
bb1f3552f118 wm detection -- round two
pontscho
parents: 5976
diff changeset
40
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
41
8148
5b39e79af5fe removed get_info, using the same sheme as in libmpcodecs instead
alex
parents: 8123
diff changeset
42 static vo_info_t info =
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
43 {
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
44 "X11 (VIDIX)",
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
45 "xvidix",
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
46 "Alex Beregszaszi",
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
47 ""
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
48 };
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
49
8148
5b39e79af5fe removed get_info, using the same sheme as in libmpcodecs instead
alex
parents: 8123
diff changeset
50 LIBVO_EXTERN(xvidix)
5b39e79af5fe removed get_info, using the same sheme as in libmpcodecs instead
alex
parents: 8123
diff changeset
51
4271
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
52 #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
53
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
54 /* X11 related variables */
4363
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
55 /* Colorkey handling */
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
56 static XGCValues mGCV;
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
57 static uint32_t fgColor;
5738
ef3c2f82ea70 minor changes
alex
parents: 5651
diff changeset
58 static uint32_t bgColor;
4363
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
59 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
60
4363
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
61 /* VIDIX related */
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
62 static char *vidix_name;
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
63
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
64 /* Image parameters */
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
65 static uint32_t image_width;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
66 static uint32_t image_height;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
67 static uint32_t image_format;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
68
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
69 /* Window parameters */
6299
4446af3c1a75 set_window() fixing detection of changement of the window position
attila
parents: 6095
diff changeset
70 static uint32_t window_x, window_y;
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
71 static uint32_t window_width, window_height;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
72
4363
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
73 /* used by XGetGeometry & XTranslateCoordinates for moving/resizing window */
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
74 static uint32_t drwX, drwY, drwWidth, drwHeight, drwBorderWidth,
4981
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4805
diff changeset
75 drwDepth, drwcX, drwcY, dwidth, dheight;
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
76
6755
a31b9f15cbff - fix audio equalizer
pontscho
parents: 6649
diff changeset
77 extern void set_video_eq( int cap );
a31b9f15cbff - fix audio equalizer
pontscho
parents: 6649
diff changeset
78
8991
04bd618db347 xinerama fix part 1 - count your paranthesis
attila
parents: 8577
diff changeset
79 #ifdef HAVE_XINERAMA
04bd618db347 xinerama fix part 1 - count your paranthesis
attila
parents: 8577
diff changeset
80 extern int xinerama_screen;
04bd618db347 xinerama fix part 1 - count your paranthesis
attila
parents: 8577
diff changeset
81 #endif
04bd618db347 xinerama fix part 1 - count your paranthesis
attila
parents: 8577
diff changeset
82
7124
eca7dbad0166 finally removed query_vaa, bes_da and vo_tune_info - the obsoleted libvo api
alex
parents: 6953
diff changeset
83 static void set_window(int force_update)
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
84 {
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 6043
diff changeset
85 Window mRoot;
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
86 if ( WinID )
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
87 {
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
88 XGetGeometry(mDisplay, vo_window, &mRoot, &drwX, &drwY, &drwWidth,
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
89 &drwHeight, &drwBorderWidth, &drwDepth);
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
90 drwX = drwY = 0;
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6299
diff changeset
91
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
92 XTranslateCoordinates(mDisplay, vo_window, mRoot, 0, 0,
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
93 &drwcX, &drwcY, &mRoot);
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
94 aspect(&dwidth,&dheight,A_NOZOOM);
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
95 if (!vo_fs)
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
96 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
97 drwcX, drwcY, drwX, drwY, drwWidth, drwHeight);
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
98
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
99 /* following stuff copied from vo_xmga.c */
6043
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 else
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
102 {
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
103 aspect(&dwidth,&dheight,A_NOZOOM);
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
104 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
105 }
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
106
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
107 #if X11_FULLSCREEN
4981
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4805
diff changeset
108 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
109 {
5320
0409c865d9e4 -fs aspect fix by KotH
arpi
parents: 5047
diff changeset
110 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
111 drwX = (vo_screenwidth - (dwidth > vo_screenwidth ? vo_screenwidth : dwidth)) / 2;
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
112 drwcX = drwX;
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
113 drwY = (vo_screenheight - (dheight > vo_screenheight ? vo_screenheight : dheight)) / 2;
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
114 drwcY = drwY;
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
115 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
116 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
117 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
118 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
119 }
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
120 #endif
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
121
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6299
diff changeset
122 vo_dwidth=drwWidth; vo_dheight=drwHeight;
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6299
diff changeset
123
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
124 #ifdef HAVE_XINERAMA
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
125 if (XineramaIsActive(mDisplay))
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
126 {
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
127 XineramaScreenInfo *screens;
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
128 int num_screens;
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
129 int i = 0;
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 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
132
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
133 /* find the screen we are on */
8991
04bd618db347 xinerama fix part 1 - count your paranthesis
attila
parents: 8577
diff changeset
134 while (i<num_screens &&
04bd618db347 xinerama fix part 1 - count your paranthesis
attila
parents: 8577
diff changeset
135 ((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
136 (screens[i].x_org + screens[i].width >= drwcX) ||
8991
04bd618db347 xinerama fix part 1 - count your paranthesis
attila
parents: 8577
diff changeset
137 (screens[i].y_org + screens[i].height >= drwcY)))
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 i++;
04bd618db347 xinerama fix part 1 - count your paranthesis
attila
parents: 8577
diff changeset
140 }
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 if(i<num_screens)
04bd618db347 xinerama fix part 1 - count your paranthesis
attila
parents: 8577
diff changeset
143 {
04bd618db347 xinerama fix part 1 - count your paranthesis
attila
parents: 8577
diff changeset
144 /* save the screen we are on */
04bd618db347 xinerama fix part 1 - count your paranthesis
attila
parents: 8577
diff changeset
145 xinerama_screen = i;
04bd618db347 xinerama fix part 1 - count your paranthesis
attila
parents: 8577
diff changeset
146 } else {
04bd618db347 xinerama fix part 1 - count your paranthesis
attila
parents: 8577
diff changeset
147 /* oops.. couldnt find the screen we are on
04bd618db347 xinerama fix part 1 - count your paranthesis
attila
parents: 8577
diff changeset
148 * because the upper left corner left the
04bd618db347 xinerama fix part 1 - count your paranthesis
attila
parents: 8577
diff changeset
149 * visual range. assume we are still on the
04bd618db347 xinerama fix part 1 - count your paranthesis
attila
parents: 8577
diff changeset
150 * same screen
04bd618db347 xinerama fix part 1 - count your paranthesis
attila
parents: 8577
diff changeset
151 */
04bd618db347 xinerama fix part 1 - count your paranthesis
attila
parents: 8577
diff changeset
152 i = xinerama_screen;
04bd618db347 xinerama fix part 1 - count your paranthesis
attila
parents: 8577
diff changeset
153 }
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
154
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
155 /* 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
156 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
157 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
158 XFree(screens);
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
159 }
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
160 #endif
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
161
6382
86d5fc5b54e2 fix panscan support and add Jesper Svennevid's <mplayer@svennevid.net> patch
pontscho
parents: 6311
diff changeset
162 if ( vo_panscan > 0.0f && vo_fs )
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6299
diff changeset
163 {
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6299
diff changeset
164 drwcX-=vo_panscan_x >> 1;
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6299
diff changeset
165 drwcY-=vo_panscan_y >> 1;
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6299
diff changeset
166 drwX-=vo_panscan_x >> 1;
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6299
diff changeset
167 drwY-=vo_panscan_y >> 1;
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6299
diff changeset
168 drwWidth+=vo_panscan_x;
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6299
diff changeset
169 drwHeight+=vo_panscan_y;
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6299
diff changeset
170 }
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6299
diff changeset
171
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
172 /* set new values in VIDIX */
6299
4446af3c1a75 set_window() fixing detection of changement of the window position
attila
parents: 6095
diff changeset
173 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
174 (window_width != drwWidth) || (window_height != drwHeight))
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
175 {
6299
4446af3c1a75 set_window() fixing detection of changement of the window position
attila
parents: 6095
diff changeset
176 // do a backup of window coordinates
4446af3c1a75 set_window() fixing detection of changement of the window position
attila
parents: 6095
diff changeset
177 window_x = drwcX;
4446af3c1a75 set_window() fixing detection of changement of the window position
attila
parents: 6095
diff changeset
178 window_y = drwcY;
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
179 vo_dx = drwcX;
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
180 vo_dy = drwcY;
4194
37c35f4ef9e2 Fixed resize bug.
nick
parents: 4133
diff changeset
181 window_width = drwWidth;
37c35f4ef9e2 Fixed resize bug.
nick
parents: 4133
diff changeset
182 window_height = drwHeight;
4198
7e2bf04c9a7c added vidix_start() and vidix_stop() for better runtime-resize support ;)
alex
parents: 4194
diff changeset
183
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
184 /* 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
185 vidix_stop();
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
186 if (vidix_init(image_width, image_height, vo_dx, vo_dy,
4434
e956fa7f79c7 Use new tune info
nick
parents: 4433
diff changeset
187 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
188 vo_screenwidth, vo_screenheight) != 0)
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
189 {
6598
ea9418aec756 fixed vidix terminating if init error occured, bug found by KotH
alex
parents: 6563
diff changeset
190 mp_msg(MSGT_VO, MSGL_FATAL, "Can't initialize VIDIX driver: %s\n", strerror(errno));
ea9418aec756 fixed vidix terminating if init error occured, bug found by KotH
alex
parents: 6563
diff changeset
191 exit_player("vidix error"); /* !!! */
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
192 }
4198
7e2bf04c9a7c added vidix_start() and vidix_stop() for better runtime-resize support ;)
alex
parents: 4194
diff changeset
193 vidix_start();
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
194 }
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
195
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
196 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
197 vo_dx, vo_dy, window_width, window_height);
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
198
4271
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
199 /* mDrawColorKey: */
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
200
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
201 /* fill drawable with specified color */
5738
ef3c2f82ea70 minor changes
alex
parents: 5651
diff changeset
202 XSetBackground( mDisplay,vo_gc,bgColor );
4805
79b753e2e84a mondom fix bazmeg.
pontscho
parents: 4784
diff changeset
203 XClearWindow( mDisplay,vo_window );
79b753e2e84a mondom fix bazmeg.
pontscho
parents: 4784
diff changeset
204 XSetForeground(mDisplay, vo_gc, fgColor);
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));
4271
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
207 /* flush, update drawable */
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
208 XFlush(mDisplay);
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
209
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
210 return;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
211 }
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
212
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
213 /* connect to server, create and map window,
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
214 * allocate colors and (shared) memory
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
215 */
4433
df8e0f71cc3c new info for tuning
nick
parents: 4363
diff changeset
216 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
217 uint32_t d_height, uint32_t flags, char *title, uint32_t format)
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
218 {
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
219 XVisualInfo vinfo;
8123
9fc45fe0d444 *HUGE* set of compiler warning fixes, unused variables removal
arpi
parents: 7931
diff changeset
220 // XSizeHints hint;
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
221 XSetWindowAttributes xswa;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
222 unsigned long xswamask;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
223 XWindowAttributes attribs;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
224 int window_depth;
4125
88de258b3ea9 fixed vidix_name handling (subdevice)
alex
parents: 4123
diff changeset
225
5738
ef3c2f82ea70 minor changes
alex
parents: 5651
diff changeset
226 title = "MPlayer VIDIX X11 Overlay";
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
227
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6299
diff changeset
228 panscan_init();
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6299
diff changeset
229
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
230 image_height = height;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
231 image_width = width;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
232 image_format = format;
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
233 vo_mouse_autohide=1;
4459
71b864031c3f Alex! Never write bottlenecks, ok?
nick
parents: 4441
diff changeset
234
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
235 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
236 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
237 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
238
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
239 vo_dx = 0;
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
240 vo_dy = 0;
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
241 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
242 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
243
6009
bb1f3552f118 wm detection -- round two
pontscho
parents: 5976
diff changeset
244 // vo_fs = flags&0x01;
bb1f3552f118 wm detection -- round two
pontscho
parents: 5976
diff changeset
245 // if (vo_fs)
bb1f3552f118 wm detection -- round two
pontscho
parents: 5976
diff changeset
246 // { vo_old_width=d_width; vo_old_height=d_height; }
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
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 /* from xmga.c */
5738
ef3c2f82ea70 minor changes
alex
parents: 5651
diff changeset
249 bgColor = 0x0L;
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
250 switch(vo_depthonscreen)
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
251 {
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
252 case 32:
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
253 case 24:
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
254 fgColor = 0x00ff00ffL;
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
255 break;
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
256 case 16:
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
257 fgColor = 0xf81fL;
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
258 break;
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
259 case 15:
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
260 fgColor = 0x7c1fL;
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 default:
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
263 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
264 vo_depthonscreen);
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
265 }
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
266
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
267 aspect(&d_width, &d_height, A_NOZOOM);
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
268
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
269 vo_dx=( vo_screenwidth - d_width ) / 2; vo_dy=( vo_screenheight - d_height ) / 2;
6009
bb1f3552f118 wm detection -- round two
pontscho
parents: 5976
diff changeset
270 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
271
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
272 #ifdef HAVE_NEW_GUI
6009
bb1f3552f118 wm detection -- round two
pontscho
parents: 5976
diff changeset
273 if(use_gui) guiGetEvent( guiSetShVideo,0 ); // the GUI will set up / resize the window
bb1f3552f118 wm detection -- round two
pontscho
parents: 5976
diff changeset
274 else
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
275 {
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
276 #endif
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
277
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
278 #ifdef X11_FULLSCREEN
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
279 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
280 #endif
5047
2c0b97e0293e Compute aspect ratio only once
nick
parents: 5045
diff changeset
281 dwidth = d_width;
2c0b97e0293e Compute aspect ratio only once
nick
parents: 5045
diff changeset
282 dheight = d_height;
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
283 /* Make the window */
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
284 XGetWindowAttributes(mDisplay, DefaultRootWindow(mDisplay), &attribs);
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
285
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
286 /* from vo_x11 */
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
287 window_depth = attribs.depth;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
288 if ((window_depth != 15) && (window_depth != 16) && (window_depth != 24)
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
289 && (window_depth != 32))
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
290 window_depth = 24;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
291 XMatchVisualInfo(mDisplay, mScreen, window_depth, TrueColor, &vinfo);
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
292
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
293 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
294 xswa.border_pixel = 0;
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
295 xswa.colormap = XCreateColormap(mDisplay, RootWindow(mDisplay, mScreen),
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
296 vinfo.visual, AllocNone);
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
297 xswa.event_mask = StructureNotifyMask | ExposureMask | KeyPressMask | PropertyChangeMask |
5823
daa705aff4f3 -rootwin fix...
arpi
parents: 5738
diff changeset
298 ((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
299 xswamask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask;
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
300
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
301 if (WinID >= 0)
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
302 {
4805
79b753e2e84a mondom fix bazmeg.
pontscho
parents: 4784
diff changeset
303 vo_window = WinID ? ((Window)WinID) : RootWindow(mDisplay, mScreen);
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
304 if ( WinID )
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
305 {
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
306 XUnmapWindow(mDisplay, vo_window);
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
307 XChangeWindowAttributes(mDisplay, vo_window, xswamask, &xswa);
6953
ce67cc1f0beb ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents: 6843
diff changeset
308 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
309 } else XSelectInput( mDisplay,vo_window,ExposureMask );
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
310 }
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
311 else
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
312 {
7777
ed7b05575aab -fixed-vo support
pontscho
parents: 7124
diff changeset
313 if ( vo_window == None )
ed7b05575aab -fixed-vo support
pontscho
parents: 7124
diff changeset
314 {
ed7b05575aab -fixed-vo support
pontscho
parents: 7124
diff changeset
315 vo_window = XCreateWindow(mDisplay, RootWindow(mDisplay, mScreen),
ed7b05575aab -fixed-vo support
pontscho
parents: 7124
diff changeset
316 vo_dx, vo_dy, window_width, window_height, xswa.border_pixel,
ed7b05575aab -fixed-vo support
pontscho
parents: 7124
diff changeset
317 vinfo.depth, InputOutput, vinfo.visual, xswamask, &xswa);
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
318
7777
ed7b05575aab -fixed-vo support
pontscho
parents: 7124
diff changeset
319 vo_x11_classhint(mDisplay, vo_window, "xvidix");
ed7b05575aab -fixed-vo support
pontscho
parents: 7124
diff changeset
320 vo_hidecursor(mDisplay, vo_window);
ed7b05575aab -fixed-vo support
pontscho
parents: 7124
diff changeset
321 vo_x11_sizehint( vo_dx,vo_dy,vo_dwidth,vo_dheight,0 );
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
322
7777
ed7b05575aab -fixed-vo support
pontscho
parents: 7124
diff changeset
323 XStoreName(mDisplay, vo_window, title);
ed7b05575aab -fixed-vo support
pontscho
parents: 7124
diff changeset
324 XMapWindow(mDisplay, vo_window);
6009
bb1f3552f118 wm detection -- round two
pontscho
parents: 5976
diff changeset
325
7777
ed7b05575aab -fixed-vo support
pontscho
parents: 7124
diff changeset
326 if ( flags&1 ) vo_x11_fullscreen();
6009
bb1f3552f118 wm detection -- round two
pontscho
parents: 5976
diff changeset
327
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
328 #ifdef HAVE_XINERAMA
7777
ed7b05575aab -fixed-vo support
pontscho
parents: 7124
diff changeset
329 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
330 #endif
7777
ed7b05575aab -fixed-vo support
pontscho
parents: 7124
diff changeset
331 } 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
332 }
7777
ed7b05575aab -fixed-vo support
pontscho
parents: 7124
diff changeset
333
ed7b05575aab -fixed-vo support
pontscho
parents: 7124
diff changeset
334 if ( vo_gc != None ) XFreeGC( mDisplay,vo_gc );
4805
79b753e2e84a mondom fix bazmeg.
pontscho
parents: 4784
diff changeset
335 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
336 #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
337 }
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
338 #endif
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
339
6043
421781c5b128 fix some small bug and -rootwin
pontscho
parents: 6017
diff changeset
340 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
341
4255
5a4a4b272d10 vidix_grkey_support checking for colorkeying
alex
parents: 4241
diff changeset
342 if (vidix_grkey_support())
5a4a4b272d10 vidix_grkey_support checking for colorkeying
alex
parents: 4241
diff changeset
343 {
5a4a4b272d10 vidix_grkey_support checking for colorkeying
alex
parents: 4241
diff changeset
344 vidix_grkey_get(&gr_key);
5a4a4b272d10 vidix_grkey_support checking for colorkeying
alex
parents: 4241
diff changeset
345 gr_key.key_op = KEYS_PUT;
5a4a4b272d10 vidix_grkey_support checking for colorkeying
alex
parents: 4241
diff changeset
346 gr_key.ckey.op = CKEY_TRUE;
5a4a4b272d10 vidix_grkey_support checking for colorkeying
alex
parents: 4241
diff changeset
347 gr_key.ckey.red = 255;
5a4a4b272d10 vidix_grkey_support checking for colorkeying
alex
parents: 4241
diff changeset
348 gr_key.ckey.green = 0;
5a4a4b272d10 vidix_grkey_support checking for colorkeying
alex
parents: 4241
diff changeset
349 gr_key.ckey.blue = 255;
5a4a4b272d10 vidix_grkey_support checking for colorkeying
alex
parents: 4241
diff changeset
350 vidix_grkey_set(&gr_key);
5a4a4b272d10 vidix_grkey_support checking for colorkeying
alex
parents: 4241
diff changeset
351 }
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
352
7124
eca7dbad0166 finally removed query_vaa, bes_da and vo_tune_info - the obsoleted libvo api
alex
parents: 6953
diff changeset
353 set_window(1);
6755
a31b9f15cbff - fix audio equalizer
pontscho
parents: 6649
diff changeset
354
4805
79b753e2e84a mondom fix bazmeg.
pontscho
parents: 4784
diff changeset
355 XFlush(mDisplay);
79b753e2e84a mondom fix bazmeg.
pontscho
parents: 4784
diff changeset
356 XSync(mDisplay, False);
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
357
6382
86d5fc5b54e2 fix panscan support and add Jesper Svennevid's <mplayer@svennevid.net> patch
pontscho
parents: 6311
diff changeset
358 panscan_calc();
86d5fc5b54e2 fix panscan support and add Jesper Svennevid's <mplayer@svennevid.net> patch
pontscho
parents: 6311
diff changeset
359
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
360 saver_off(mDisplay); /* turning off screen saver */
6311
da2dda48b7ec add mute support ( step 1 ) and fixed panscan bugs (1000l for me)
pontscho
parents: 6307
diff changeset
361
da2dda48b7ec add mute support ( step 1 ) and fixed panscan bugs (1000l for me)
pontscho
parents: 6307
diff changeset
362 vo_config_count++;
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
363
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
364 return(0);
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
365 }
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
366
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
367 static void check_events(void)
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
368 {
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
369 const int event = vo_x11_check_events(mDisplay);
4125
88de258b3ea9 fixed vidix_name handling (subdevice)
alex
parents: 4123
diff changeset
370
4271
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
371 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
372 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
373
4125
88de258b3ea9 fixed vidix_name handling (subdevice)
alex
parents: 4123
diff changeset
374 return;
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
375 }
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
376
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
377 /* draw_osd, flip_page, draw_slice, draw_frame should be
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
378 overwritten with vidix functions (vosub_vidix.c) */
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
379 static void draw_osd(void)
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
380 {
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
381 mp_msg(MSGT_VO, MSGL_FATAL, "[xvidix] error: didn't used vidix draw_osd!\n");
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
382 return;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
383 }
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
384
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
385 static void flip_page(void)
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
386 {
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
387 mp_msg(MSGT_VO, MSGL_FATAL, "[xvidix] error: didn't used vidix flip_page!\n");
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
388 return;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
389 }
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
390
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
391 static uint32_t draw_slice(uint8_t *src[], int stride[],
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
392 int w, int h, int x, int y)
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
393 {
4271
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
394 UNUSED(src);
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
395 UNUSED(stride);
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
396 UNUSED(w);
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
397 UNUSED(h);
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
398 UNUSED(x);
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
399 UNUSED(y);
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
400 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
401 return(-1);
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
402 }
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
403
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
404 static uint32_t draw_frame(uint8_t *src[])
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
405 {
4271
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
406 UNUSED(src);
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
407 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
408 return(-1);
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
409 }
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
410
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
411 static uint32_t query_format(uint32_t format)
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
412 {
4363
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
413 return(vidix_query_fourcc(format));
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
414 }
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
415
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
416 static void uninit(void)
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
417 {
6563
4a0b45902fc9 fixed uninit (it got never called before)
alex
parents: 6550
diff changeset
418 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
419 vidix_term();
8577
e0b934c87745 10l memory leak
alex
parents: 8254
diff changeset
420
e0b934c87745 10l memory leak
alex
parents: 8254
diff changeset
421 if (vidix_name)
e0b934c87745 10l memory leak
alex
parents: 8254
diff changeset
422 {
e0b934c87745 10l memory leak
alex
parents: 8254
diff changeset
423 free(vidix_name);
e0b934c87745 10l memory leak
alex
parents: 8254
diff changeset
424 vidix_name = NULL;
e0b934c87745 10l memory leak
alex
parents: 8254
diff changeset
425 }
4441
90814d64a840 removed obosolete Terminate_Display_Process. using vo_x11_uninit. support UYVY format
alex
parents: 4434
diff changeset
426
4316
9f8a618e87c3 fix screen saver bug under gui
pontscho
parents: 4271
diff changeset
427 saver_on(mDisplay); /* screen saver back on */
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 6043
diff changeset
428 vo_x11_uninit();
4271
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
429 }
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4316
diff changeset
430
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4316
diff changeset
431 static uint32_t preinit(const char *arg)
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4316
diff changeset
432 {
6016
be9cd7d845c2 -zoom, -fs with x[11|mga|v] fix -- round two
pontscho
parents: 6009
diff changeset
433
4363
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
434 if (arg)
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
435 vidix_name = strdup(arg);
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
436 else
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
437 {
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
438 mp_msg(MSGT_VO, MSGL_INFO, "No vidix driver name provided, probing available ones!\n");
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
439 vidix_name = NULL;
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
440 }
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
441
7931
48c71b6c7389 vo_init() moved to/fixed in preinit()
arpi
parents: 7777
diff changeset
442 if (!vo_init()) return(-1);
7777
ed7b05575aab -fixed-vo support
pontscho
parents: 7124
diff changeset
443
4363
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
444 if (vidix_preinit(vidix_name, &video_out_xvidix) != 0)
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
445 return(1);
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
446
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
447 return(0);
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4316
diff changeset
448 }
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4316
diff changeset
449
4596
c35d7ce151b3 10000hl to Holm... control MUST BE static...
arpi
parents: 4592
diff changeset
450 static uint32_t control(uint32_t request, void *data, ...)
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4316
diff changeset
451 {
4592
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4570
diff changeset
452 switch (request) {
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4570
diff changeset
453 case VOCTRL_QUERY_FORMAT:
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4570
diff changeset
454 return query_format(*((uint32_t*)data));
5738
ef3c2f82ea70 minor changes
alex
parents: 5651
diff changeset
455 case VOCTRL_GUISUPPORT:
ef3c2f82ea70 minor changes
alex
parents: 5651
diff changeset
456 return VO_TRUE;
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6299
diff changeset
457 case VOCTRL_GET_PANSCAN:
6311
da2dda48b7ec add mute support ( step 1 ) and fixed panscan bugs (1000l for me)
pontscho
parents: 6307
diff changeset
458 if ( !vo_config_count || !vo_fs ) return VO_FALSE;
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6299
diff changeset
459 return VO_TRUE;
6382
86d5fc5b54e2 fix panscan support and add Jesper Svennevid's <mplayer@svennevid.net> patch
pontscho
parents: 6311
diff changeset
460 case VOCTRL_FULLSCREEN:
86d5fc5b54e2 fix panscan support and add Jesper Svennevid's <mplayer@svennevid.net> patch
pontscho
parents: 6311
diff changeset
461 vo_x11_fullscreen();
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6299
diff changeset
462 case VOCTRL_SET_PANSCAN:
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6299
diff changeset
463 if ( vo_fs && ( vo_panscan != vo_panscan_amount ) )
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6299
diff changeset
464 {
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6299
diff changeset
465 panscan_calc();
7124
eca7dbad0166 finally removed query_vaa, bes_da and vo_tune_info - the obsoleted libvo api
alex
parents: 6953
diff changeset
466 set_window(0);
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6299
diff changeset
467 }
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 6299
diff changeset
468 return VO_TRUE;
6786
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
469 case VOCTRL_SET_EQUALIZER:
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
470 {
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
471 va_list ap;
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
472 int value;
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
473
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
474 va_start(ap, data);
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
475 value = va_arg(ap, int);
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
476 va_end(ap);
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
477
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
478 return vidix_control(request, data, (int *)value);
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
479 }
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
480 case VOCTRL_GET_EQUALIZER:
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
481 {
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
482 va_list ap;
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
483 int *value;
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
484
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
485 va_start(ap, data);
6843
arpi
parents: 6786
diff changeset
486 value = va_arg(ap, int*);
6786
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
487 va_end(ap);
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
488
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
489 return vidix_control(request, data, value);
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
490 }
4592
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4570
diff changeset
491 }
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
492 return vidix_control(request, data);
6531
7bd342baa785 yvu9,if09,y8,y800 support and multifile fix
alex
parents: 6382
diff changeset
493 // return VO_NOTIMPL;
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4316
diff changeset
494 }