Mercurial > mplayer.hg
annotate libvo/vo_xvidix.c @ 6015:04fe086ae486
vo_uninit fixed
author | arpi |
---|---|
date | Wed, 08 May 2002 19:21:36 +0000 |
parents | bb1f3552f118 |
children | be9cd7d845c2 |
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 */ |
53 static int X_already_started = 0; | |
54 | |
4363 | 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 | 58 static uint32_t bgColor; |
4363 | 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 | 61 /* VIDIX related */ |
62 static char *vidix_name; | |
4434 | 63 static vo_tune_info_t vtune; |
4123 | 64 |
65 /* Image parameters */ | |
66 static uint32_t image_width; | |
67 static uint32_t image_height; | |
68 static uint32_t image_format; | |
69 static uint32_t image_depth; | |
70 | |
71 /* Window parameters */ | |
72 static uint32_t window_x, window_y; | |
73 static uint32_t window_width, window_height; | |
74 | |
4363 | 75 /* used by XGetGeometry & XTranslateCoordinates for moving/resizing window */ |
4123 | 76 static Window mRoot; |
77 static uint32_t drwX, drwY, drwWidth, drwHeight, drwBorderWidth, | |
4981 | 78 drwDepth, drwcX, drwcY, dwidth, dheight; |
4123 | 79 |
4434 | 80 static void set_window(int force_update,const vo_tune_info_t *info) |
4123 | 81 { |
4805 | 82 XGetGeometry(mDisplay, vo_window, &mRoot, &drwX, &drwY, &drwWidth, |
4123 | 83 &drwHeight, &drwBorderWidth, &drwDepth); |
84 drwX = drwY = 0; | |
4805 | 85 XTranslateCoordinates(mDisplay, vo_window, mRoot, 0, 0, |
4241
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
86 &drwcX, &drwcY, &mRoot); |
4123 | 87 |
5320 | 88 aspect(&dwidth,&dheight,A_NOZOOM); |
4981 | 89 if (!vo_fs) |
4271
2c7e6c87fb6f
reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents:
4255
diff
changeset
|
90 mp_msg(MSGT_VO, MSGL_V, "[xvidix] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n", |
2c7e6c87fb6f
reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents:
4255
diff
changeset
|
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 */ |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
94 #if X11_FULLSCREEN |
4981 | 95 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
|
96 { |
5320 | 97 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
|
98 drwX = (vo_screenwidth - (dwidth > vo_screenwidth ? vo_screenwidth : dwidth)) / 2; |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
99 drwcX += drwX; |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
100 drwY = (vo_screenheight - (dheight > vo_screenheight ? vo_screenheight : dheight)) / 2; |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
101 drwcY += drwY; |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
102 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
|
103 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
|
104 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
|
105 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
|
106 } |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
107 #endif |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
108 |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
109 #ifdef HAVE_XINERAMA |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
110 if (XineramaIsActive(mDisplay)) |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
111 { |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
112 XineramaScreenInfo *screens; |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
113 int num_screens; |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
114 int i = 0; |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
115 |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
116 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
|
117 |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
118 /* 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
|
119 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
|
120 (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
|
121 (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
|
122 i++; |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
123 |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
124 /* 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
|
125 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
|
126 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
|
127 XFree(screens); |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
128 } |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
129 #endif |
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 /* set new values in VIDIX */ |
4271
2c7e6c87fb6f
reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents:
4255
diff
changeset
|
132 if (force_update || (window_x != drwcX) || (window_y != drwcY) || |
2c7e6c87fb6f
reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents:
4255
diff
changeset
|
133 (window_width != drwWidth) || (window_height != drwHeight)) |
4123 | 134 { |
4194 | 135 window_x = drwcX; |
136 window_y = drwcY; | |
137 window_width = drwWidth; | |
138 window_height = drwHeight; | |
4198
7e2bf04c9a7c
added vidix_start() and vidix_stop() for better runtime-resize support ;)
alex
parents:
4194
diff
changeset
|
139 |
4123 | 140 /* 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
|
141 vidix_stop(); |
4123 | 142 if (vidix_init(image_width, image_height, window_x, window_y, |
4434 | 143 window_width, window_height, image_format, vo_depthonscreen, |
144 vo_screenwidth, vo_screenheight,info) != 0) | |
4123 | 145 { |
146 mp_msg(MSGT_VO, MSGL_FATAL, "Can't initialize VIDIX driver: %s: %s\n", | |
147 vidix_name, strerror(errno)); | |
148 vidix_term(); | |
149 uninit(); | |
150 exit(1); /* !!! */ | |
151 } | |
4198
7e2bf04c9a7c
added vidix_start() and vidix_stop() for better runtime-resize support ;)
alex
parents:
4194
diff
changeset
|
152 vidix_start(); |
4123 | 153 } |
154 | |
155 mp_msg(MSGT_VO, MSGL_INFO, "[xvidix] window properties: pos: %dx%d, size: %dx%d\n", | |
156 window_x, window_y, window_width, window_height); | |
157 | |
4271
2c7e6c87fb6f
reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents:
4255
diff
changeset
|
158 /* mDrawColorKey: */ |
2c7e6c87fb6f
reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents:
4255
diff
changeset
|
159 |
2c7e6c87fb6f
reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents:
4255
diff
changeset
|
160 /* fill drawable with specified color */ |
5738 | 161 XSetBackground( mDisplay,vo_gc,bgColor ); |
4805 | 162 XClearWindow( mDisplay,vo_window ); |
163 XSetForeground(mDisplay, vo_gc, fgColor); | |
164 XFillRectangle(mDisplay, vo_window, vo_gc, drwX, drwY, drwWidth, | |
4981 | 165 (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
|
166 /* flush, update drawable */ |
2c7e6c87fb6f
reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents:
4255
diff
changeset
|
167 XFlush(mDisplay); |
2c7e6c87fb6f
reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents:
4255
diff
changeset
|
168 |
4123 | 169 return; |
170 } | |
171 | |
172 /* connect to server, create and map window, | |
173 * allocate colors and (shared) memory | |
174 */ | |
4433 | 175 static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, |
176 uint32_t d_height, uint32_t flags, char *title, uint32_t format,const vo_tune_info_t *info) | |
4123 | 177 { |
178 XVisualInfo vinfo; | |
179 XSizeHints hint; | |
180 XSetWindowAttributes xswa; | |
181 unsigned long xswamask; | |
182 XWindowAttributes attribs; | |
183 int window_depth; | |
4125 | 184 |
185 // if (title) | |
186 // free(title); | |
5738 | 187 title = "MPlayer VIDIX X11 Overlay"; |
4123 | 188 |
189 image_height = height; | |
190 image_width = width; | |
191 image_format = format; | |
4459 | 192 |
4123 | 193 if (IMGFMT_IS_RGB(format)) |
194 { | |
195 image_depth = IMGFMT_RGB_DEPTH(format); | |
196 } | |
197 else | |
198 if (IMGFMT_IS_BGR(format)) | |
199 { | |
200 image_depth = IMGFMT_BGR_DEPTH(format); | |
201 } | |
202 else | |
203 switch(format) | |
204 { | |
205 case IMGFMT_IYUV: | |
206 case IMGFMT_I420: | |
207 case IMGFMT_YV12: | |
208 image_depth = 12; | |
209 break; | |
4441
90814d64a840
removed obosolete Terminate_Display_Process. using vo_x11_uninit. support UYVY format
alex
parents:
4434
diff
changeset
|
210 case IMGFMT_UYVY: |
4123 | 211 case IMGFMT_YUY2: |
212 image_depth = 16; | |
213 break; | |
214 default: | |
4459 | 215 image_depth = 16; |
4441
90814d64a840
removed obosolete Terminate_Display_Process. using vo_x11_uninit. support UYVY format
alex
parents:
4434
diff
changeset
|
216 mp_msg(MSGT_VO, MSGL_FATAL, "Unknown image format: %s\n", |
4123 | 217 vo_format_name(format)); |
4459 | 218 break; |
4123 | 219 } |
220 | |
221 if (X_already_started) | |
222 return(-1); | |
223 if (!vo_init()) | |
224 return(-1); | |
225 | |
4241
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
226 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
|
227 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
|
228 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
|
229 |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
230 window_x = 0; |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
231 window_y = 0; |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
232 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
|
233 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
|
234 |
6009 | 235 // vo_fs = flags&0x01; |
236 // if (vo_fs) | |
237 // { vo_old_width=d_width; vo_old_height=d_height; } | |
4123 | 238 |
239 X_already_started++; | |
4241
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
240 |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
241 /* from xmga.c */ |
5738 | 242 bgColor = 0x0L; |
4241
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
243 switch(vo_depthonscreen) |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
244 { |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
245 case 32: |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
246 case 24: |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
247 fgColor = 0x00ff00ffL; |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
248 break; |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
249 case 16: |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
250 fgColor = 0xf81fL; |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
251 break; |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
252 case 15: |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
253 fgColor = 0x7c1fL; |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
254 break; |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
255 default: |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
256 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
|
257 vo_depthonscreen); |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
258 } |
4123 | 259 |
260 aspect(&d_width, &d_height, A_NOZOOM); | |
6009 | 261 |
262 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
|
263 |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
264 #ifdef HAVE_NEW_GUI |
6009 | 265 if(use_gui) guiGetEvent( guiSetShVideo,0 ); // the GUI will set up / resize the window |
266 else | |
4241
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
267 { |
4123 | 268 #endif |
269 | |
4241
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
270 #ifdef X11_FULLSCREEN |
6009 | 271 if ( flags&1 ) /* fullscreen */ |
4271
2c7e6c87fb6f
reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents:
4255
diff
changeset
|
272 { |
4241
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
273 if (flags & 0x04) |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
274 { |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
275 aspect(&d_width, &d_height, A_ZOOM); |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
276 } |
6009 | 277 // else |
278 // { | |
279 // d_width = vo_screenwidth; | |
280 // d_height = vo_screenheight; | |
281 // } | |
282 // window_width = vo_screenwidth; | |
283 // window_height = vo_screenheight; | |
4271
2c7e6c87fb6f
reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents:
4255
diff
changeset
|
284 } |
4241
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
285 #endif |
5047 | 286 dwidth = d_width; |
287 dheight = d_height; | |
4123 | 288 /* Make the window */ |
289 XGetWindowAttributes(mDisplay, DefaultRootWindow(mDisplay), &attribs); | |
290 | |
291 /* from vo_x11 */ | |
292 window_depth = attribs.depth; | |
293 if ((window_depth != 15) && (window_depth != 16) && (window_depth != 24) | |
294 && (window_depth != 32)) | |
295 window_depth = 24; | |
296 XMatchVisualInfo(mDisplay, mScreen, window_depth, TrueColor, &vinfo); | |
297 | |
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
|
298 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
|
299 xswa.border_pixel = 0; |
4123 | 300 xswa.colormap = XCreateColormap(mDisplay, RootWindow(mDisplay, mScreen), |
301 vinfo.visual, AllocNone); | |
5823 | 302 xswa.event_mask = StructureNotifyMask | ExposureMask | KeyPressMask | |
303 ((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
|
304 xswamask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask; |
4123 | 305 |
306 if (WinID >= 0) | |
307 { | |
4805 | 308 vo_window = WinID ? ((Window)WinID) : RootWindow(mDisplay, mScreen); |
309 XUnmapWindow(mDisplay, vo_window); | |
310 XChangeWindowAttributes(mDisplay, vo_window, xswamask, &xswa); | |
4123 | 311 } |
312 else | |
4805 | 313 vo_window = XCreateWindow(mDisplay, RootWindow(mDisplay, mScreen), |
4271
2c7e6c87fb6f
reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents:
4255
diff
changeset
|
314 window_x, window_y, 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
|
315 vinfo.depth, InputOutput, vinfo.visual, xswamask, &xswa); |
4123 | 316 |
4805 | 317 vo_x11_classhint(mDisplay, vo_window, "xvidix"); |
318 vo_hidecursor(mDisplay, vo_window); | |
4123 | 319 |
6009 | 320 //#ifdef X11_FULLSCREEN |
321 // if (vo_fs && vo_wm_type == 0) /* fullscreen */ | |
322 // vo_x11_decoration(mDisplay, vo_window, 0); | |
323 //#endif | |
4123 | 324 |
4805 | 325 XGetNormalHints(mDisplay, vo_window, &hint); |
4241
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
326 hint.x = window_x; |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
327 hint.y = window_y; |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
328 hint.base_width = hint.width = window_width; |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
329 hint.base_height = hint.height = window_height; |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
330 hint.flags = USPosition | USSize; |
4805 | 331 XSetNormalHints(mDisplay, vo_window, &hint); |
4762 | 332 |
4805 | 333 XStoreName(mDisplay, vo_window, title); |
4241
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
334 /* Map window. */ |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
335 |
4805 | 336 XMapWindow(mDisplay, vo_window); |
6009 | 337 |
338 if ( flags&1 ) vo_x11_fullscreen(); | |
339 | |
4241
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
340 #ifdef HAVE_XINERAMA |
4805 | 341 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
|
342 #endif |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
343 |
4805 | 344 vo_gc = XCreateGC(mDisplay, vo_window, GCForeground, &mGCV); |
4123 | 345 |
6009 | 346 // XSelectInput( mDisplay,vo_window,StructureNotifyMask | KeyPressMask | ButtonPressMask | ButtonReleaseMask ); |
4241
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
347 #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
|
348 } |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
349 #endif |
4123 | 350 |
4271
2c7e6c87fb6f
reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents:
4255
diff
changeset
|
351 mp_msg(MSGT_VO, MSGL_INFO, "[xvidix] image properties: %dx%d depth: %d\n", |
2c7e6c87fb6f
reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents:
4255
diff
changeset
|
352 image_width, image_height, image_depth); |
2c7e6c87fb6f
reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents:
4255
diff
changeset
|
353 |
4255 | 354 if (vidix_grkey_support()) |
355 { | |
356 vidix_grkey_get(&gr_key); | |
357 gr_key.key_op = KEYS_PUT; | |
358 gr_key.ckey.op = CKEY_TRUE; | |
359 gr_key.ckey.red = 255; | |
360 gr_key.ckey.green = 0; | |
361 gr_key.ckey.blue = 255; | |
362 vidix_grkey_set(&gr_key); | |
363 } | |
4241
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
364 |
4434 | 365 set_window(1,info); |
366 if(info) memcpy(&vtune,info,sizeof(vo_tune_info_t)); | |
367 else memset(&vtune,0,sizeof(vo_tune_info_t)); | |
4805 | 368 XFlush(mDisplay); |
369 XSync(mDisplay, False); | |
4123 | 370 |
371 saver_off(mDisplay); /* turning off screen saver */ | |
372 | |
373 return(0); | |
374 } | |
375 | |
376 static const vo_info_t *get_info(void) | |
377 { | |
378 return(&vo_info); | |
379 } | |
380 | |
381 static void check_events(void) | |
382 { | |
383 const int event = vo_x11_check_events(mDisplay); | |
4125 | 384 |
4271
2c7e6c87fb6f
reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents:
4255
diff
changeset
|
385 if ((event & VO_EVENT_RESIZE) || (event & VO_EVENT_EXPOSE)) |
4434 | 386 set_window(0,&vtune); |
4241
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
387 |
4125 | 388 return; |
4123 | 389 } |
390 | |
391 /* draw_osd, flip_page, draw_slice, draw_frame should be | |
392 overwritten with vidix functions (vosub_vidix.c) */ | |
393 static void draw_osd(void) | |
394 { | |
395 mp_msg(MSGT_VO, MSGL_FATAL, "[xvidix] error: didn't used vidix draw_osd!\n"); | |
396 return; | |
397 } | |
398 | |
399 static void flip_page(void) | |
400 { | |
401 mp_msg(MSGT_VO, MSGL_FATAL, "[xvidix] error: didn't used vidix flip_page!\n"); | |
402 return; | |
403 } | |
404 | |
405 static uint32_t draw_slice(uint8_t *src[], int stride[], | |
406 int w, int h, int x, int y) | |
407 { | |
4271
2c7e6c87fb6f
reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents:
4255
diff
changeset
|
408 UNUSED(src); |
2c7e6c87fb6f
reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents:
4255
diff
changeset
|
409 UNUSED(stride); |
2c7e6c87fb6f
reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents:
4255
diff
changeset
|
410 UNUSED(w); |
2c7e6c87fb6f
reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents:
4255
diff
changeset
|
411 UNUSED(h); |
2c7e6c87fb6f
reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents:
4255
diff
changeset
|
412 UNUSED(x); |
2c7e6c87fb6f
reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents:
4255
diff
changeset
|
413 UNUSED(y); |
4123 | 414 mp_msg(MSGT_VO, MSGL_FATAL, "[xvidix] error: didn't used vidix draw_slice!\n"); |
415 return(0); | |
416 } | |
417 | |
418 static uint32_t draw_frame(uint8_t *src[]) | |
419 { | |
4271
2c7e6c87fb6f
reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents:
4255
diff
changeset
|
420 UNUSED(src); |
4123 | 421 mp_msg(MSGT_VO, MSGL_FATAL, "[xvidix] error: didn't used vidix draw_frame!\n"); |
422 return(0); | |
423 } | |
424 | |
425 static uint32_t query_format(uint32_t format) | |
426 { | |
4363 | 427 return(vidix_query_fourcc(format)); |
4123 | 428 } |
429 | |
430 static void uninit(void) | |
431 { | |
4241
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
432 vidix_term(); |
4441
90814d64a840
removed obosolete Terminate_Display_Process. using vo_x11_uninit. support UYVY format
alex
parents:
4434
diff
changeset
|
433 |
4316 | 434 saver_on(mDisplay); /* screen saver back on */ |
4805 | 435 vo_x11_uninit(mDisplay, vo_window); |
4271
2c7e6c87fb6f
reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents:
4255
diff
changeset
|
436 } |
4352 | 437 |
438 static uint32_t preinit(const char *arg) | |
439 { | |
4363 | 440 if (arg) |
441 vidix_name = strdup(arg); | |
442 else | |
443 { | |
444 mp_msg(MSGT_VO, MSGL_INFO, "No vidix driver name provided, probing available ones!\n"); | |
445 vidix_name = NULL; | |
446 } | |
447 | |
448 if (vidix_preinit(vidix_name, &video_out_xvidix) != 0) | |
449 return(1); | |
450 | |
451 return(0); | |
4352 | 452 } |
453 | |
4596 | 454 static uint32_t control(uint32_t request, void *data, ...) |
4352 | 455 { |
4592
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4570
diff
changeset
|
456 switch (request) { |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4570
diff
changeset
|
457 case VOCTRL_QUERY_FORMAT: |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4570
diff
changeset
|
458 return query_format(*((uint32_t*)data)); |
5738 | 459 case VOCTRL_GUISUPPORT: |
460 return VO_TRUE; | |
4981 | 461 case VOCTRL_FULLSCREEN: |
462 vo_x11_fullscreen(); | |
463 return VO_TRUE; | |
4592
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4570
diff
changeset
|
464 } |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4570
diff
changeset
|
465 return VO_NOTIMPL; |
4352 | 466 } |