From a5005b2847de50fdbe9ff521ee739eaa2fd39e52 Mon Sep 17 00:00:00 2001 From: filon Date: Wed, 1 Jan 2003 12:50:56 +0000 Subject: [PATCH] - reverting icewm hack (i have used broken icewm, regular one is working) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8694 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/x11_common.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/libvo/x11_common.c b/libvo/x11_common.c index 9cd5bee3c7..e26478cf91 100644 --- a/libvo/x11_common.c +++ b/libvo/x11_common.c @@ -156,7 +156,6 @@ int vo_wm_detect( void ) int format; unsigned long nitems, bytesafter; Atom * args = NULL; - int icewm_hack = 0; int metacity_hack = 0; char * name; @@ -172,8 +171,6 @@ int vo_wm_detect( void ) name = XGetAtomName (mDisplay, args[i]); if (!strncmp( name, "_WIN_LAYER", 10)) wm = vo_wm_Layered; - if (!strncmp( name, "_ICEWM_TRAY", 11)) - icewm_hack = 1; if (!strncmp( name, "_WIN_HINTS", 10)) // metacity is the only manager which supports _WIN_LAYER but not _WIN_HINTS metacity_hack = 1; @@ -209,19 +206,8 @@ int vo_wm_detect( void ) XFree (args); } return vo_wm_NetWM; - } else - if (icewm_hack) { - // Next ugly hack for new IceWM (1.2.x). It supports FULLSCREEN state but doesn't say a word - // about it. What's more it doesn't accept regular resising, so we have to us _NET_WM_STATE_FULLSCREEN - mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] Detected wm is a broken IceWM.\n" ); - net_wm_support |= SUPPORT_FULLSCREEN; - return vo_wm_NetWM; } } - - // this is old good IceWM, treat it right - if (icewm_hack) - return vo_wm_Layered; if ( wm == vo_wm_Unknown ) mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] Unknown wm type...\n" ); return wm;