comparison libvo/x11_common.c @ 8835:664b0612f950

Fixed metacity + xv behavior (something broke it lately). Fixed sawfish bahavior in gmplayer: use ABOVE, FULLSCREEN is last choice. Now mplayer window is visible over the video window.

8834:ff9e47fdf740

/* output window id */
int WinID=-1;
int vo_mouse_autohide = 0;
int vo_wm_type = -1;

#define SUPPORT_NONE 0
#define SUPPORT_FULLSCREEN 1
#define SUPPORT_ABOVE 2
#define SUPPORT_STAYS_ON_TOP 4

{
 int             i;
 int             wm = vo_wm_Unknown;
 unsigned long   nitems;
 Atom          * args = NULL;
 int             metacity_hack = 0;
 
 if ( WinID >= 0 ) return vo_wm_Unknown;
 
// -- supports layers
  if (x11_get_property(XA_WIN_PROTOCOLS, &args, &nitems))
  {
   mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] Detected wm supports layers.\n" );
   for (i = 0; i < nitems; i++)
   {
     if ( args[i] == XA_WIN_LAYER)
       wm = vo_wm_Layered;
     if ( args[i] == XA_WIN_HINTS)
       // metacity is the only manager which supports _WIN_LAYER but not _WIN_HINTS
       // what's more is has broken _WIN_LAYER support
       metacity_hack = 1;
   }
   XFree( args );
   if (wm && metacity_hack)
     return wm;
  }

// --- netwm 
  if (x11_get_property(XA_NET_SUPPORTED, &args, &nitems))
  {
   mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] Detected wm is of class NetWM.\n" );
   net_wm_support = 0;

    break;
  }
  case vo_wm_NetWM:
  {
   XClientMessageEvent  xev;
   mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] NET style stay on top ( layer %d ).\n",layer );

   memset( &xev,0,sizeof( xev ) );
   xev.type=ClientMessage;
   xev.message_type=XA_NET_WM_STATE;
   xev.display=mDisplay;
   xev.window=vo_window;
   xev.format=32;
   xev.data.l[0]=layer;
   
   if (net_wm_support & SUPPORT_FULLSCREEN)
   {
     xev.data.l[1]=XA_NET_WM_STATE_FULLSCREEN;
     XSendEvent( mDisplay,mRootWin,False,SubstructureRedirectMask,(XEvent*)&xev );
   } else
   if (net_wm_support & SUPPORT_STAYS_ON_TOP)
   {
     xev.data.l[1]=XA_NET_WM_STATE_STAYS_ON_TOP;
     XSendEvent( mDisplay,mRootWin,False,SubstructureRedirectMask,(XEvent*)&xev );
   } else
   if (net_wm_support & SUPPORT_ABOVE)
   {
     xev.data.l[1]=XA_NET_WM_STATE_ABOVE;
     XSendEvent( mDisplay,mRootWin,False,SubstructureRedirectMask,(XEvent*)&xev );
   }
  }
 }
}

