From c91a6622dac391a1ac3b6b2b8e68881aab62302e Mon Sep 17 00:00:00 2001 From: attila Date: Sun, 22 Jun 2003 10:09:04 +0000 Subject: Patch by Tom Lees This patch fixes two minor problems the vo_xv driver has: 1. Starting in fullscreen e.g. (mplayer -fs dvd://1) will have a window which doesn't extend all the way down the screen unless you have a 4:3 movie. 2. Monitoraspect is not used so e.g. showing a movie when in 1280x1024 desktop looks wrong. BTW: maybe vo_xv.c should be reindented. it's getting more and more unreadable git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10324 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/vo_xv.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'libvo') diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c index 1934238c63..101cfdf9de 100644 --- a/libvo/vo_xv.c +++ b/libvo/vo_xv.c @@ -307,9 +307,9 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32 { hint.x = vo_dx; hint.y = vo_dy; + aspect(&d_width,&d_height,A_NOZOOM); hint.width = d_width; hint.height = d_height; - aspect(&d_width,&d_height,A_NOZOOM); #ifdef HAVE_XF86VM if ( vm ) { @@ -379,10 +379,12 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32 XSetWMNormalHints( mDisplay,vo_window,&hint ); XMapWindow(mDisplay, vo_window); if ( flags&1 ) vo_x11_fullscreen(); + else { #ifdef HAVE_XINERAMA - vo_x11_xinerama_move(mDisplay,vo_window); + vo_x11_xinerama_move(mDisplay,vo_window); #endif - vo_x11_sizehint( hint.x, hint.y, hint.width, hint.height,0 ); + vo_x11_sizehint( hint.x, hint.y, hint.width, hint.height,0 ); + } } else { // vo_fs set means we were already at fullscreen vo_x11_sizehint( hint.x, hint.y, hint.width, hint.height,0 ); -- cgit v1.2.3