[Mplayer-cvslog] CVS: main/Gui/mplayer play.h,1.3,1.4 play.c,1.7,1.8 mw.h,1.7,1.8

[Zoltan Ponekker]

Update of /cvsroot/mplayer/main/Gui/mplayer
In directory mplayer:/var/tmp.root/cvs-serv21006/Gui/mplayer

Modified Files:
	play.h play.c mw.h 
Log Message:
normal size

Index: play.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/play.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- play.h	29 Aug 2001 17:45:40 -0000	1.3
+++ play.h	30 Aug 2001 10:55:09 -0000	1.4
@@ -53,10 +53,10 @@
 
 extern int   mplParent;
 
-extern int   mplx;
-extern int   mply;
-extern int   mplwidth;
-extern int   mplheight;
+extern int   moviex;
+extern int   moviey;
+extern int   moviewidth;
+extern int   movieheight;
 
 extern mplCommStruct * mplShMem;
 

Index: play.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/play.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- play.c	29 Aug 2001 18:24:21 -0000	1.7
+++ play.c	30 Aug 2001 10:55:09 -0000	1.8
@@ -7,7 +7,7 @@
 
 int    mplParent = 1;
 
-int    mplx,mply,mplwidth,mplheight;
+int    moviex,moviey,moviewidth,movieheight;
 
 #include "../app.h"
 
@@ -37,32 +37,10 @@
 
 void mplFullScreen( void )
 {
- if ( appMPlayer.subWindow.isFullScreen )
-  {
-   if ( mplShMem->Playing )
-    {
-     appMPlayer.subWindow.OldX=mplx;
-     appMPlayer.subWindow.OldY=mply;
-     appMPlayer.subWindow.OldWidth=mplwidth;
-     appMPlayer.subWindow.OldHeight=mplheight;
-    }
-    else
-     {
-      appMPlayer.subWindow.OldWidth=appMPlayer.sub.width;
-      appMPlayer.subWindow.OldHeight=appMPlayer.sub.height;
-      appMPlayer.subWindow.OldX=( wsMaxX - appMPlayer.sub.width ) / 2;
-      appMPlayer.subWindow.OldY=( wsMaxY - appMPlayer.sub.height ) / 2;
-     }
-  }
-  else
-   {
-     mplx=appMPlayer.subWindow.X;
-     mply=appMPlayer.subWindow.Y;
-     mplwidth=appMPlayer.subWindow.Width;
-     mplheight=appMPlayer.subWindow.Height;
-   }
- wsFullScreen( &appMPlayer.subWindow );
-// wsMoveTopWindow( &appMPlayer.subWindow );
+// if ( appMPlayer.subWindow.isFullScreen )
+//  {
+//  }
+ wsFullScreen( &appMPlayer.subWindow ); 
  mplResize( 0,0,appMPlayer.subWindow.Width,appMPlayer.subWindow.Height );
 }
 

Index: mw.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/mw.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mw.h	29 Aug 2001 17:17:21 -0000	1.7
+++ mw.h	30 Aug 2001 10:55:09 -0000	1.8
@@ -125,8 +125,6 @@
    }
 }
 
-extern float gui_position;
-
 void mplMainDraw( wsParamDisplay )
 {
  wItem    * item;
@@ -328,8 +326,26 @@
    case evIncAudioBufDelay: mplIncAudioBufDelay(); break;
    case evDecAudioBufDelay: mplDecAudioBufDelay(); break;
 
-   case evNormalSize: if ( mplShMem->Playing ) wsResizeWindow( &appMPlayer.subWindow,mplwidth,mplheight ); break;
-   case evDoubleSize: if ( mplShMem->Playing ) wsResizeWindow( &appMPlayer.subWindow,mplwidth * 2,mplheight * 2 ); break;
+   case evNormalSize:
+        if ( mplShMem->Playing ) 
+	 {
+//	  wsWindowDecoration( &appMPlayer.subWindow,appMPlayer.subWindow.Decorations );
+//	  wsWindowDecoration( &appMPlayer.subWindow,0 );
+//	  appMPlayer.subWindow.isFullScreen=0;
+//	  wsMoveWindow( &appMPlayer.subWindow,appMPlayer.subWindow.OldX,appMPlayer.subWindow.OldY );
+//	  wsResizeWindow( &appMPlayer.subWindow,moviewidth,movieheight );
+	  appMPlayer.subWindow.isFullScreen=True;
+	  appMPlayer.subWindow.OldWidth=moviewidth; appMPlayer.subWindow.OldHeight=movieheight;
+	  wsFullScreen( &appMPlayer.subWindow );
+	  mplResize( appMPlayer.subWindow.X,appMPlayer.subWindow.Y,moviewidth,movieheight );
+	 } 
+//	 else
+//	  {
+//	   wsResizeWindow( &appMPlayer.subWindow,appMPlayer.sub.width,appMPlayer.sub.height );
+//	   wsMoveWindow( &appMPlayer.subWindow,appMPlayer.sub.x,appMPlayer.sub.y );
+//	  }
+	break;
+//   case evDoubleSize: if ( mplShMem->Playing ) wsResizeWindow( &appMPlayer.subWindow,mplwidth * 2,mplheight * 2 ); break;
 
 // --- timer events
    case evHideMouseCursor: