diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 19:58:02 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 19:58:02 +0200 |
commit | 173beb5608d893c0d9b42c1043f1dfa2db2e4df2 (patch) | |
tree | 9d91be39eb1a2edb2eec45d537630f518e04378a /libvo/x11_common.c | |
parent | ed0237e7d3c491282fbdc29c5ac294425055de57 (diff) | |
parent | c5b0ff1cfacfa502eb0647f329756ddf7c79fcb6 (diff) | |
download | mpv-173beb5608d893c0d9b42c1043f1dfa2db2e4df2.tar.bz2 mpv-173beb5608d893c0d9b42c1043f1dfa2db2e4df2.tar.xz |
Merge svn changes up to r30514
Diffstat (limited to 'libvo/x11_common.c')
-rw-r--r-- | libvo/x11_common.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/libvo/x11_common.c b/libvo/x11_common.c index f16c203a38..91431207a3 100644 --- a/libvo/x11_common.c +++ b/libvo/x11_common.c @@ -1044,13 +1044,19 @@ void vo_x11_create_vo_window(struct vo *vo, XVisualInfo *vis, int x, int y, goto final; } if (x11->window == None) { - XSizeHints hint; - XEvent xev; vo_fs = 0; vo->dwidth = width; vo->dheight = height; x11->window = vo_x11_create_smooth_window(x11, x11->rootwin, vis->visual, x, y, width, height, vis->depth, col_map); + x11->window_state = VOFLAG_HIDDEN; + } + if (flags & VOFLAG_HIDDEN) + goto final; + if (x11->window_state & VOFLAG_HIDDEN) { + XSizeHints hint; + XEvent xev; + x11->window_state &= ~VOFLAG_HIDDEN; vo_x11_classhint(vo, x11->window, classname); XStoreName(mDisplay, x11->window, title); vo_hidecursor(mDisplay, x11->window); |