From 92009fc2f5949a72452bb60b837ac436f924b6c1 Mon Sep 17 00:00:00 2001 From: pontscho Date: Mon, 6 May 2002 15:05:07 +0000 Subject: add WM detection, and wm specific fullscreen code. (???) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5998 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Gui/mplayer/play.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'Gui/mplayer/play.c') diff --git a/Gui/mplayer/play.c b/Gui/mplayer/play.c index 402ca81021..ec7791cc38 100644 --- a/Gui/mplayer/play.c +++ b/Gui/mplayer/play.c @@ -54,9 +54,26 @@ void mplFullScreen( void ) wsVisibleWindow( &appMPlayer.subWindow,wsShowWindow ); }// else { vo_x11_fullscreen(); appMPlayer.subWindow.isFullScreen=vo_fs; } #else + if ( ( guiIntfStruct.Playing )&&( appMPlayer.subWindow.isFullScreen ) ) + { + appMPlayer.subWindow.OldWidth=guiIntfStruct.MovieWidth; appMPlayer.subWindow.OldHeight=guiIntfStruct.MovieHeight; + switch ( appMPlayer.sub.x ) + { + case -1: appMPlayer.subWindow.OldX=( wsMaxX / 2 ) - ( appMPlayer.subWindow.OldWidth / 2 ); break; + case -2: appMPlayer.subWindow.OldX=wsMaxX - appMPlayer.subWindow.OldWidth; break; + default: appMPlayer.subWindow.OldX=appMPlayer.sub.x; break; + } + switch ( appMPlayer.sub.y ) + { + case -1: appMPlayer.subWindow.OldY=( wsMaxY / 2 ) - ( appMPlayer.subWindow.OldHeight / 2 ); break; + case -2: appMPlayer.subWindow.OldY=wsMaxY - appMPlayer.subWindow.OldHeight; break; + default: appMPlayer.subWindow.OldY=appMPlayer.sub.y; break; + } + } wsFullScreen( &appMPlayer.subWindow ); - vo_fs=0; - if ( appMPlayer.subWindow.isFullScreen ) vo_fs=1; + vo_fs=appMPlayer.subWindow.isFullScreen; + wsSetLayer( wsDisplay,appMPlayer.mainWindow.WindowID,appMPlayer.subWindow.isFullScreen ); + wsSetLayer( wsDisplay,appMPlayer.menuWindow.WindowID,appMPlayer.subWindow.isFullScreen ); #endif fullscreen=appMPlayer.subWindow.isFullScreen; -- cgit v1.2.3