diff Gui/mplayer/sw.c @ 8864:b8c271750450

- sync with x11_common - half rewrited font render engine (disabled by default)

--- a/Gui/mplayer/sw.c	Thu Jan 09 20:42:01 2003 +0000
+++ b/Gui/mplayer/sw.c	Thu Jan 09 20:47:14 2003 +0000
@@ -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 @@
  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 @@
           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;