Mercurial > mplayer.hg

changeset 35809:98b531e7c38e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't destroy a -wid window's WM_NORMAL_HINTS property information. MPlayer doesn't handle vo_hint when attached to an existing window and vo_hint has even never been set in that case. The MapNotify event adjusts win_gravity and vo_fs_flip which previously have only been changed in vo_x11_fullscreen(), but in case MPlayer is attached to an existing window, vo_x11_fullscreen() immediately returns and doesn't change these variables so there is no reason for adjustment anyway.
author ib
date Sun, 27 Jan 2013 15:23:39 +0000
parents aa7d8771205e
children 9c45fa7185bf
files libvo/x11_common.c
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/x11_common.c	Sun Jan 27 12:15:19 2013 +0000
+++ b/libvo/x11_common.c	Sun Jan 27 15:23:39 2013 +0000
@@ -940,9 +940,11 @@
                 }
                 break;
             case MapNotify:
+                if (WinID < 0) {
                 vo_hint.win_gravity = old_gravity;
                 XSetWMNormalHints(mDisplay, vo_window, &vo_hint);
                 vo_fs_flip = 0;
+                }
                 break;
             case DestroyNotify:
                 mp_msg(MSGT_VO, MSGL_WARN, "Our window was destroyed, exiting\n");