summaryrefslogtreecommitdiffstats
path: root/Gui/mplayer/sw.c
diff options
context:
space:
mode:
Diffstat (limited to 'Gui/mplayer/sw.c')
-rw-r--r--Gui/mplayer/sw.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/Gui/mplayer/sw.c b/Gui/mplayer/sw.c
index ac0f9b8901..21191b4fb2 100644
--- a/Gui/mplayer/sw.c
+++ b/Gui/mplayer/sw.c
@@ -1,6 +1,11 @@
// sub window
+#include <inttypes.h>
+
+#include "../../config.h"
+#include "../../libvo/x11_common.h"
+
#include "../app.h"
#include "../interface.h"
#include "../../help_mp.h"
@@ -18,7 +23,7 @@ void mplSubDraw( void )
if ( appMPlayer.subWindow.State == wsWindowClosed ) exit_player( MSGTR_Exit_quit );
if ( appMPlayer.subWindow.State == wsWindowFocusIn ) SubVisible++;
- if ( appMPlayer.subWindow.State == wsWindowFocusOut && wsWMType != wsWMKDE && wsWMType != wsWMIceWM ) SubVisible--;
+ if ( appMPlayer.subWindow.State == wsWindowFocusOut && metacity_hack != 3 ) SubVisible--;
if ( !appMPlayer.subWindow.Mapped ||
appMPlayer.subWindow.Visible == wsWindowNotVisible ) return;
@@ -74,7 +79,7 @@ void mplSubMouseHandle( int Button,int X,int Y,int RX,int RY )
if ( ( !mplSubMoved )&&( appMPlayer.subWindow.isFullScreen ) )
{
if( SubVisible++%2 ) wsMoveTopWindow( wsDisplay,appMPlayer.mainWindow.WindowID );
- else if ( wsWMType != wsWMNetWM && wsWMType != wsWMKDE ) wsMoveTopWindow( wsDisplay,appMPlayer.subWindow.WindowID );
+ else wsMoveTopWindow( wsDisplay,appMPlayer.subWindow.WindowID );
}
msButton=0;
mplSubMoved=0;