[Mplayer-cvslog] CVS: main/Gui/mplayer mplayer.c,1.16,1.17

[Zoltan Ponekker]

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

Modified Files:
	mplayer.c 
Log Message:
fix blackbox xshape bug

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/mplayer.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- mplayer.c	12 Nov 2001 15:16:13 -0000	1.16
+++ mplayer.c	18 Nov 2001 15:05:25 -0000	1.17
@@ -18,6 +18,7 @@
 #include "../../config.h"
 #include "../../help_mp.h"
 #include "../../libvo/x11_common.h"
+#include "../../libmpdemux/stream.h"
 
 #define mplMouseTimerConst  10
 #define mplRedrawTimerConst 5
@@ -78,14 +79,15 @@
  vo_setwindow(appMPlayer.subWindow.WindowID, appMPlayer.subWindow.wGC);
  vo_setwindowsize( appMPlayer.sub.width,appMPlayer.sub.height );
  
- i=wsHideFrame|wsMaxSize|wsShowWindow;
- if ( appMPlayer.mainDecoration ) i=wsShowFrame|wsMaxSize|wsShowWindow;
+ i=wsHideFrame|wsMaxSize|wsHideWindow;
+ if ( appMPlayer.mainDecoration ) i=wsShowFrame|wsMaxSize|wsHideWindow;
  wsCreateWindow( &appMPlayer.mainWindow,
   appMPlayer.main.x,appMPlayer.main.y,appMPlayer.main.width,appMPlayer.main.height,
   wsNoBorder,wsShowMouseCursor|wsHandleMouseButton|wsHandleMouseMove,i,"MPlayer" ); //wsMinSize|
 
  wsSetShape( &appMPlayer.mainWindow,appMPlayer.main.Mask.Image );
-
+ wsVisibleWindow( &appMPlayer.mainWindow,wsShowWindow );
+ 
  mplMenuInit();
 
  #ifdef DEBUG