comparison libvo/vo_xmga.c @ 6016:be9cd7d845c2

-zoom, -fs with x[11|mga|v] fix -- round two

6015:04fe086ae486

{
 char                 * mTitle=(title == NULL) ? "XMGA render" : title;
 XVisualInfo            vinfo;

 unsigned long          xswamask;

 width+=width&1;

 switch(format)
  {

        mga_vid_config.frame_size=( ( width + 31 ) & ~31 ) * height * 2;
        break;
   default:          printf("mga: invalid output format %0X\n",format); return (-1);
  }

 if ( X_already_started ) return -1;

 if (!vo_init()) return -1;

 aspect_save_orig(width,height);
 aspect_save_prescale(d_width,d_height);
 aspect_save_screenres(vo_screenwidth,vo_screenheight);

 mvWidth=width; mvHeight=height;

 wndX=0; wndY=0;
 vo_dwidth=d_width; vo_dheight=d_height;
 vo_mouse_autohide=1;
// vo_fs=fullscreen&1;
// if ( vo_fs )
//  { vo_old_width=d_width; vo_old_height=d_height; }

 switch ( vo_depthonscreen )
  {
   case 32:
   case 24: fgColor=0x00ff00ffL; break;

   default: printf( "Sorry, this (%d) color depth not supported.\n",vo_depthonscreen ); return -1;
  }

  inited=1;

 aspect(&vo_dwidth,&vo_dheight,A_NOZOOM);

#ifdef HAVE_NEW_GUI
  if(use_gui)
    guiGetEvent( guiSetShVideo,0 ); // the GUI will set up / resize the window
  else
#endif
  {
   if ( vo_fs )
    {
//     vo_dwidth=vo_screenwidth;
//     vo_dheight=vo_screenheight;
#ifdef X11_FULLSCREEN
     aspect(&dwidth,&dheight,A_ZOOM);
#endif
    }

   XGetWindowAttributes( mDisplay,DefaultRootWindow( mDisplay ),&attribs );
   mDepth=attribs.depth;
   if ( mDepth != 15 && mDepth != 16 && mDepth != 24 && mDepth != 32 ) mDepth=24;
   XMatchVisualInfo( mDisplay,mScreen,mDepth,TrueColor,&vinfo );

    if ( WinID>=0 ){
      vo_window = WinID ? ((Window)WinID) : RootWindow(mDisplay,mScreen);
      XUnmapWindow( mDisplay,vo_window );
      XChangeWindowAttributes( mDisplay,vo_window,xswamask,&xWAttribs);
    } else 
   vo_window=XCreateWindow( mDisplay,RootWindow( mDisplay,mScreen ),
     wndX,wndY,
     vo_dwidth,vo_dheight,
     xWAttribs.border_pixel,
     mDepth,
     InputOutput,

6016:be9cd7d845c2

{
 char                 * mTitle=(title == NULL) ? "XMGA render" : title;
 XVisualInfo            vinfo;

 unsigned long          xswamask;

 if ( X_already_started ) return -1;
 if (!vo_init()) return -1;

 width+=width&1;

 switch(format)
  {

        mga_vid_config.frame_size=( ( width + 31 ) & ~31 ) * height * 2;
        break;
   default:          printf("mga: invalid output format %0X\n",format); return (-1);
  }

 aspect_save_orig(width,height);
 aspect_save_prescale(d_width,d_height);
 aspect_save_screenres(vo_screenwidth,vo_screenheight);

 mvWidth=width; mvHeight=height;

 wndX=0; wndY=0;
 vo_dwidth=d_width; vo_dheight=d_height;
 vo_mouse_autohide=1;

 switch ( vo_depthonscreen )
  {
   case 32:
   case 24: fgColor=0x00ff00ffL; break;

   default: printf( "Sorry, this (%d) color depth not supported.\n",vo_depthonscreen ); return -1;
  }

  inited=1;

  aspect(&vo_dwidth,&vo_dheight,A_NOZOOM);

#ifdef HAVE_NEW_GUI
  if(use_gui)
    guiGetEvent( guiSetShVideo,0 ); // the GUI will set up / resize the window
  else
#endif
  {
#ifdef X11_FULLSCREEN
   if ( fullscreen&1 ) aspect(&dwidth,&dheight,A_ZOOM);
#endif

   XGetWindowAttributes( mDisplay,DefaultRootWindow( mDisplay ),&attribs );
   mDepth=attribs.depth;
   if ( mDepth != 15 && mDepth != 16 && mDepth != 24 && mDepth != 32 ) mDepth=24;
   XMatchVisualInfo( mDisplay,mScreen,mDepth,TrueColor,&vinfo );

    if ( WinID>=0 ){
      vo_window = WinID ? ((Window)WinID) : RootWindow(mDisplay,mScreen);
      XUnmapWindow( mDisplay,vo_window );
      XChangeWindowAttributes( mDisplay,vo_window,xswamask,&xWAttribs);
    } else 
   vo_window=XCreateWindow( mDisplay,mRootWin,
     wndX,wndY,
     vo_dwidth,vo_dheight,
     xWAttribs.border_pixel,
     mDepth,
     InputOutput,