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