comparison libvo/vo_gl2.c @ 15748:f75ba7f7b7b2

support -wid

15747:fbf14e1ab725

	  glClear(GL_COLOR_BUFFER_BIT);
	  aspect(x, y, A_ZOOM);
	  glViewport( (vo_screenwidth-*x)/2, (vo_screenheight-*y)/2, *x, *y);
  } else { 
	  //aspect(x, y, A_NOZOOM);
	  glViewport( 0, 0, *x, *y );
  }

  glMatrixMode(GL_PROJECTION);
  glLoadIdentity();

	XFree(vi_list);
	return (best_weight < 1000000) ? 0 : -1;
}

static int config_glx(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format) {
  if ( vo_window == None ) 
  {
	XSizeHints hint;
	XVisualInfo *vinfo, vinfo_buf;
	XEvent xev;

			draw_alpha_fnc=draw_alpha_24; break;
  	case 32:	
			draw_alpha_fnc=draw_alpha_32; break;
  }

  if (initGl(d_width, d_height) == -1)
      return -1;
#ifndef GL_WIN32
      if (vo_ontop) vo_x11_setlayer(mDisplay,vo_window, vo_ontop);
#endif

15748:f75ba7f7b7b2

	  glClear(GL_COLOR_BUFFER_BIT);
	  aspect(x, y, A_ZOOM);
	  glViewport( (vo_screenwidth-*x)/2, (vo_screenheight-*y)/2, *x, *y);
  } else { 
	  //aspect(x, y, A_NOZOOM);
#ifndef GL_WIN32
	if (WinID >= 0) {
	  int top = 0, left = 0, w = *x, h = *y;
	  geometry(&top, &left, &w, &h, vo_screenwidth, vo_screenheight);
	  glViewport(top, left, w, h);
	} else
#endif
	  glViewport( 0, 0, *x, *y );
  }

  glMatrixMode(GL_PROJECTION);
  glLoadIdentity();

	XFree(vi_list);
	return (best_weight < 1000000) ? 0 : -1;
}

static int config_glx(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format) {
  if (WinID >= 0) {
    vo_window = WinID ? (Window)WinID : mRootWin;
    return 0;
  }
  if ( vo_window == None ) 
  {
	XSizeHints hint;
	XVisualInfo *vinfo, vinfo_buf;
	XEvent xev;

			draw_alpha_fnc=draw_alpha_24; break;
  	case 32:	
			draw_alpha_fnc=draw_alpha_32; break;
  }

  if (initGl(vo_dwidth, vo_dheight) == -1)
      return -1;
#ifndef GL_WIN32
      if (vo_ontop) vo_x11_setlayer(mDisplay,vo_window, vo_ontop);
#endif