RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-18 13:47:04 +00:00
Code Issues Releases Wiki Activity

x11: fix initial VO size

Browse Source 
This was done incorrectly in the previous commit: the fallback size used
the window size as requested with the first config call, which is the
size of the hidden window in the vo_opengl case. (That damn hidden
window again...)
This commit is contained in:
wm4 2014-02-02 03:19:22 +01:00
parent b57a0a0bc6
commit c8b754e38f
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
video/out/x11_common.c
View File

@ -1269,12 +1269,6 @@ static void vo_x11_create_window(struct vo *vo, XVisualInfo *vis, int x, int y,
vo_x11_set_wm_icon(x11); vo_x11_set_wm_icon(x11);
vo_x11_update_window_title(vo); vo_x11_update_window_title(vo);
vo_x11_dnd_init_window(vo); vo_x11_dnd_init_window(vo);
// The real size is only known when the window is mapped, which
// unfortunately happens asynchronous to VO initialization. At least
// vdpau needs a _some_ window size, though.
x11->win_width = w;
x11->win_height = h;
} }
static void vo_x11_map_window(struct vo *vo, int x, int y, int w, int h) static void vo_x11_map_window(struct vo *vo, int x, int y, int w, int h)
@ -1377,6 +1371,13 @@ void vo_x11_config_vo_window(struct vo *vo, XVisualInfo *vis,
XSync(x11->display, False); XSync(x11->display, False);
vo_x11_update_geometry(vo); vo_x11_update_geometry(vo);
if (x11->window_hidden) {
// The real size is only known when the window is mapped, which
// unfortunately happens asynchronous to VO initialization. At least
// vdpau needs a _some_ window size, though.
x11->win_width = width;
x11->win_height = height;
}
update_vo_size(vo); update_vo_size(vo);
x11->pending_vo_events &= ~VO_EVENT_RESIZE; // implicitly done by the VO x11->pending_vo_events &= ~VO_EVENT_RESIZE; // implicitly done by the VO
} }