[Mplayer-cvslog] CVS: main/libvo x11_common.c,1.125,1.126

[Filip Kalinski CVS]

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var/tmp.root/cvs-serv27085

Modified Files:
	x11_common.c 
Log Message:
- reverting icewm hack (i have used broken icewm, regular one is working)

Index: x11_common.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/x11_common.c,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- x11_common.c	1 Jan 2003 12:02:49 -0000	1.125
+++ x11_common.c	1 Jan 2003 12:50:56 -0000	1.126
@@ -156,7 +156,6 @@
  int             format;
  unsigned long   nitems, bytesafter;
  Atom          * args = NULL;
- int             icewm_hack = 0;
  int             metacity_hack = 0;
  char          * name;
  
@@ -172,8 +171,6 @@
      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 @@
 	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;