[Mplayer-cvslog] CVS: main/libvo vo_x11.c,1.101,1.102

[Arpi of Ize]

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var/tmp.root/cvs-serv13634

Modified Files:
	vo_x11.c 
Log Message:
some reorder

Index: vo_x11.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_x11.c,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- vo_x11.c	8 May 2002 20:24:35 -0000	1.101
+++ vo_x11.c	9 May 2002 00:45:36 -0000	1.102
@@ -313,7 +313,7 @@
 	hint.width=modeline_width;
 	hint.height=modeline_height;
    }
-    else
+//    else
 #endif
 //    if ( fullscreen )
 //     {
@@ -359,17 +359,11 @@
     XSelectInput( mDisplay,vo_window,StructureNotifyMask );
     XSetStandardProperties( mDisplay,vo_window,title,title,None,NULL,0,&hint );
     XMapWindow( mDisplay,vo_window );
-    if ( fullscreen ) vo_x11_fullscreen();
-#ifdef HAVE_XINERAMA
-   vo_x11_xinerama_move(mDisplay,vo_window);
-#endif
     if(WinID!=0)
     do { XNextEvent( mDisplay,&xev ); } while ( xev.type != MapNotify || xev.xmap.event != vo_window );
     XSelectInput( mDisplay,vo_window,NoEventMask );
-
     XFlush( mDisplay );
     XSync( mDisplay,False );
-    vo_gc=XCreateGC( mDisplay,vo_window,0L,&xgcv );
 
     // we cannot grab mouse events on root window :(
     XSelectInput( mDisplay,vo_window,StructureNotifyMask | KeyPressMask | PropertyChangeMask |
@@ -387,6 +381,12 @@
 #endif
    }
 
+   if ( fullscreen ) vo_x11_fullscreen();
+#ifdef HAVE_XINERAMA
+   vo_x11_xinerama_move(mDisplay,vo_window);
+#endif
+
+   vo_gc=XCreateGC( mDisplay,vo_window,0L,&xgcv );
    getMyXImage();
 
   switch ((bpp=myximage->bits_per_pixel)){