# HG changeset patch
# User arpi
# Date 1020622587 0
# Node ID cb393303865d870fd677ece319e518115491973e
# Parent  fc19842f703a2d4d733a1f8657e5ea43cd08f3c6
the Right Fix for gui window setup

diff -r fc19842f703a -r cb393303865d libvo/vo_xmga.c
--- a/libvo/vo_xmga.c	Sun May 05 17:42:09 2002 +0000
+++ b/libvo/vo_xmga.c	Sun May 05 18:16:27 2002 +0000
@@ -250,10 +250,13 @@
   inited=1;
 
  aspect(&vo_dwidth,&vo_dheight,A_NOZOOM);
+
 #ifdef HAVE_NEW_GUI
- if ( vo_window == None )
+  if(use_gui)
+    guiGetEvent( guiSetShVideo,0 ); // the GUI will set up / resize the window
+  else
+#endif
   {
-#endif
    if ( vo_fs )
     {
      vo_dwidth=vo_screenwidth;
@@ -298,9 +301,7 @@
    vo_x11_xinerama_move(mDisplay,vo_window);
 #endif
    vo_gc=XCreateGC( mDisplay,vo_window,GCForeground,&wGCV );
-#ifdef HAVE_NEW_GUI
-  } else if(use_gui) guiGetEvent( guiSetShVideo,0 );
-#endif
+  }
 
  set_window();
 
diff -r fc19842f703a -r cb393303865d libvo/vo_xv.c
--- a/libvo/vo_xv.c	Sun May 05 17:42:09 2002 +0000
+++ b/libvo/vo_xv.c	Sun May 05 18:16:27 2002 +0000
@@ -361,9 +361,11 @@
  aspect_save_screenres(vo_screenwidth,vo_screenheight);
 
 #ifdef HAVE_NEW_GUI
- if ( vo_window == None )
+  if(use_gui)
+    guiGetEvent( guiSetShVideo,0 ); // let the GUI to setup/resize our window
+  else
+#endif
   {
-#endif
    hint.x = 0;
    hint.y = 0;
    hint.width = d_width;
@@ -453,9 +455,7 @@
       XSetInputFocus(mDisplay, vo_window, RevertToNone, CurrentTime);
      }
 #endif
-#ifdef HAVE_NEW_GUI
-  } else if(use_gui) guiGetEvent( guiSetShVideo,0 );
-#endif
+  }
 
      mp_msg(MSGT_VO,MSGL_V, "using Xvideo port %d for hw scaling\n",xv_port );