rewrite fullscreen support in some libvo driver

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4982 b3059339-0415-0410-9bf9-f77b7e298cf2

2 files changed, 25 insertions, 19 deletions

diff --git a/Gui/mplayer/mw.h b/Gui/mplayer/mw.h
index c4b5de0a1e..2f2388f567 100644
--- a/Gui/mplayer/mw.h
+++ b/Gui/mplayer/mw.h
@@ -374,7 +374,6 @@ NoPause:
          }
         break;
    case evFullScreen:
-        IZE("evFullS");
         for ( j=0;j<appMPlayer.NumberOfItems + 1;j++ )
          {
           if ( appMPlayer.Items[j].msg == evFullScreen )
@@ -383,8 +382,8 @@ NoPause:
             appMPlayer.Items[j].pressed=appMPlayer.Items[j].tmp;
            }
          }
-        mplMainRender=1;
         mplFullScreen();
+        mplMainRender=1;
         break;
 
 // --- timer events
diff --git a/Gui/mplayer/play.c b/Gui/mplayer/play.c
index 2cd24611f5..0ed96db793 100644
--- a/Gui/mplayer/play.c
+++ b/Gui/mplayer/play.c
@@ -30,26 +30,33 @@ void mplFullScreen( void )
 {
  static int sx,sy;
 
- wsVisibleWindow( &appMPlayer.subWindow,wsHideWindow );
- if ( appMPlayer.subWindow.isFullScreen )
+ if ( guiIntfStruct.Playing )
   {
-   wsResizeWindow( &appMPlayer.subWindow,sx,sy );
-   wsMoveWindow( &appMPlayer.subWindow,True,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,True,0,0 );
-    wsWindowDecoration( &appMPlayer.subWindow,0 );
-    appMPlayer.subWindow.isFullScreen=1;
-   }
+   wsVisibleWindow( &appMPlayer.subWindow,wsHideWindow );
+   if ( appMPlayer.subWindow.isFullScreen )
+    {
+     wsResizeWindow( &appMPlayer.subWindow,sx,sy );
+     wsMoveWindow( &appMPlayer.subWindow,True,appMPlayer.sub.x,appMPlayer.sub.y );
+     wsWindowDecoration( &appMPlayer.subWindow,appMPlayer.subWindow.Decorations );
+     appMPlayer.subWindow.isFullScreen=0;
+     vo_fs=0;
+    }
+    else
+     {
+      sx=appMPlayer.subWindow.Width; sy=appMPlayer.subWindow.Height;
+      wsResizeWindow( &appMPlayer.subWindow,wsMaxX,wsMaxY );
+      wsMoveWindow( &appMPlayer.subWindow,True,0,0 );
+      wsWindowDecoration( &appMPlayer.subWindow,0 );
+      appMPlayer.subWindow.isFullScreen=1;
+      vo_fs=1;
+     }
+   wsVisibleWindow( &appMPlayer.subWindow,wsShowWindow );
+  } else { vo_x11_fullscreen(); appMPlayer.subWindow.isFullScreen=vo_fs; }
+  
+ fullscreen=appMPlayer.subWindow.isFullScreen;
  if ( guiIntfStruct.Playing ) wsSetBackgroundRGB( &appMPlayer.subWindow,0,0,0 );
   else wsSetBackgroundRGB( &appMPlayer.subWindow,appMPlayer.subR,appMPlayer.subG,appMPlayer.subB );
- wsVisibleWindow( &appMPlayer.subWindow,wsShowWindow );
- mplResize( 0,0,appMPlayer.subWindow.Width,appMPlayer.subWindow.Height );
+// mplResize( 0,0,appMPlayer.subWindow.Width,appMPlayer.subWindow.Height );
 }
 
 extern int mplSubRender;