Mercurial > mplayer.hg
annotate libvo/vo_xvidix.c @ 6017:12460040d86b
partial fix
author | arpi |
---|---|
date | Wed, 08 May 2002 20:53:00 +0000 |
parents | be9cd7d845c2 |
children | 421781c5b128 |
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 (!vo_init()) | |
222 return(-1); | |
223 | |
4241
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
224 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
|
225 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
|
226 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
|
227 |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
228 window_x = 0; |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
229 window_y = 0; |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
230 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
|
231 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
|
232 |
6009 | 233 // vo_fs = flags&0x01; |
234 // if (vo_fs) | |
235 // { vo_old_width=d_width; vo_old_height=d_height; } | |
4123 | 236 |
4241
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
237 /* from xmga.c */ |
5738 | 238 bgColor = 0x0L; |
4241
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
239 switch(vo_depthonscreen) |
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 case 32: |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
242 case 24: |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
243 fgColor = 0x00ff00ffL; |
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 case 16: |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
246 fgColor = 0xf81fL; |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
247 break; |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
248 case 15: |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
249 fgColor = 0x7c1fL; |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
250 break; |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
251 default: |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
252 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
|
253 vo_depthonscreen); |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
254 } |
4123 | 255 |
256 aspect(&d_width, &d_height, A_NOZOOM); | |
6009 | 257 |
258 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
|
259 |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
260 #ifdef HAVE_NEW_GUI |
6009 | 261 if(use_gui) guiGetEvent( guiSetShVideo,0 ); // the GUI will set up / resize the window |
262 else | |
4241
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
263 { |
4123 | 264 #endif |
265 | |
4241
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
266 #ifdef X11_FULLSCREEN |
6009 | 267 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
|
268 { |
4241
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
269 if (flags & 0x04) |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
270 { |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
271 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
|
272 } |
6009 | 273 // else |
274 // { | |
275 // d_width = vo_screenwidth; | |
276 // d_height = vo_screenheight; | |
277 // } | |
278 // window_width = vo_screenwidth; | |
279 // 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
|
280 } |
4241
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
281 #endif |
5047 | 282 dwidth = d_width; |
283 dheight = d_height; | |
4123 | 284 /* Make the window */ |
285 XGetWindowAttributes(mDisplay, DefaultRootWindow(mDisplay), &attribs); | |
286 | |
287 /* from vo_x11 */ | |
288 window_depth = attribs.depth; | |
289 if ((window_depth != 15) && (window_depth != 16) && (window_depth != 24) | |
290 && (window_depth != 32)) | |
291 window_depth = 24; | |
292 XMatchVisualInfo(mDisplay, mScreen, window_depth, TrueColor, &vinfo); | |
293 | |
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
|
294 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
|
295 xswa.border_pixel = 0; |
4123 | 296 xswa.colormap = XCreateColormap(mDisplay, RootWindow(mDisplay, mScreen), |
297 vinfo.visual, AllocNone); | |
5823 | 298 xswa.event_mask = StructureNotifyMask | ExposureMask | KeyPressMask | |
299 ((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
|
300 xswamask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask; |
4123 | 301 |
302 if (WinID >= 0) | |
303 { | |
4805 | 304 vo_window = WinID ? ((Window)WinID) : RootWindow(mDisplay, mScreen); |
305 XUnmapWindow(mDisplay, vo_window); | |
306 XChangeWindowAttributes(mDisplay, vo_window, xswamask, &xswa); | |
4123 | 307 } |
308 else | |
4805 | 309 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
|
310 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
|
311 vinfo.depth, InputOutput, vinfo.visual, xswamask, &xswa); |
4123 | 312 |
4805 | 313 vo_x11_classhint(mDisplay, vo_window, "xvidix"); |
314 vo_hidecursor(mDisplay, vo_window); | |
4123 | 315 |
6009 | 316 //#ifdef X11_FULLSCREEN |
317 // if (vo_fs && vo_wm_type == 0) /* fullscreen */ | |
318 // vo_x11_decoration(mDisplay, vo_window, 0); | |
319 //#endif | |
4123 | 320 |
4805 | 321 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
|
322 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
|
323 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
|
324 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
|
325 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
|
326 hint.flags = USPosition | USSize; |
4805 | 327 XSetNormalHints(mDisplay, vo_window, &hint); |
4762 | 328 |
4805 | 329 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
|
330 /* Map window. */ |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
331 |
4805 | 332 XMapWindow(mDisplay, vo_window); |
6009 | 333 |
334 if ( flags&1 ) vo_x11_fullscreen(); | |
335 | |
4241
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
336 #ifdef HAVE_XINERAMA |
4805 | 337 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
|
338 #endif |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
339 |
4805 | 340 vo_gc = XCreateGC(mDisplay, vo_window, GCForeground, &mGCV); |
4123 | 341 |
6009 | 342 // 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
|
343 #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
|
344 } |
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
345 #endif |
4123 | 346 |
4271
2c7e6c87fb6f
reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents:
4255
diff
changeset
|
347 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
|
348 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
|
349 |
4255 | 350 if (vidix_grkey_support()) |
351 { | |
352 vidix_grkey_get(&gr_key); | |
353 gr_key.key_op = KEYS_PUT; | |
354 gr_key.ckey.op = CKEY_TRUE; | |
355 gr_key.ckey.red = 255; | |
356 gr_key.ckey.green = 0; | |
357 gr_key.ckey.blue = 255; | |
358 vidix_grkey_set(&gr_key); | |
359 } | |
4241
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
360 |
4434 | 361 set_window(1,info); |
362 if(info) memcpy(&vtune,info,sizeof(vo_tune_info_t)); | |
363 else memset(&vtune,0,sizeof(vo_tune_info_t)); | |
4805 | 364 XFlush(mDisplay); |
365 XSync(mDisplay, False); | |
4123 | 366 |
367 saver_off(mDisplay); /* turning off screen saver */ | |
368 | |
369 return(0); | |
370 } | |
371 | |
372 static const vo_info_t *get_info(void) | |
373 { | |
374 return(&vo_info); | |
375 } | |
376 | |
377 static void check_events(void) | |
378 { | |
379 const int event = vo_x11_check_events(mDisplay); | |
4125 | 380 |
4271
2c7e6c87fb6f
reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents:
4255
diff
changeset
|
381 if ((event & VO_EVENT_RESIZE) || (event & VO_EVENT_EXPOSE)) |
4434 | 382 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
|
383 |
4125 | 384 return; |
4123 | 385 } |
386 | |
387 /* draw_osd, flip_page, draw_slice, draw_frame should be | |
388 overwritten with vidix functions (vosub_vidix.c) */ | |
389 static void draw_osd(void) | |
390 { | |
391 mp_msg(MSGT_VO, MSGL_FATAL, "[xvidix] error: didn't used vidix draw_osd!\n"); | |
392 return; | |
393 } | |
394 | |
395 static void flip_page(void) | |
396 { | |
397 mp_msg(MSGT_VO, MSGL_FATAL, "[xvidix] error: didn't used vidix flip_page!\n"); | |
398 return; | |
399 } | |
400 | |
401 static uint32_t draw_slice(uint8_t *src[], int stride[], | |
402 int w, int h, int x, int y) | |
403 { | |
4271
2c7e6c87fb6f
reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents:
4255
diff
changeset
|
404 UNUSED(src); |
2c7e6c87fb6f
reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents:
4255
diff
changeset
|
405 UNUSED(stride); |
2c7e6c87fb6f
reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents:
4255
diff
changeset
|
406 UNUSED(w); |
2c7e6c87fb6f
reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents:
4255
diff
changeset
|
407 UNUSED(h); |
2c7e6c87fb6f
reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents:
4255
diff
changeset
|
408 UNUSED(x); |
2c7e6c87fb6f
reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents:
4255
diff
changeset
|
409 UNUSED(y); |
4123 | 410 mp_msg(MSGT_VO, MSGL_FATAL, "[xvidix] error: didn't used vidix draw_slice!\n"); |
411 return(0); | |
412 } | |
413 | |
414 static uint32_t draw_frame(uint8_t *src[]) | |
415 { | |
4271
2c7e6c87fb6f
reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents:
4255
diff
changeset
|
416 UNUSED(src); |
4123 | 417 mp_msg(MSGT_VO, MSGL_FATAL, "[xvidix] error: didn't used vidix draw_frame!\n"); |
418 return(0); | |
419 } | |
420 | |
421 static uint32_t query_format(uint32_t format) | |
422 { | |
4363 | 423 return(vidix_query_fourcc(format)); |
4123 | 424 } |
425 | |
426 static void uninit(void) | |
427 { | |
4241
817742049fa0
updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents:
4198
diff
changeset
|
428 vidix_term(); |
4441
90814d64a840
removed obosolete Terminate_Display_Process. using vo_x11_uninit. support UYVY format
alex
parents:
4434
diff
changeset
|
429 |
4316 | 430 saver_on(mDisplay); /* screen saver back on */ |
4805 | 431 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
|
432 } |
4352 | 433 |
434 static uint32_t preinit(const char *arg) | |
435 { | |
6016 | 436 |
4363 | 437 if (arg) |
438 vidix_name = strdup(arg); | |
439 else | |
440 { | |
441 mp_msg(MSGT_VO, MSGL_INFO, "No vidix driver name provided, probing available ones!\n"); | |
442 vidix_name = NULL; | |
443 } | |
444 | |
445 if (vidix_preinit(vidix_name, &video_out_xvidix) != 0) | |
446 return(1); | |
447 | |
448 return(0); | |
4352 | 449 } |
450 | |
4596 | 451 static uint32_t control(uint32_t request, void *data, ...) |
4352 | 452 { |
4592
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4570
diff
changeset
|
453 switch (request) { |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4570
diff
changeset
|
454 case VOCTRL_QUERY_FORMAT: |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4570
diff
changeset
|
455 return query_format(*((uint32_t*)data)); |
5738 | 456 case VOCTRL_GUISUPPORT: |
457 return VO_TRUE; | |
4981 | 458 case VOCTRL_FULLSCREEN: |
459 vo_x11_fullscreen(); | |
460 return VO_TRUE; | |
4592
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4570
diff
changeset
|
461 } |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4570
diff
changeset
|
462 return VO_NOTIMPL; |
4352 | 463 } |