diff options
Diffstat (limited to 'Gui/mplayer')
-rw-r--r-- | Gui/mplayer/mplayer.c | 1 | ||||
-rw-r--r-- | Gui/mplayer/play.c | 22 | ||||
-rw-r--r-- | Gui/mplayer/sw.h | 9 |
3 files changed, 20 insertions, 12 deletions
diff --git a/Gui/mplayer/mplayer.c b/Gui/mplayer/mplayer.c index bfe184a4f8..41873d667e 100644 --- a/Gui/mplayer/mplayer.c +++ b/Gui/mplayer/mplayer.c @@ -104,6 +104,7 @@ void mplInit( int argc,char* argv[], char *envp[], void* disp ) appMPlayer.subWindow.KeyHandler=mplMainKeyHandle; appMPlayer.subWindow.ReSize=mplResize; + wsSetBackgroundRGB( &appMPlayer.subWindow,appMPlayer.subR,appMPlayer.subG,appMPlayer.subB ); if ( appMPlayer.sub.Bitmap.Image ) wsConvert( &appMPlayer.subWindow,appMPlayer.sub.Bitmap.Image,appMPlayer.sub.Bitmap.ImageSize ); wsPostRedisplay( &appMPlayer.mainWindow ); diff --git a/Gui/mplayer/play.c b/Gui/mplayer/play.c index 9f5d5b5d6c..22c6305005 100644 --- a/Gui/mplayer/play.c +++ b/Gui/mplayer/play.c @@ -35,10 +35,24 @@ extern int abs_seek_pos; void mplFullScreen( void ) { -// if ( appMPlayer.subWindow.isFullScreen ) -// { -// } - wsFullScreen( &appMPlayer.subWindow ); + static int sx,sy; + wsVisibleWindow( &appMPlayer.subWindow,wsHideWindow ); + if ( appMPlayer.subWindow.isFullScreen ) + { + wsResizeWindow( &appMPlayer.subWindow,sx,sy ); + wsMoveWindow( &appMPlayer.subWindow,appMPlayer.sub.x,appMPlayer.sub.y ); + wsWindowDecoration( &appMPlayer.subWindow,appMPlayer.subWindow.Decorations ); + appMPlayer.subWindow.isFullScreen=0; + } + else + { + sx=appMPlayer.subWindow.Width; sy=appMPlayer.subWindow.Height; + wsResizeWindow( &appMPlayer.subWindow,wsMaxX,wsMaxY ); + wsMoveWindow( &appMPlayer.subWindow,0,0 ); + wsWindowDecoration( &appMPlayer.subWindow,0 ); + appMPlayer.subWindow.isFullScreen=1; + } + wsVisibleWindow( &appMPlayer.subWindow,wsShowWindow ); mplResize( 0,0,appMPlayer.subWindow.Width,appMPlayer.subWindow.Height ); } diff --git a/Gui/mplayer/sw.h b/Gui/mplayer/sw.h index 551ae2f6b5..134debd6e0 100644 --- a/Gui/mplayer/sw.h +++ b/Gui/mplayer/sw.h @@ -13,20 +13,13 @@ void mplSubDraw( wsParamDisplay ) if ( mplShMem->Playing ) { -// wsSetBackgroundRGB( &appMPlayer.subWindow,0,0,0 ); -// wsClearWindow( appMPlayer.subWindow ); vo_expose=1; mplSubRender=0; } if ( mplSubRender ) { -// wsSetBackgroundRGB( &appMPlayer.subWindow,appMPlayer.subR,appMPlayer.subG,appMPlayer.subB ); - if ( appMPlayer.sub.Bitmap.Image ) - { -// wsConvert( &appMPlayer.subWindow,appMPlayer.sub.Bitmap.Image,appMPlayer.sub.Bitmap.ImageSize ); - wsPutImage( &appMPlayer.subWindow ); - } + if ( appMPlayer.sub.Bitmap.Image ) wsPutImage( &appMPlayer.subWindow ); // XFlush( wsDisplay ); } appMPlayer.subWindow.State=0; |