[Mplayer-cvslog] CVS: main/libvo vo_xv.c,1.95,1.96

[Arpi of Ize]

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

Modified Files:
	vo_xv.c 
Log Message:
-vm pan&scan fixes by Jesper Svennevid <mplayer at svennevid.ne>
osd fixed by me (don't draw osd outside of visible area)


Index: vo_xv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xv.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- vo_xv.c	6 Jun 2002 07:13:57 -0000	1.95
+++ vo_xv.c	7 Jun 2002 22:39:31 -0000	1.96
@@ -101,18 +101,21 @@
 static void (*draw_alpha_fnc)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride);
 
 static void draw_alpha_yv12(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){
+   x0+=(vo_panscan_x>>2);
    vo_draw_alpha_yv12(w,h,src,srca,stride,
        xvimage[current_buf]->data+xvimage[current_buf]->offsets[0]+
        xvimage[current_buf]->pitches[0]*y0+x0,xvimage[current_buf]->pitches[0]);
 }
 
 static void draw_alpha_yuy2(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){
+   x0+=(vo_panscan_x>>2);
    vo_draw_alpha_yuy2(w,h,src,srca,stride,
        xvimage[current_buf]->data+xvimage[current_buf]->offsets[0]+
        xvimage[current_buf]->pitches[0]*y0+2*x0,xvimage[current_buf]->pitches[0]);
 }
 
 static void draw_alpha_uyvy(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){
+   x0+=(vo_panscan_x>>2);
    vo_draw_alpha_yuy2(w,h,src,srca,stride,
        xvimage[current_buf]->data+xvimage[current_buf]->offsets[0]+
        xvimage[current_buf]->pitches[0]*y0+2*x0+1,xvimage[current_buf]->pitches[0]);
@@ -593,7 +596,7 @@
 }
 
 static void draw_osd(void)
-{ vo_draw_text(image_width,image_height,draw_alpha_fnc);}
+{ vo_draw_text(image_width-(vo_panscan_x>>1),image_height,draw_alpha_fnc);}
 
 static void flip_page(void)
 {
@@ -852,20 +855,25 @@
     return query_format(*((uint32_t*)data));
   case VOCTRL_GET_IMAGE:
     return get_image(data);
-  case VOCTRL_FULLSCREEN:
-    vo_x11_fullscreen();
-    return VO_TRUE;
   case VOCTRL_GUISUPPORT:
     return VO_TRUE;
   case VOCTRL_GET_PANSCAN:
     if ( !vo_config_count || !vo_fs ) return VO_FALSE;
     return VO_TRUE;
+  case VOCTRL_FULLSCREEN:
+    vo_x11_fullscreen();
+  /* indended, fallthrough to update panscan on fullscreen/windowed switch */
   case VOCTRL_SET_PANSCAN:
-   if ( vo_fs && ( vo_panscan != vo_panscan_amount ) )
+   if ( ( vo_fs && ( vo_panscan != vo_panscan_amount ) ) || ( !vo_fs && vo_panscan_amount ) )
      {
+      int old_y = vo_panscan_y;
       panscan_calc();
-      XClearWindow(mDisplay, vo_window);
-      XFlush(mDisplay);
+      
+      if(old_y != vo_panscan_y)
+       {
+        XClearWindow(mDisplay, vo_window);
+        XFlush(mDisplay);
+       }
      }
     return VO_TRUE;
   }