[Mplayer-cvslog] CVS: main/libvo x11_common.c,1.123,1.124

[Arpi of Ize]

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

Modified Files:
	x11_common.c 
Log Message:
I have just installed IceWM 1.2.3 which supports NetWM and has broken
support for resizing. To maximize window we need to use
_NET_WM_STATE_FULLSCREEN, but it doesn't tell use that it supports it.

New IceWM also doesn't support layers in fullscreen mode, changing it
doesn't change window position (again, "-icelayer" doesn't fit well).

Also while fixing fvwm metacity got broken again, so there is a new
hack or it, and small fix in code for openbox.

Now it should work on almost everything.

Filip Kalinski <filon at pld.org.pl>


Index: x11_common.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/x11_common.c,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- x11_common.c	30 Dec 2002 23:59:53 -0000	1.123
+++ x11_common.c	31 Dec 2002 12:42:14 -0000	1.124
@@ -155,6 +155,9 @@
  int             format;
  unsigned long   nitems, bytesafter;
  Atom          * args = NULL;
+ int             icewm_hack = 0;
+ int             metacity_hack = 0;
+ char          * name;
  
  if ( WinID >= 0 ) return vo_wm_Unknown;
  
@@ -164,12 +167,19 @@
   {
    mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] Detected wm supports layers.\n" );
    for (i = 0; i < nitems; i++)
-     if (!strcmp( XGetAtomName (mDisplay, args[i]), "_WIN_LAYER"))
-     {
-       XFree( args );
-       return vo_wm_Layered;
-     }
+   {
+     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;
+   }
    XFree( args );
+   if (wm && !icewm_hack && metacity_hack)
+     return wm;
   }
 
 // --- netwm 
@@ -177,6 +187,7 @@
  if ( Success == XGetWindowProperty( mDisplay,mRootWin,type,0,16384,False,AnyPropertyType,&type,&format,&nitems,&bytesafter,(unsigned char **) &args ) && nitems > 0 )
   {
    mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] Detected wm is of class NetWM.\n" );
+   net_wm_support = 0;
    for (i = 0; i < nitems; i++)
      net_wm_support |= net_wm_support_state_test (XGetAtomName (mDisplay, args[i]));
    XFree( args );
@@ -184,7 +195,7 @@
    {
      // ugly hack for broken OpenBox _NET_WM_STATE_FULLSCREEN support
      // (in their implementation it only changes internal state of window, nothing more!!!)
-     if (vo_wm_NetWM == SUPPORT_FULLSCREEN)
+     if (net_wm_support & SUPPORT_FULLSCREEN)
      {
         type=XInternAtom( mDisplay,"_BLACKBOX_PID",False );
 	if ( Success == XGetWindowProperty( mDisplay,mRootWin,type,0,16384,False,AnyPropertyType,&type,&format,&nitems,&bytesafter,(unsigned char **) &args ) && nitems > 0 )
@@ -197,9 +208,20 @@
 	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;
 }