Mercurial > mplayer.hg
annotate libvo/vo_xvidix.c @ 7535:37bc382a61e6
no fix window size
author | pontscho |
---|---|
date | Sat, 28 Sep 2002 19:00:50 +0000 |
parents | eca7dbad0166 |
children | ed7b05575aab |
rev | line source |
---|---|
4123 | 1 /* |
2 VIDIX accelerated overlay in a X window | |
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 | 5 |
6 WS window manager by Pontscho/Fresh! | |
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 | 9 */ |
10 | |
11 #include <stdio.h> | |
12 #include <stdlib.h> | |
13 #include <string.h> | |
14 #include <math.h> | |
15 #include <errno.h> | |
16 | |
17 #include "config.h" | |
18 #include "video_out.h" | |
19 #include "video_out_internal.h" | |
20 | |
21 #include <X11/Xlib.h> | |
22 #include <X11/Xutil.h> | |
23 //#include <X11/keysym.h> | |
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 | 29 #include "x11_common.h" |
30 #include "aspect.h" | |
31 #include "mp_msg.h" | |
32 | |
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 | 35 |
6009 | 36 #ifdef HAVE_NEW_GUI |
37 #include "../Gui/interface.h" | |
38 #endif | |
39 | |
4123 | 40 LIBVO_EXTERN(xvidix) |
41 | |
42 static vo_info_t vo_info = | |
43 { | |
44 "X11 (VIDIX)", | |
45 "xvidix", | |
46 "Alex Beregszaszi", | |
47 "" | |
48 }; | |
49 | |
4271
2c7e6c87fb6f
reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents:
4255
diff
changeset
|
50 #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
|
51 |
4123 | 52 /* X11 related variables */ |
4363 | 53 /* Colorkey handling */ |
4241
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
54 static XGCValues mGCV; |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
55 static uint32_t fgColor; |
5738 | 56 static uint32_t bgColor; |
4363 | 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 | 59 /* VIDIX related */ |
60 static char *vidix_name; | |
4123 | 61 |
62 /* Image parameters */ | |
63 static uint32_t image_width; | |
64 static uint32_t image_height; | |
65 static uint32_t image_format; | |
66 | |
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 | 69 static uint32_t window_width, window_height; |
70 | |
4363 | 71 /* used by XGetGeometry & XTranslateCoordinates for moving/resizing window */ |
4123 | 72 static uint32_t drwX, drwY, drwWidth, drwHeight, drwBorderWidth, |
4981 | 73 drwDepth, drwcX, drwcY, dwidth, dheight; |
4123 | 74 |
6755 | 75 extern void set_video_eq( int cap ); |
76 | |
7124
eca7dbad0166
finally removed query_vaa, bes_da and vo_tune_info - the obsoleted libvo api
alex
parents:
6953
diff
changeset
|
77 static void set_window(int force_update) |
4123 | 78 { |
6095 | 79 Window mRoot; |
6043 | 80 if ( WinID ) |
81 { | |
82 XGetGeometry(mDisplay, vo_window, &mRoot, &drwX, &drwY, &drwWidth, | |
83 &drwHeight, &drwBorderWidth, &drwDepth); | |
84 drwX = drwY = 0; | |
6307 | 85 |
6043 | 86 XTranslateCoordinates(mDisplay, vo_window, mRoot, 0, 0, |
87 &drwcX, &drwcY, &mRoot); | |
88 aspect(&dwidth,&dheight,A_NOZOOM); | |
89 if (!vo_fs) | |
90 mp_msg(MSGT_VO, MSGL_V, "[xvidix] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n", | |
91 drwcX, drwcY, drwX, drwY, drwWidth, drwHeight); | |
4123 | 92 |
4241
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
93 /* following stuff copied from vo_xmga.c */ |
6043 | 94 } |
95 else | |
96 { | |
97 aspect(&dwidth,&dheight,A_NOZOOM); | |
98 drwcX=drwX=vo_dx; drwcY=drwY=vo_dy; drwWidth=vo_dwidth; drwHeight=vo_dheight; | |
99 } | |
100 | |
4241
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
101 #if X11_FULLSCREEN |
4981 | 102 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
|
103 { |
5320 | 104 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
|
105 drwX = (vo_screenwidth - (dwidth > vo_screenwidth ? vo_screenwidth : dwidth)) / 2; |
6043 | 106 drwcX = drwX; |
4241
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
107 drwY = (vo_screenheight - (dheight > vo_screenheight ? vo_screenheight : dheight)) / 2; |
6043 | 108 drwcY = drwY; |
4241
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
109 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
|
110 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
|
111 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
|
112 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
|
113 } |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
114 #endif |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
115 |
6307 | 116 vo_dwidth=drwWidth; vo_dheight=drwHeight; |
117 | |
4241
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
118 #ifdef HAVE_XINERAMA |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
119 if (XineramaIsActive(mDisplay)) |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
120 { |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
121 XineramaScreenInfo *screens; |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
122 int num_screens; |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
123 int i = 0; |
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 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
|
126 |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
127 /* find the screen we are on */ |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
128 while ((screens[i].x_org <= drwcX) || (screens[i].y_org <= drwcY) || |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
129 (screens[i].x_org + screens[i].width >= drwcX) || |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
130 (screens[i].y_org + screens[i].height >= drwcY)) |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
131 i++; |
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 /* 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
|
134 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
|
135 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
|
136 XFree(screens); |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
137 } |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
138 #endif |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
139 |
6382
86d5fc5b54e2
fix panscan support and add Jesper Svennevid's <mplayer@svennevid.net> patch
pontscho
parents:
6311
diff
changeset
|
140 if ( vo_panscan > 0.0f && vo_fs ) |
6307 | 141 { |
142 drwcX-=vo_panscan_x >> 1; | |
143 drwcY-=vo_panscan_y >> 1; | |
144 drwX-=vo_panscan_x >> 1; | |
145 drwY-=vo_panscan_y >> 1; | |
146 drwWidth+=vo_panscan_x; | |
147 drwHeight+=vo_panscan_y; | |
148 } | |
149 | |
4241
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
150 /* set new values in VIDIX */ |
6299
4446af3c1a75
set_window() fixing detection of changement of the window position
attila
parents:
6095
diff
changeset
|
151 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
|
152 (window_width != drwWidth) || (window_height != drwHeight)) |
4123 | 153 { |
6299
4446af3c1a75
set_window() fixing detection of changement of the window position
attila
parents:
6095
diff
changeset
|
154 // do a backup of window coordinates |
4446af3c1a75
set_window() fixing detection of changement of the window position
attila
parents:
6095
diff
changeset
|
155 window_x = drwcX; |
4446af3c1a75
set_window() fixing detection of changement of the window position
attila
parents:
6095
diff
changeset
|
156 window_y = drwcY; |
6043 | 157 vo_dx = drwcX; |
158 vo_dy = drwcY; | |
4194 | 159 window_width = drwWidth; |
160 window_height = drwHeight; | |
4198
7e2bf04c9a7c
added vidix_start() and vidix_stop() for better runtime-resize support ;)
alex
parents:
4194
diff
changeset
|
161 |
4123 | 162 /* 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
|
163 vidix_stop(); |
6043 | 164 if (vidix_init(image_width, image_height, vo_dx, vo_dy, |
4434 | 165 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
|
166 vo_screenwidth, vo_screenheight) != 0) |
4123 | 167 { |
6598
ea9418aec756
fixed vidix terminating if init error occured, bug found by KotH
alex
parents:
6563
diff
changeset
|
168 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
|
169 exit_player("vidix error"); /* !!! */ |
4123 | 170 } |
4198
7e2bf04c9a7c
added vidix_start() and vidix_stop() for better runtime-resize support ;)
alex
parents:
4194
diff
changeset
|
171 vidix_start(); |
4123 | 172 } |
173 | |
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
|
174 mp_msg(MSGT_VO, MSGL_V, "[xvidix] window properties: pos: %dx%d, size: %dx%d\n", |
6043 | 175 vo_dx, vo_dy, window_width, window_height); |
4123 | 176 |
4271
2c7e6c87fb6f
reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents:
4255
diff
changeset
|
177 /* mDrawColorKey: */ |
2c7e6c87fb6f
reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents:
4255
diff
changeset
|
178 |
2c7e6c87fb6f
reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents:
4255
diff
changeset
|
179 /* fill drawable with specified color */ |
5738 | 180 XSetBackground( mDisplay,vo_gc,bgColor ); |
4805 | 181 XClearWindow( mDisplay,vo_window ); |
182 XSetForeground(mDisplay, vo_gc, fgColor); | |
183 XFillRectangle(mDisplay, vo_window, vo_gc, drwX, drwY, drwWidth, | |
4981 | 184 (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
|
185 /* flush, update drawable */ |
2c7e6c87fb6f
reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents:
4255
diff
changeset
|
186 XFlush(mDisplay); |
2c7e6c87fb6f
reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents:
4255
diff
changeset
|
187 |
4123 | 188 return; |
189 } | |
190 | |
191 /* connect to server, create and map window, | |
192 * allocate colors and (shared) memory | |
193 */ | |
4433 | 194 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
|
195 uint32_t d_height, uint32_t flags, char *title, uint32_t format) |
4123 | 196 { |
197 XVisualInfo vinfo; | |
198 XSizeHints hint; | |
199 XSetWindowAttributes xswa; | |
200 unsigned long xswamask; | |
201 XWindowAttributes attribs; | |
202 int window_depth; | |
4125 | 203 |
204 // if (title) | |
205 // free(title); | |
5738 | 206 title = "MPlayer VIDIX X11 Overlay"; |
4123 | 207 |
6307 | 208 panscan_init(); |
209 | |
4123 | 210 image_height = height; |
211 image_width = width; | |
212 image_format = format; | |
6043 | 213 vo_mouse_autohide=1; |
4459 | 214 |
4123 | 215 if (!vo_init()) |
216 return(-1); | |
217 | |
4241
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
218 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
|
219 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
|
220 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
|
221 |
6043 | 222 vo_dx = 0; |
223 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
|
224 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
|
225 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
|
226 |
6009 | 227 // vo_fs = flags&0x01; |
228 // if (vo_fs) | |
229 // { vo_old_width=d_width; vo_old_height=d_height; } | |
4123 | 230 |
4241
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
231 /* from xmga.c */ |
5738 | 232 bgColor = 0x0L; |
4241
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
233 switch(vo_depthonscreen) |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
234 { |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
235 case 32: |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
236 case 24: |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
237 fgColor = 0x00ff00ffL; |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
238 break; |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
239 case 16: |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
240 fgColor = 0xf81fL; |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
241 break; |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
242 case 15: |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
243 fgColor = 0x7c1fL; |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
244 break; |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
245 default: |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
246 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
|
247 vo_depthonscreen); |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
248 } |
4123 | 249 |
250 aspect(&d_width, &d_height, A_NOZOOM); | |
6043 | 251 |
252 vo_dx=( vo_screenwidth - d_width ) / 2; vo_dy=( vo_screenheight - d_height ) / 2; | |
6009 | 253 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
|
254 |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
255 #ifdef HAVE_NEW_GUI |
6009 | 256 if(use_gui) guiGetEvent( guiSetShVideo,0 ); // the GUI will set up / resize the window |
257 else | |
4241
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
258 { |
4123 | 259 #endif |
260 | |
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
|
261 /* destroy window before creating one */ |
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
|
262 if (vo_window) XDestroyWindow(mDisplay, vo_window); |
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
|
263 |
4241
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
264 #ifdef X11_FULLSCREEN |
6043 | 265 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
|
266 #endif |
5047 | 267 dwidth = d_width; |
268 dheight = d_height; | |
4123 | 269 /* Make the window */ |
270 XGetWindowAttributes(mDisplay, DefaultRootWindow(mDisplay), &attribs); | |
271 | |
272 /* from vo_x11 */ | |
273 window_depth = attribs.depth; | |
274 if ((window_depth != 15) && (window_depth != 16) && (window_depth != 24) | |
275 && (window_depth != 32)) | |
276 window_depth = 24; | |
277 XMatchVisualInfo(mDisplay, mScreen, window_depth, TrueColor, &vinfo); | |
278 | |
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
|
279 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
|
280 xswa.border_pixel = 0; |
4123 | 281 xswa.colormap = XCreateColormap(mDisplay, RootWindow(mDisplay, mScreen), |
282 vinfo.visual, AllocNone); | |
6043 | 283 xswa.event_mask = StructureNotifyMask | ExposureMask | KeyPressMask | PropertyChangeMask | |
5823 | 284 ((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
|
285 xswamask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask; |
4123 | 286 |
287 if (WinID >= 0) | |
288 { | |
4805 | 289 vo_window = WinID ? ((Window)WinID) : RootWindow(mDisplay, mScreen); |
6043 | 290 if ( WinID ) |
291 { | |
292 XUnmapWindow(mDisplay, vo_window); | |
293 XChangeWindowAttributes(mDisplay, vo_window, xswamask, &xswa); | |
6953
ce67cc1f0beb
ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents:
6843
diff
changeset
|
294 vo_x11_selectinput_witherr( mDisplay,vo_window,StructureNotifyMask | KeyPressMask | PropertyChangeMask | PointerMotionMask | ButtonPressMask | ButtonReleaseMask | ExposureMask ); |
6043 | 295 } else XSelectInput( mDisplay,vo_window,ExposureMask ); |
4123 | 296 } |
297 else | |
6043 | 298 { |
299 vo_window = XCreateWindow(mDisplay, RootWindow(mDisplay, mScreen), | |
300 vo_dx, vo_dy, window_width, window_height, xswa.border_pixel, | |
4241
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
301 vinfo.depth, InputOutput, vinfo.visual, xswamask, &xswa); |
4123 | 302 |
6043 | 303 vo_x11_classhint(mDisplay, vo_window, "xvidix"); |
304 vo_hidecursor(mDisplay, vo_window); | |
305 vo_x11_sizehint( vo_dx,vo_dy,vo_dwidth,vo_dheight,0 ); | |
4123 | 306 |
6043 | 307 XStoreName(mDisplay, vo_window, title); |
308 XMapWindow(mDisplay, vo_window); | |
6009 | 309 |
6043 | 310 if ( flags&1 ) vo_x11_fullscreen(); |
6009 | 311 |
4241
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
312 #ifdef HAVE_XINERAMA |
6043 | 313 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
|
314 #endif |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
315 |
6043 | 316 } |
4805 | 317 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
|
318 #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
|
319 } |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
320 #endif |
4123 | 321 |
6043 | 322 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
|
323 |
4255 | 324 if (vidix_grkey_support()) |
325 { | |
326 vidix_grkey_get(&gr_key); | |
327 gr_key.key_op = KEYS_PUT; | |
328 gr_key.ckey.op = CKEY_TRUE; | |
329 gr_key.ckey.red = 255; | |
330 gr_key.ckey.green = 0; | |
331 gr_key.ckey.blue = 255; | |
332 vidix_grkey_set(&gr_key); | |
333 } | |
4241
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
334 |
7124
eca7dbad0166
finally removed query_vaa, bes_da and vo_tune_info - the obsoleted libvo api
alex
parents:
6953
diff
changeset
|
335 set_window(1); |
6755 | 336 |
4805 | 337 XFlush(mDisplay); |
338 XSync(mDisplay, False); | |
4123 | 339 |
6382
86d5fc5b54e2
fix panscan support and add Jesper Svennevid's <mplayer@svennevid.net> patch
pontscho
parents:
6311
diff
changeset
|
340 panscan_calc(); |
86d5fc5b54e2
fix panscan support and add Jesper Svennevid's <mplayer@svennevid.net> patch
pontscho
parents:
6311
diff
changeset
|
341 |
4123 | 342 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
|
343 |
da2dda48b7ec
add mute support ( step 1 ) and fixed panscan bugs (1000l for me)
pontscho
parents:
6307
diff
changeset
|
344 vo_config_count++; |
4123 | 345 |
346 return(0); | |
347 } | |
348 | |
349 static const vo_info_t *get_info(void) | |
350 { | |
351 return(&vo_info); | |
352 } | |
353 | |
354 static void check_events(void) | |
355 { | |
356 const int event = vo_x11_check_events(mDisplay); | |
4125 | 357 |
4271
2c7e6c87fb6f
reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents:
4255
diff
changeset
|
358 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
|
359 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
|
360 |
4125 | 361 return; |
4123 | 362 } |
363 | |
364 /* draw_osd, flip_page, draw_slice, draw_frame should be | |
365 overwritten with vidix functions (vosub_vidix.c) */ | |
366 static void draw_osd(void) | |
367 { | |
368 mp_msg(MSGT_VO, MSGL_FATAL, "[xvidix] error: didn't used vidix draw_osd!\n"); | |
369 return; | |
370 } | |
371 | |
372 static void flip_page(void) | |
373 { | |
374 mp_msg(MSGT_VO, MSGL_FATAL, "[xvidix] error: didn't used vidix flip_page!\n"); | |
375 return; | |
376 } | |
377 | |
378 static uint32_t draw_slice(uint8_t *src[], int stride[], | |
379 int w, int h, int x, int y) | |
380 { | |
4271
2c7e6c87fb6f
reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents:
4255
diff
changeset
|
381 UNUSED(src); |
2c7e6c87fb6f
reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents:
4255
diff
changeset
|
382 UNUSED(stride); |
2c7e6c87fb6f
reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents:
4255
diff
changeset
|
383 UNUSED(w); |
2c7e6c87fb6f
reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents:
4255
diff
changeset
|
384 UNUSED(h); |
2c7e6c87fb6f
reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents:
4255
diff
changeset
|
385 UNUSED(x); |
2c7e6c87fb6f
reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents:
4255
diff
changeset
|
386 UNUSED(y); |
4123 | 387 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
|
388 return(-1); |
4123 | 389 } |
390 | |
391 static uint32_t draw_frame(uint8_t *src[]) | |
392 { | |
4271
2c7e6c87fb6f
reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents:
4255
diff
changeset
|
393 UNUSED(src); |
4123 | 394 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
|
395 return(-1); |
4123 | 396 } |
397 | |
398 static uint32_t query_format(uint32_t format) | |
399 { | |
4363 | 400 return(vidix_query_fourcc(format)); |
4123 | 401 } |
402 | |
403 static void uninit(void) | |
404 { | |
6563 | 405 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
|
406 vidix_term(); |
4441
90814d64a840
removed obosolete Terminate_Display_Process. using vo_x11_uninit. support UYVY format
alex
parents:
4434
diff
changeset
|
407 |
4316 | 408 saver_on(mDisplay); /* screen saver back on */ |
6095 | 409 vo_x11_uninit(); |
4271
2c7e6c87fb6f
reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents:
4255
diff
changeset
|
410 } |
4352 | 411 |
412 static uint32_t preinit(const char *arg) | |
413 { | |
6016 | 414 |
4363 | 415 if (arg) |
416 vidix_name = strdup(arg); | |
417 else | |
418 { | |
419 mp_msg(MSGT_VO, MSGL_INFO, "No vidix driver name provided, probing available ones!\n"); | |
420 vidix_name = NULL; | |
421 } | |
422 | |
423 if (vidix_preinit(vidix_name, &video_out_xvidix) != 0) | |
424 return(1); | |
425 | |
426 return(0); | |
4352 | 427 } |
428 | |
4596 | 429 static uint32_t control(uint32_t request, void *data, ...) |
4352 | 430 { |
4592
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4570
diff
changeset
|
431 switch (request) { |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4570
diff
changeset
|
432 case VOCTRL_QUERY_FORMAT: |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4570
diff
changeset
|
433 return query_format(*((uint32_t*)data)); |
5738 | 434 case VOCTRL_GUISUPPORT: |
435 return VO_TRUE; | |
6307 | 436 case VOCTRL_GET_PANSCAN: |
6311
da2dda48b7ec
add mute support ( step 1 ) and fixed panscan bugs (1000l for me)
pontscho
parents:
6307
diff
changeset
|
437 if ( !vo_config_count || !vo_fs ) return VO_FALSE; |
6307 | 438 return VO_TRUE; |
6382
86d5fc5b54e2
fix panscan support and add Jesper Svennevid's <mplayer@svennevid.net> patch
pontscho
parents:
6311
diff
changeset
|
439 case VOCTRL_FULLSCREEN: |
86d5fc5b54e2
fix panscan support and add Jesper Svennevid's <mplayer@svennevid.net> patch
pontscho
parents:
6311
diff
changeset
|
440 vo_x11_fullscreen(); |
6307 | 441 case VOCTRL_SET_PANSCAN: |
442 if ( vo_fs && ( vo_panscan != vo_panscan_amount ) ) | |
443 { | |
444 panscan_calc(); | |
7124
eca7dbad0166
finally removed query_vaa, bes_da and vo_tune_info - the obsoleted libvo api
alex
parents:
6953
diff
changeset
|
445 set_window(0); |
6307 | 446 } |
447 return VO_TRUE; | |
6786 | 448 case VOCTRL_SET_EQUALIZER: |
449 { | |
450 va_list ap; | |
451 int value; | |
452 | |
453 va_start(ap, data); | |
454 value = va_arg(ap, int); | |
455 va_end(ap); | |
456 | |
457 return vidix_control(request, data, (int *)value); | |
458 } | |
459 case VOCTRL_GET_EQUALIZER: | |
460 { | |
461 va_list ap; | |
462 int *value; | |
463 | |
464 va_start(ap, data); | |
6843 | 465 value = va_arg(ap, int*); |
6786 | 466 va_end(ap); |
467 | |
468 return vidix_control(request, data, value); | |
469 } | |
4592
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4570
diff
changeset
|
470 } |
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
|
471 return vidix_control(request, data); |
6531 | 472 // return VO_NOTIMPL; |
4352 | 473 } |