Mercurial > mplayer.hg

changeset 35653:59a6b817a287

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add the 'Mapped' information to wsMapWait(). Remove it from interface.c then.
author ib
date Tue, 15 Jan 2013 12:22:13 +0000
parents f6c00eacd816
children 4d7f8eba65ee
files gui/interface.c gui/wm/ws.c
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/gui/interface.c	Tue Jan 15 11:54:22 2013 +0000
+++ b/gui/interface.c	Tue Jan 15 12:22:13 2013 +0000
@@ -224,7 +224,6 @@
     if (gtkShowVideoWindow) {
         wsVisibleWindow(&guiApp.videoWindow, wsShowWindow);
 
-            guiApp.videoWindow.Mapped = wsMapped;
             guiInfo.VideoWindow       = True;
 
         if (gtkLoadFullscreen)
--- a/gui/wm/ws.c	Tue Jan 15 11:54:22 2013 +0000
+++ b/gui/wm/ws.c	Tue Jan 15 12:22:13 2013 +0000
@@ -499,10 +499,13 @@
 {
     XEvent xev;
 
-    if (win->Property & wsWaitMap)
+    if (win->Property & wsWaitMap) {
         do
             XNextEvent(wsDisplay, &xev);
         while (xev.type != MapNotify || xev.xmap.event != win->WindowID);
+
+        win->Mapped = wsMapped;
+    }
 }
 
 // ----------------------------------------------------------------------------------------------