comparison libvo/vo_gl2.c @ 12035:b3512c7b26ce

corrected problems with switching to and from fullscreen mode esp. with fixed-vo

12034:90315c910b26

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

        if( flags&0x01 )
        {
	        vo_fs = VO_TRUE;
                aspect(&d_width,&d_height,A_ZOOM);
		hint.x = 0;
		hint.y = 0;
		hint.width = vo_screenwidth;
		hint.height = vo_screenheight;
		hint.flags = PPosition | PSize;
        } else {
		vo_fs = VO_FALSE;
		hint.x = 0;
		hint.y = 0;
		hint.width = d_width;
		hint.height = d_height;
		hint.flags = PPosition | PSize;
        }

	/* Make the window */

//	XGetWindowAttributes(mDisplay, DefaultRootWindow(mDisplay), &attribs);

    return -1;
  }

  if ( vo_window == None ) 
   {
    vo_window = vo_x11_create_smooth_window(mDisplay, RootWindow(mDisplay,mScreen), 
		                            vinfo->visual, hint.x, hint.y, hint.width, hint.height, vinfo->depth, vo_x11_create_colormap(vinfo));
  if ( flags&0x01 ) vo_x11_decoration( mDisplay,vo_window,0 );

	XSelectInput(mDisplay, vo_window, StructureNotifyMask);

	/* Tell other applications about this window */

	do 
	{
		XNextEvent(mDisplay, &xev);
	}
	while (xev.type != MapNotify || xev.xmap.event != vo_window);

	XSelectInput(mDisplay, vo_window, NoEventMask);

   }
   else {
   	vo_x11_sizehint( hint.x, hint.y, hint.width, hint.height,0 );
   	if ( !(flags&1) ) XMoveResizeWindow( mDisplay,vo_window,hint.x,hint.y,hint.width,hint.height );
   }

  vo_x11_classhint( mDisplay,vo_window,"gl2" );
  vo_hidecursor(mDisplay,vo_window);
  
  if ( vo_config_count ) glXDestroyContext( mDisplay,wsGLXContext );

{
        const unsigned char * glVersion;

	image_height = height;
	image_width = width;
    vo_dwidth = d_width;
    vo_dheight = d_height;
	image_format = format;

	int_pause = 0;
  
	aspect_save_orig(width,height);

12035:b3512c7b26ce

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

		hint.x = 0;
		hint.y = 0;
		hint.width = d_width;
		hint.height = d_height;
		hint.flags = PPosition | PSize;

	/* Make the window */

//	XGetWindowAttributes(mDisplay, DefaultRootWindow(mDisplay), &attribs);

    return -1;
  }

  if ( vo_window == None ) 
   {
    vo_fs = VO_FALSE;
    vo_window = vo_x11_create_smooth_window(mDisplay, RootWindow(mDisplay,mScreen), 
		                            vinfo->visual, hint.x, hint.y, hint.width, hint.height, vinfo->depth, vo_x11_create_colormap(vinfo));

	XSelectInput(mDisplay, vo_window, StructureNotifyMask);

	/* Tell other applications about this window */

	do 
	{
		XNextEvent(mDisplay, &xev);
	}
	while (xev.type != MapNotify || xev.xmap.event != vo_window);
   }
   else {
   	vo_x11_sizehint( hint.x, hint.y, hint.width, hint.height,0 );
   	// for changing from fullscreen to fullscreen we do fullscreen to
   	// window and back to fullscreen, so that vo_x11_fullscreen saves
   	// the correct size for _this_ video (and doesn't take the values from
   	// the previous one)
   	if (vo_fs)
   	 vo_x11_fullscreen ();
   	XMoveResizeWindow( mDisplay,vo_window,hint.x,hint.y,hint.width,hint.height );
   }

  // these would normally be set by the event handler, but here we have to
  // do it manually
  vo_dwidth = d_width;
  vo_dheight = d_height;

  if (flags & VOFLAG_FULLSCREEN)
   vo_x11_fullscreen();

  vo_x11_classhint( mDisplay,vo_window,"gl2" );
  vo_hidecursor(mDisplay,vo_window);
  
  if ( vo_config_count ) glXDestroyContext( mDisplay,wsGLXContext );

{
        const unsigned char * glVersion;

	image_height = height;
	image_width = width;
	image_format = format;

	int_pause = 0;
  
	aspect_save_orig(width,height);