mirror of https://github.com/mpv-player/mpv
some reorder
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6026 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
63126b5641
commit
7151c375c4
|
@ -313,7 +313,7 @@ static uint32_t config( uint32_t width,uint32_t height,uint32_t d_width,uint32_t
|
||||||
hint.width=modeline_width;
|
hint.width=modeline_width;
|
||||||
hint.height=modeline_height;
|
hint.height=modeline_height;
|
||||||
}
|
}
|
||||||
else
|
// else
|
||||||
#endif
|
#endif
|
||||||
// if ( fullscreen )
|
// if ( fullscreen )
|
||||||
// {
|
// {
|
||||||
|
@ -359,17 +359,11 @@ static uint32_t config( uint32_t width,uint32_t height,uint32_t d_width,uint32_t
|
||||||
XSelectInput( mDisplay,vo_window,StructureNotifyMask );
|
XSelectInput( mDisplay,vo_window,StructureNotifyMask );
|
||||||
XSetStandardProperties( mDisplay,vo_window,title,title,None,NULL,0,&hint );
|
XSetStandardProperties( mDisplay,vo_window,title,title,None,NULL,0,&hint );
|
||||||
XMapWindow( mDisplay,vo_window );
|
XMapWindow( mDisplay,vo_window );
|
||||||
if ( fullscreen ) vo_x11_fullscreen();
|
|
||||||
#ifdef HAVE_XINERAMA
|
|
||||||
vo_x11_xinerama_move(mDisplay,vo_window);
|
|
||||||
#endif
|
|
||||||
if(WinID!=0)
|
if(WinID!=0)
|
||||||
do { XNextEvent( mDisplay,&xev ); } while ( xev.type != MapNotify || xev.xmap.event != vo_window );
|
do { XNextEvent( mDisplay,&xev ); } while ( xev.type != MapNotify || xev.xmap.event != vo_window );
|
||||||
XSelectInput( mDisplay,vo_window,NoEventMask );
|
XSelectInput( mDisplay,vo_window,NoEventMask );
|
||||||
|
|
||||||
XFlush( mDisplay );
|
XFlush( mDisplay );
|
||||||
XSync( mDisplay,False );
|
XSync( mDisplay,False );
|
||||||
vo_gc=XCreateGC( mDisplay,vo_window,0L,&xgcv );
|
|
||||||
|
|
||||||
// we cannot grab mouse events on root window :(
|
// we cannot grab mouse events on root window :(
|
||||||
XSelectInput( mDisplay,vo_window,StructureNotifyMask | KeyPressMask | PropertyChangeMask |
|
XSelectInput( mDisplay,vo_window,StructureNotifyMask | KeyPressMask | PropertyChangeMask |
|
||||||
|
@ -387,6 +381,12 @@ static uint32_t config( uint32_t width,uint32_t height,uint32_t d_width,uint32_t
|
||||||
#endif
|
#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();
|
getMyXImage();
|
||||||
|
|
||||||
switch ((bpp=myximage->bits_per_pixel)){
|
switch ((bpp=myximage->bits_per_pixel)){
|
||||||
|
|
Loading…
Reference in New Issue