[MPlayer-cvslog] r35747 - in trunk/gui: interface.c wm/ws.c

[ib]

Author: ib
Date: Tue Jan 15 13:22:13 2013
New Revision: 35747

Log:
Add the 'Mapped' information to wsMapWait().

Remove it from interface.c then.

Modified:
   trunk/gui/interface.c
   trunk/gui/wm/ws.c

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Tue Jan 15 12:54:22 2013	(r35746)
+++ trunk/gui/interface.c	Tue Jan 15 13:22:13 2013	(r35747)
@@ -224,7 +224,6 @@ void guiInit(void)
     if (gtkShowVideoWindow) {
         wsVisibleWindow(&guiApp.videoWindow, wsShowWindow);
 
-            guiApp.videoWindow.Mapped = wsMapped;
             guiInfo.VideoWindow       = True;
 
         if (gtkLoadFullscreen)

Modified: trunk/gui/wm/ws.c
==============================================================================
--- trunk/gui/wm/ws.c	Tue Jan 15 12:54:22 2013	(r35746)
+++ trunk/gui/wm/ws.c	Tue Jan 15 13:22:13 2013	(r35747)
@@ -499,10 +499,13 @@ static void wsMapWait(wsTWindow *win)
 {
     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;
+    }
 }
 
 // ----------------------------------------------------------------------------------------------