# HG changeset patch # User arpi # Date 1020905136 0 # Node ID 4dc96c97ac07c2c0a31d7c1bca6d66baf1f8562b # Parent f3246e3c524e19560402738f1d28bc6cd924a883 some reorder diff -r f3246e3c524e -r 4dc96c97ac07 libvo/vo_x11.c --- a/libvo/vo_x11.c Wed May 08 23:52:35 2002 +0000 +++ b/libvo/vo_x11.c Thu May 09 00:45:36 2002 +0000 @@ -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)){