[Mplayer-cvslog] CVS: main/libvo vo_x11.c,1.63,1.64

[Michael Niedermayer]

Update of /cvsroot/mplayer/main/libvo
In directory mplayer:/var/tmp.root/cvs-serv16577

Modified Files:
	vo_x11.c 
Log Message:
-fs and or -vm default is nozoom, -zoom does the expected thing


Index: vo_x11.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_x11.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- vo_x11.c	11 Feb 2002 11:44:50 -0000	1.63
+++ vo_x11.c	11 Feb 2002 13:45:26 -0000	1.64
@@ -71,6 +71,7 @@
 //static int vo_dwidth,vo_dheight;
 
 static int Flip_Flag;
+static int zoomFlag;
 
 #ifdef HAVE_SHM
 
@@ -264,6 +265,8 @@
  if( flags&0x03 ) fullscreen = 1;
  if( flags&0x02 ) vm = 1;
  if( flags&0x08 ) Flip_Flag = 1;
+ zoomFlag = flags&0x04;
+ if(!fullscreen) zoomFlag=1; //it makes no sense to avoid zooming on windowd mode
  
 //printf( "w: %d h: %d\n\n",vo_dwidth,vo_dheight );
 
@@ -273,13 +276,11 @@
  if ( depth != 15 && depth != 16 && depth != 24 && depth != 32 ) depth=24;
  XMatchVisualInfo( mDisplay,mScreen,depth,TrueColor,&vinfo );
 
- if(fullscreen){
-         image_width=vo_screenwidth;
-         image_height=vo_screenheight;
- } else {
-         image_width=d_width;
-         image_height=d_height;
- }
+ /* set image size, if zoom is on it will be changed during draw_slice anyway 
+    so we dont dupplicate the aspect code here */
+ image_width=d_width;
+ image_height=d_height;
+
  aspect= ((1<<16)*d_width + d_height/2)/d_height;
 
 #ifdef HAVE_NEW_GUI
@@ -471,7 +472,7 @@
   static int old_vo_dwidth=-1;
   static int old_vo_dheight=-1;
   
-  if((old_vo_dwidth != vo_dwidth || old_vo_dheight != vo_dheight) && y==0)
+  if((old_vo_dwidth != vo_dwidth || old_vo_dheight != vo_dheight) && y==0 && zoomFlag)
   {
     int newW= vo_dwidth;
     int newH= vo_dheight;