void vo_x11_fullscreen( void )

     (vo_dheight==vo_screenheight && vo_dheight!=vo_old_height) ) return;
   vo_fs=VO_TRUE;
   vo_old_x=vo_dx; vo_old_y=vo_dy; vo_old_width=vo_dwidth; vo_old_height=vo_dheight;
   x=0; y=0; w=vo_screenwidth; h=vo_screenheight;
 }
 if (! (net_wm_support & SUPPORT_FULLSCREEN))
 {
   vo_x11_decoration( mDisplay,vo_window,(vo_fs) ? 0 : 1 );
   vo_x11_sizehint( x,y,w,h,0 );
 }
 vo_x11_setlayer( vo_fs );
 if (! (net_wm_support & SUPPORT_FULLSCREEN))
 {
   if(vo_wm_type==vo_wm_Unknown && !(vo_fsmode&16))
  //     XUnmapWindow( mDisplay,vo_window );  // required for MWM
      XWithdrawWindow(mDisplay,vo_window,mScreen);
   XMoveResizeWindow( mDisplay,vo_window,x,y,w,h );

8835:664b0612f950

/* output window id */
int WinID=-1;
int vo_mouse_autohide = 0;
int vo_wm_type = -1;

/* if equal to 1 means that WM is a metacity (broken as hell) */
int metacity_hack = 0;

#define SUPPORT_NONE 0
#define SUPPORT_FULLSCREEN 1
#define SUPPORT_ABOVE 2
#define SUPPORT_STAYS_ON_TOP 4

{
 int             i;
 int             wm = vo_wm_Unknown;
 unsigned long   nitems;
 Atom          * args = NULL;
 
 if ( WinID >= 0 ) return vo_wm_Unknown;
 
// -- supports layers
  if (x11_get_property(XA_WIN_PROTOCOLS, &args, &nitems))
  {
   mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] Detected wm supports layers.\n" );
   for (i = 0; i < nitems; i++)
   {
     if ( args[i] == XA_WIN_LAYER) {
       wm = vo_wm_Layered;
       metacity_hack |= 1;
     }
     if ( args[i] == XA_WIN_HINTS)
       // metacity is the only manager which supports _WIN_LAYER but not _WIN_HINTS
       // what's more is has broken _WIN_LAYER support
       metacity_hack |= 2;
   }
   XFree( args );
   if (wm && metacity_hack == 3)
     return wm;
  }

  if (metacity_hack == 1)
   mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] Using workaround for Metacity bugs.\n" );
  
// --- netwm 
  if (x11_get_property(XA_NET_SUPPORTED, &args, &nitems))
  {
   mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] Detected wm is of class NetWM.\n" );
   net_wm_support = 0;

    break;
  }
  case vo_wm_NetWM:
  {
   XClientMessageEvent  xev;
   char *state;

   memset( &xev,0,sizeof( xev ) );
   xev.type=ClientMessage;
   xev.message_type=XA_NET_WM_STATE;
   xev.display=mDisplay;
   xev.window=vo_window;
   xev.format=32;
   xev.data.l[0]=layer;
   
   if (net_wm_support & SUPPORT_ABOVE)
   {
     xev.data.l[1]=XA_NET_WM_STATE_ABOVE;
     XSendEvent( mDisplay,mRootWin,False,SubstructureRedirectMask,(XEvent*)&xev );
   } else
   if (net_wm_support & SUPPORT_STAYS_ON_TOP)
   {
     xev.data.l[1]=XA_NET_WM_STATE_STAYS_ON_TOP;
     XSendEvent( mDisplay,mRootWin,False,SubstructureRedirectMask,(XEvent*)&xev );
   } else
   if (net_wm_support & SUPPORT_FULLSCREEN)
   {
     xev.data.l[1]=XA_NET_WM_STATE_FULLSCREEN;
     XSendEvent( mDisplay,mRootWin,False,SubstructureRedirectMask,(XEvent*)&xev );
   }
   state = XGetAtomName (mDisplay, xev.data.l[1]);
   mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] NET style stay on top ( layer %d ). Using state %s.\n",layer,state );
   XFree (state);
  }
 }
}

void vo_x11_fullscreen( void )

     (vo_dheight==vo_screenheight && vo_dheight!=vo_old_height) ) return;
   vo_fs=VO_TRUE;
   vo_old_x=vo_dx; vo_old_y=vo_dy; vo_old_width=vo_dwidth; vo_old_height=vo_dheight;
   x=0; y=0; w=vo_screenwidth; h=vo_screenheight;
 }
 if (net_wm_support!=SUPPORT_FULLSCREEN || metacity_hack==1)
 {
   vo_x11_decoration( mDisplay,vo_window,(vo_fs) ? 0 : 1 );
   vo_x11_sizehint( x,y,w,h,0 );
 }
 vo_x11_setlayer( vo_fs );
 if (net_wm_support!=SUPPORT_FULLSCREEN || metacity_hack==1)
 {
   if(vo_wm_type==vo_wm_Unknown && !(vo_fsmode&16))
  //     XUnmapWindow( mDisplay,vo_window );  // required for MWM
      XWithdrawWindow(mDisplay,vo_window,mScreen);
   XMoveResizeWindow( mDisplay,vo_window,x,y,w,h );