comparison libvo/vo_x11.c @ 9278:caea8ed36b48

The reason why mplayer crashes (in some cases) when using x11 output and -wid (>0) parameter is this: Mplayer by default creates a colormap using DirectColor visual. If the window given to mplayer uses TrueColor visual there will be an error when mplayer sets the colormap for the window. This patch modifies mplayer to use TrueColor visual if the window given to mplayer uses TrueColor. Another solution is to make sure that the window given to mplayer is created using DirectColor visual if it is supported by the display. Jouni Tulkki <[e-mail]>

9277:d824f1a3c341

 if ( depth != 15 && depth != 16 && depth != 24 && depth != 32 ) {
   Visual *visual;
   depth = vo_find_depth_from_visuals(mDisplay, mScreen, &visual);
 }
 if ( !XMatchVisualInfo( mDisplay,mScreen,depth,DirectColor,&vinfo ))
   XMatchVisualInfo( mDisplay,mScreen,depth,TrueColor,&vinfo );

 /* set image size (which is indeed neither the input nor output size), 
    if zoom is on it will be changed during draw_slice anyway so we dont dupplicate the aspect code here 
 */

    theCmap=vo_x11_create_colormap(&vinfo);

    xswa.background_pixel=0;
    xswa.border_pixel=0;
    xswamask=CWBackPixel | CWBorderPixel;

#ifdef HAVE_XF86VM
    if ( vm )
     {
      xswa.override_redirect=True;

    }
    else
     {
      if ( vo_window == None )
       {
        xswa.colormap=theCmap;
        xswamask|=CWColormap;
        vo_window=XCreateWindow( mDisplay,mRootWin,
    			 vo_dx,vo_dy,
			 vo_dwidth,vo_dheight,
                         xswa.border_pixel,depth,CopyFromParent,vinfo.visual,xswamask,&xswa );

9278:caea8ed36b48

 if ( depth != 15 && depth != 16 && depth != 24 && depth != 32 ) {
   Visual *visual;
   depth = vo_find_depth_from_visuals(mDisplay, mScreen, &visual);
 }
 if ( !XMatchVisualInfo( mDisplay,mScreen,depth,DirectColor,&vinfo ) ||
      WinID > 0 && vinfo.visualid != XVisualIDFromVisual(attribs.visual))
   XMatchVisualInfo( mDisplay,mScreen,depth,TrueColor,&vinfo );

 /* set image size (which is indeed neither the input nor output size), 
    if zoom is on it will be changed during draw_slice anyway so we dont dupplicate the aspect code here 
 */

    theCmap=vo_x11_create_colormap(&vinfo);

    xswa.background_pixel=0;
    xswa.border_pixel=0;
    xswa.colormap=theCmap;
    xswamask=CWBackPixel | CWBorderPixel | CWColormap;

#ifdef HAVE_XF86VM
    if ( vm )
     {
      xswa.override_redirect=True;

    }
    else
     {
      if ( vo_window == None )
       {
        vo_window=XCreateWindow( mDisplay,mRootWin,
    			 vo_dx,vo_dy,
			 vo_dwidth,vo_dheight,
                         xswa.border_pixel,depth,CopyFromParent,vinfo.visual,xswamask,&xswa );