[Mplayer-cvslog] CVS: main/Gui/mplayer mplayer.c,1.13,1.14 play.c,1.34,1.35 sw.h,1.14,1.15

[Zoltan Ponekker]

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

Modified Files:
	mplayer.c play.c sw.h 
Log Message:
fix fucking icewm fullscreen bug.

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/mplayer.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mplayer.c	1 Oct 2001 09:30:44 -0000	1.13
+++ mplayer.c	1 Oct 2001 12:28:23 -0000	1.14
@@ -104,6 +104,7 @@
  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 );

Index: play.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/play.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- play.c	1 Oct 2001 09:30:44 -0000	1.34
+++ play.c	1 Oct 2001 12:28:23 -0000	1.35
@@ -35,10 +35,24 @@
 
 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 );
 }
 

Index: sw.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/sw.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sw.h	1 Oct 2001 09:30:44 -0000	1.14
+++ sw.h	1 Oct 2001 12:28:23 -0000	1.15
@@ -13,20 +13,13 @@
 
  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;