mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 12:02:23 +02:00
Code

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

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12036 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2004-03-17 11:53:25 +00:00
parent f8107ca194
commit 6080f08560
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
libvo/vo_gl2.c
View File

@ -677,23 +677,11 @@ static uint32_t config_glx(uint32_t width, uint32_t height, uint32_t d_width, ui
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 */
@ -709,9 +697,9 @@ static uint32_t config_glx(uint32_t width, uint32_t height, uint32_t d_width, ui
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));
if ( flags&0x01 ) vo_x11_decoration( mDisplay,vo_window,0 );
XSelectInput(mDisplay, vo_window, StructureNotifyMask);
@ -733,15 +721,26 @@ static uint32_t config_glx(uint32_t width, uint32_t height, uint32_t d_width, ui
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 );
// 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);
@ -837,8 +836,6 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin
image_height = height;
image_width = width;
vo_dwidth = d_width;
vo_dheight = d_height;
image_format = format;
int_pause = 0;