summaryrefslogtreecommitdiffstats
path: root/Gui
diff options
context:
space:
mode:
authorpontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-11-18 15:05:25 +0000
committerpontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-11-18 15:05:25 +0000
commite4c3e3c10a5f3b18b9de90a68073441fd765e2dd (patch)
tree5a04330c224ba9aca4aebb678036ed01a73c89f3 /Gui
parent15ea5ffcfca5b67ac09bdae6f5028ac2d4bb7d30 (diff)
downloadmpv-e4c3e3c10a5f3b18b9de90a68073441fd765e2dd.tar.bz2
mpv-e4c3e3c10a5f3b18b9de90a68073441fd765e2dd.tar.xz
fix blackbox xshape bug
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2971 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui')
-rw-r--r--Gui/mplayer/mplayer.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/Gui/mplayer/mplayer.c b/Gui/mplayer/mplayer.c
index 2c7904f067..134fa8851b 100644
--- a/Gui/mplayer/mplayer.c
+++ b/Gui/mplayer/mplayer.c
@@ -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 @@ void mplInit( int argc,char* argv[], char *envp[], void* disp )
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