diff options
| author | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-01-09 20:47:14 +0000 |
|---|---|---|
| committer | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-01-09 20:47:14 +0000 |
| commit | 52a7bad9a6b5240797ba9780e182a31caf3e79d4 (patch) | |
| tree | 41c7ff8cc73c61efce83a7c721a0fa352a940e8a /Gui/mplayer/sw.c | |
| parent | 8c30a49e223eebe3f20a522b66dc32e120024853 (diff) | |
| download | mpv-52a7bad9a6b5240797ba9780e182a31caf3e79d4.tar.bz2 mpv-52a7bad9a6b5240797ba9780e182a31caf3e79d4.tar.xz | |
- sync with x11_common
- half rewrited font render engine (disabled by default)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8865 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui/mplayer/sw.c')
| -rw-r--r-- | Gui/mplayer/sw.c | 9 |
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; |