annotate libvo/vo_xvidix.c @ 4978:ae66f5ca2225

small bugfix.
author pontscho
date Thu, 07 Mar 2002 14:16:43 +0000
parents 79b753e2e84a
children bfc652fc7f43
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
1 /*
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
2 VIDIX accelerated overlay in a X window
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
3
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
4 (C) Alex Beregszaszi & Zoltan Ponekker & Nick Kurshev
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
5
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
6 WS window manager by Pontscho/Fresh!
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
7
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
8 Based on vo_gl.c and vo_vesa.c and vo_xmga.c (.so mastah! ;))
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
9 */
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
10
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
11 #include <stdio.h>
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
12 #include <stdlib.h>
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
13 #include <string.h>
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
14 #include <math.h>
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
15 #include <errno.h>
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
16
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
17 #include "config.h"
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
18 #include "video_out.h"
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
19 #include "video_out_internal.h"
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
20
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
21 #include <X11/Xlib.h>
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
22 #include <X11/Xutil.h>
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
23 //#include <X11/keysym.h>
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
24
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
25 #ifdef HAVE_XINERAMA
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
26 #include <X11/extensions/Xinerama.h>
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
27 #endif
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
28
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
29 #include "x11_common.h"
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
30 #include "aspect.h"
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
31 #include "mp_msg.h"
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
32
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
33 #include "vosub_vidix.h"
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
34 #include "../vidix/vidixlib.h"
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
35
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
36 LIBVO_EXTERN(xvidix)
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
37
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
38 static vo_info_t vo_info =
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
39 {
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
40 "X11 (VIDIX)",
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
41 "xvidix",
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
42 "Alex Beregszaszi",
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
43 ""
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
44 };
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
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
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
48 /* X11 related variables */
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
49 static int X_already_started = 0;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
50
4363
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
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
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
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
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
56 /* VIDIX related */
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
57 static char *vidix_name;
4434
e956fa7f79c7 Use new tune info
nick
parents: 4433
diff changeset
58 static vo_tune_info_t vtune;
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
59
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
60 /* Image parameters */
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
61 static uint32_t image_width;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
62 static uint32_t image_height;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
63 static uint32_t image_format;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
64 static uint32_t image_depth;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
65
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
66 /* Window parameters */
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
67 static uint32_t window_x, window_y;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
68 static uint32_t window_width, window_height;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
69
4363
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
70 /* used by XGetGeometry & XTranslateCoordinates for moving/resizing window */
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
71 static Window mRoot;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
72 static uint32_t drwX, drwY, drwWidth, drwHeight, drwBorderWidth,
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
73 drwDepth, drwcX, drwcY, dwidth, dheight, mFullscreen;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
74
4434
e956fa7f79c7 Use new tune info
nick
parents: 4433
diff changeset
75 static void set_window(int force_update,const vo_tune_info_t *info)
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
76 {
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
77 #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
78 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
79 {
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
80 if ((vo_dwidth == vo_screenwidth) && (vo_dheight == vo_screenheight))
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
81 {
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
82 mFullscreen = 1;
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
83 dwidth = vo_screenwidth;
4271
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
84 dheight = vo_screenwidth * vo_dheight / vo_dwidth;
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
85 }
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
86 else
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
87 {
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
88 mFullscreen = 0;
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
89 dwidth = vo_dwidth;
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
90 dheight = vo_dheight;
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
91 }
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
92 }
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
93 #endif
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
94
4805
79b753e2e84a mondom fix bazmeg.
pontscho
parents: 4784
diff changeset
95 XGetGeometry(mDisplay, vo_window, &mRoot, &drwX, &drwY, &drwWidth,
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
96 &drwHeight, &drwBorderWidth, &drwDepth);
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
97 drwX = drwY = 0;
4805
79b753e2e84a mondom fix bazmeg.
pontscho
parents: 4784
diff changeset
98 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
99 &drwcX, &drwcY, &mRoot);
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
100
4271
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
101 if (!mFullscreen)
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
102 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
103 drwcX, drwcY, drwX, drwY, drwWidth, drwHeight);
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
104
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
105 /* 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
106 aspect(&dwidth, &dheight, A_NOZOOM);
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
107 #if X11_FULLSCREEN
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
108 if (mFullscreen)
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
109 {
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
110 aspect(&dwidth, &dheight, A_ZOOM);
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
111 drwX = (vo_screenwidth - (dwidth > vo_screenwidth ? vo_screenwidth : dwidth)) / 2;
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
112 drwcX += drwX;
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
113 drwY = (vo_screenheight - (dheight > vo_screenheight ? vo_screenheight : dheight)) / 2;
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
114 drwcY += drwY;
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
115 drwWidth = (dwidth > vo_screenwidth ? vo_screenwidth : dwidth);
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
116 drwHeight = (dheight > vo_screenheight ? vo_screenheight : dheight);
4271
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
117 mp_msg(MSGT_VO, MSGL_V, "[xvidix-fs] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
118 drwcX, drwcY, drwX, drwY, drwWidth, drwHeight);
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
119 }
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
120 #endif
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
121
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
122 #ifdef HAVE_XINERAMA
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
123 if (XineramaIsActive(mDisplay))
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
124 {
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
125 XineramaScreenInfo *screens;
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
126 int num_screens;
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
127 int i = 0;
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 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
130
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
131 /* 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
132 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
133 (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
134 (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
135 i++;
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
136
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
137 /* 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
138 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
139 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
140 XFree(screens);
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
141 }
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
142 #endif
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
143
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
144 /* 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
145 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
146 (window_width != drwWidth) || (window_height != drwHeight))
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
147 {
4194
37c35f4ef9e2 Fixed resize bug.
nick
parents: 4133
diff changeset
148 window_x = drwcX;
37c35f4ef9e2 Fixed resize bug.
nick
parents: 4133
diff changeset
149 window_y = drwcY;
37c35f4ef9e2 Fixed resize bug.
nick
parents: 4133
diff changeset
150 window_width = drwWidth;
37c35f4ef9e2 Fixed resize bug.
nick
parents: 4133
diff changeset
151 window_height = drwHeight;
4198
7e2bf04c9a7c added vidix_start() and vidix_stop() for better runtime-resize support ;)
alex
parents: 4194
diff changeset
152
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
153 /* 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
154 vidix_stop();
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
155 if (vidix_init(image_width, image_height, window_x, window_y,
4434
e956fa7f79c7 Use new tune info
nick
parents: 4433
diff changeset
156 window_width, window_height, image_format, vo_depthonscreen,
e956fa7f79c7 Use new tune info
nick
parents: 4433
diff changeset
157 vo_screenwidth, vo_screenheight,info) != 0)
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
158 {
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
159 mp_msg(MSGT_VO, MSGL_FATAL, "Can't initialize VIDIX driver: %s: %s\n",
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
160 vidix_name, strerror(errno));
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
161 vidix_term();
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
162 uninit();
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
163 exit(1); /* !!! */
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
164 }
4198
7e2bf04c9a7c added vidix_start() and vidix_stop() for better runtime-resize support ;)
alex
parents: 4194
diff changeset
165 vidix_start();
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
166 }
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
167
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
168 mp_msg(MSGT_VO, MSGL_INFO, "[xvidix] window properties: pos: %dx%d, size: %dx%d\n",
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
169 window_x, window_y, window_width, window_height);
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
170
4271
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
171 /* mDrawColorKey: */
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
172
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
173 /* fill drawable with specified color */
4805
79b753e2e84a mondom fix bazmeg.
pontscho
parents: 4784
diff changeset
174 XSetBackground( mDisplay,vo_gc,0 );
79b753e2e84a mondom fix bazmeg.
pontscho
parents: 4784
diff changeset
175 XClearWindow( mDisplay,vo_window );
79b753e2e84a mondom fix bazmeg.
pontscho
parents: 4784
diff changeset
176 XSetForeground(mDisplay, vo_gc, fgColor);
79b753e2e84a mondom fix bazmeg.
pontscho
parents: 4784
diff changeset
177 XFillRectangle(mDisplay, vo_window, vo_gc, drwX, drwY, drwWidth,
4271
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
178 (mFullscreen ? drwHeight - 1 : drwHeight));
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
179 /* flush, update drawable */
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
180 XFlush(mDisplay);
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
181
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
182 return;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
183 }
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
184
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
185 /* connect to server, create and map window,
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
186 * allocate colors and (shared) memory
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
187 */
4433
df8e0f71cc3c new info for tuning
nick
parents: 4363
diff changeset
188 static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
df8e0f71cc3c new info for tuning
nick
parents: 4363
diff changeset
189 uint32_t d_height, uint32_t flags, char *title, uint32_t format,const vo_tune_info_t *info)
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
190 {
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
191 XVisualInfo vinfo;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
192 XSizeHints hint;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
193 XSetWindowAttributes xswa;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
194 unsigned long xswamask;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
195 XWindowAttributes attribs;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
196 int window_depth;
4125
88de258b3ea9 fixed vidix_name handling (subdevice)
alex
parents: 4123
diff changeset
197
88de258b3ea9 fixed vidix_name handling (subdevice)
alex
parents: 4123
diff changeset
198 // if (title)
88de258b3ea9 fixed vidix_name handling (subdevice)
alex
parents: 4123
diff changeset
199 // free(title);
88de258b3ea9 fixed vidix_name handling (subdevice)
alex
parents: 4123
diff changeset
200 title = strdup("MPlayer VIDIX X11 Overlay");
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
201
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
202 image_height = height;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
203 image_width = width;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
204 image_format = format;
4459
71b864031c3f Alex! Never write bottlenecks, ok?
nick
parents: 4441
diff changeset
205
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
206 if (IMGFMT_IS_RGB(format))
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
207 {
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
208 image_depth = IMGFMT_RGB_DEPTH(format);
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
209 }
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
210 else
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
211 if (IMGFMT_IS_BGR(format))
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
212 {
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
213 image_depth = IMGFMT_BGR_DEPTH(format);
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
214 }
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
215 else
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
216 switch(format)
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
217 {
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
218 case IMGFMT_IYUV:
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
219 case IMGFMT_I420:
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
220 case IMGFMT_YV12:
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
221 image_depth = 12;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
222 break;
4441
90814d64a840 removed obosolete Terminate_Display_Process. using vo_x11_uninit. support UYVY format
alex
parents: 4434
diff changeset
223 case IMGFMT_UYVY:
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
224 case IMGFMT_YUY2:
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
225 image_depth = 16;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
226 break;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
227 default:
4459
71b864031c3f Alex! Never write bottlenecks, ok?
nick
parents: 4441
diff changeset
228 image_depth = 16;
4441
90814d64a840 removed obosolete Terminate_Display_Process. using vo_x11_uninit. support UYVY format
alex
parents: 4434
diff changeset
229 mp_msg(MSGT_VO, MSGL_FATAL, "Unknown image format: %s\n",
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
230 vo_format_name(format));
4459
71b864031c3f Alex! Never write bottlenecks, ok?
nick
parents: 4441
diff changeset
231 break;
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
232 }
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
233
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
234 if (X_already_started)
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
235 return(-1);
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
236 if (!vo_init())
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
237 return(-1);
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
238
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
239 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
240 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
241 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
242
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
243 window_x = 0;
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
244 window_y = 0;
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
245 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
246 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
247
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
248 mFullscreen = flags&0x01;
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
249
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
250 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
251
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
252 /* from xmga.c */
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
253 switch(vo_depthonscreen)
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
254 {
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
255 case 32:
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
256 case 24:
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
257 fgColor = 0x00ff00ffL;
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
258 break;
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
259 case 16:
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
260 fgColor = 0xf81fL;
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
261 break;
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
262 case 15:
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
263 fgColor = 0x7c1fL;
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
264 break;
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
265 default:
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
266 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
267 vo_depthonscreen);
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
268 }
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
269
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
270 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
271
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
272 #ifdef HAVE_NEW_GUI
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
273 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
274 {
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
275 #endif
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
276
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
277 #ifdef X11_FULLSCREEN
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
278 if (mFullscreen) /* fullscreen */
4271
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
279 {
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
280 if (flags & 0x04)
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
281 {
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
282 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
283 }
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
284 else
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
285 {
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
286 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
287 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
288 }
4271
2c7e6c87fb6f reworked, picture moves when window moved, fullscreen working with gui, fixed some annoying bugs
alex
parents: 4255
diff changeset
289 }
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
290 #endif
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
291
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
292 /* Make the window */
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
293 XGetWindowAttributes(mDisplay, DefaultRootWindow(mDisplay), &attribs);
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
294
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
295 /* from vo_x11 */
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
296 window_depth = attribs.depth;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
297 if ((window_depth != 15) && (window_depth != 16) && (window_depth != 24)
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
298 && (window_depth != 32))
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
299 window_depth = 24;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
300 XMatchVisualInfo(mDisplay, mScreen, window_depth, TrueColor, &vinfo);
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
301
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
302 xswa.background_pixel = BlackPixel(mDisplay, mScreen);
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
303 xswa.border_pixel = 0;
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
304 xswa.colormap = XCreateColormap(mDisplay, RootWindow(mDisplay, mScreen),
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
305 vinfo.visual, AllocNone);
4784
64be405bab7b ExposureMask fixed.
pontscho
parents: 4762
diff changeset
306 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
307 xswamask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask;
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
308
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
309 if (WinID >= 0)
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
310 {
4805
79b753e2e84a mondom fix bazmeg.
pontscho
parents: 4784
diff changeset
311 vo_window = WinID ? ((Window)WinID) : RootWindow(mDisplay, mScreen);
79b753e2e84a mondom fix bazmeg.
pontscho
parents: 4784
diff changeset
312 XUnmapWindow(mDisplay, vo_window);
79b753e2e84a mondom fix bazmeg.
pontscho
parents: 4784
diff changeset
313 XChangeWindowAttributes(mDisplay, vo_window, xswamask, &xswa);
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
314 }
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
315 else
4805
79b753e2e84a mondom fix bazmeg.
pontscho
parents: 4784
diff changeset
316 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
317 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
318 vinfo.depth, InputOutput, vinfo.visual, xswamask, &xswa);
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
319
4805
79b753e2e84a mondom fix bazmeg.
pontscho
parents: 4784
diff changeset
320 vo_x11_classhint(mDisplay, vo_window, "xvidix");
79b753e2e84a mondom fix bazmeg.
pontscho
parents: 4784
diff changeset
321 vo_hidecursor(mDisplay, vo_window);
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
322
4241
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
323 #ifdef X11_FULLSCREEN
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
324 if (mFullscreen) /* fullscreen */
4805
79b753e2e84a mondom fix bazmeg.
pontscho
parents: 4784
diff changeset
325 vo_x11_decoration(mDisplay, vo_window, 0);
4125
88de258b3ea9 fixed vidix_name handling (subdevice)
alex
parents: 4123
diff changeset
326 #endif
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
327
4805
79b753e2e84a mondom fix bazmeg.
pontscho
parents: 4784
diff changeset
328 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
329 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
330 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
331 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
332 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
333 hint.flags = USPosition | USSize;
4805
79b753e2e84a mondom fix bazmeg.
pontscho
parents: 4784
diff changeset
334 XSetNormalHints(mDisplay, vo_window, &hint);
4762
81b8518d11ed add new input cucc
pontscho
parents: 4596
diff changeset
335
4805
79b753e2e84a mondom fix bazmeg.
pontscho
parents: 4784
diff changeset
336 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
337 /* Map window. */
817742049fa0 updated based vo_xmga, using colorkey, working with gui, fixed xinerama and window moving/resizing
alex
parents: 4198
diff changeset
338
4805
79b753e2e84a mondom fix bazmeg.
pontscho
parents: 4784
diff changeset
339 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
340 #ifdef HAVE_XINERAMA
4805
79b753e2e84a mondom fix bazmeg.
pontscho
parents: 4784
diff changeset
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
79b753e2e84a mondom fix bazmeg.
pontscho
parents: 4784
diff changeset
344 vo_gc = XCreateGC(mDisplay, vo_window, GCForeground, &mGCV);
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
345
4805
79b753e2e84a mondom fix bazmeg.
pontscho
parents: 4784
diff changeset
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
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
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
5a4a4b272d10 vidix_grkey_support checking for colorkeying
alex
parents: 4241
diff changeset
354 if (vidix_grkey_support())
5a4a4b272d10 vidix_grkey_support checking for colorkeying
alex
parents: 4241
diff changeset
355 {
5a4a4b272d10 vidix_grkey_support checking for colorkeying
alex
parents: 4241
diff changeset
356 vidix_grkey_get(&gr_key);
5a4a4b272d10 vidix_grkey_support checking for colorkeying
alex
parents: 4241
diff changeset
357 gr_key.key_op = KEYS_PUT;
5a4a4b272d10 vidix_grkey_support checking for colorkeying
alex
parents: 4241
diff changeset
358 gr_key.ckey.op = CKEY_TRUE;
5a4a4b272d10 vidix_grkey_support checking for colorkeying
alex
parents: 4241
diff changeset
359 gr_key.ckey.red = 255;
5a4a4b272d10 vidix_grkey_support checking for colorkeying
alex
parents: 4241
diff changeset
360 gr_key.ckey.green = 0;
5a4a4b272d10 vidix_grkey_support checking for colorkeying
alex
parents: 4241
diff changeset
361 gr_key.ckey.blue = 255;
5a4a4b272d10 vidix_grkey_support checking for colorkeying
alex
parents: 4241
diff changeset
362 vidix_grkey_set(&gr_key);
5a4a4b272d10 vidix_grkey_support checking for colorkeying
alex
parents: 4241
diff changeset
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
e956fa7f79c7 Use new tune info
nick
parents: 4433
diff changeset
365 set_window(1,info);
e956fa7f79c7 Use new tune info
nick
parents: 4433
diff changeset
366 if(info) memcpy(&vtune,info,sizeof(vo_tune_info_t));
e956fa7f79c7 Use new tune info
nick
parents: 4433
diff changeset
367 else memset(&vtune,0,sizeof(vo_tune_info_t));
4805
79b753e2e84a mondom fix bazmeg.
pontscho
parents: 4784
diff changeset
368 XFlush(mDisplay);
79b753e2e84a mondom fix bazmeg.
pontscho
parents: 4784
diff changeset
369 XSync(mDisplay, False);
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
370
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
371 saver_off(mDisplay); /* turning off screen saver */
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
372
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
373 return(0);
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
374 }
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
375
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
376 static const vo_info_t *get_info(void)
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
377 {
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
378 return(&vo_info);
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
379 }
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
380
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
381 static void check_events(void)
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
382 {
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
383 const int event = vo_x11_check_events(mDisplay);
4125
88de258b3ea9 fixed vidix_name handling (subdevice)
alex
parents: 4123
diff changeset
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
e956fa7f79c7 Use new tune info
nick
parents: 4433
diff changeset
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
88de258b3ea9 fixed vidix_name handling (subdevice)
alex
parents: 4123
diff changeset
388 return;
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
389 }
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
390
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
391 /* draw_osd, flip_page, draw_slice, draw_frame should be
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
392 overwritten with vidix functions (vosub_vidix.c) */
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
393 static void draw_osd(void)
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
394 {
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
395 mp_msg(MSGT_VO, MSGL_FATAL, "[xvidix] error: didn't used vidix draw_osd!\n");
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
396 return;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
397 }
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
398
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
399 static void flip_page(void)
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
400 {
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
401 mp_msg(MSGT_VO, MSGL_FATAL, "[xvidix] error: didn't used vidix flip_page!\n");
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
402 return;
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
403 }
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
404
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
405 static uint32_t draw_slice(uint8_t *src[], int stride[],
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
406 int w, int h, int x, int y)
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
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
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
414 mp_msg(MSGT_VO, MSGL_FATAL, "[xvidix] error: didn't used vidix draw_slice!\n");
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
415 return(0);
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
416 }
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
417
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
418 static uint32_t draw_frame(uint8_t *src[])
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
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
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
421 mp_msg(MSGT_VO, MSGL_FATAL, "[xvidix] error: didn't used vidix draw_frame!\n");
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
422 return(0);
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
423 }
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
424
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
425 static uint32_t query_format(uint32_t format)
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
426 {
4363
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
427 return(vidix_query_fourcc(format));
4123
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
428 }
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
429
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
430 static void uninit(void)
467a7141f5c9 added X11/VIDIX
alex
parents:
diff changeset
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
9f8a618e87c3 fix screen saver bug under gui
pontscho
parents: 4271
diff changeset
434 saver_on(mDisplay); /* screen saver back on */
4805
79b753e2e84a mondom fix bazmeg.
pontscho
parents: 4784
diff changeset
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
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4316
diff changeset
437
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4316
diff changeset
438 static uint32_t preinit(const char *arg)
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4316
diff changeset
439 {
4363
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
440 if (arg)
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
441 vidix_name = strdup(arg);
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
442 else
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
443 {
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
444 mp_msg(MSGT_VO, MSGL_INFO, "No vidix driver name provided, probing available ones!\n");
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
445 vidix_name = NULL;
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
446 }
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
447
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
448 if (vidix_preinit(vidix_name, &video_out_xvidix) != 0)
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
449 return(1);
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
450
98178c055016 preinit moved to right place
alex
parents: 4352
diff changeset
451 return(0);
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4316
diff changeset
452 }
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4316
diff changeset
453
4596
c35d7ce151b3 10000hl to Holm... control MUST BE static...
arpi
parents: 4592
diff changeset
454 static uint32_t control(uint32_t request, void *data, ...)
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4316
diff changeset
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));
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4570
diff changeset
459 }
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4570
diff changeset
460 return VO_NOTIMPL;
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4316
diff changeset
461 }