[Mplayer-cvslog] CVS: main/libvo vo_xvmc.c,1.2,1.3

[Ivan Kalvachev CVS]

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

Modified Files:
	vo_xvmc.c 
Log Message:
draw rectangle with color key, avoid blue bars. avoid PutSurface before 1'st image

Index: vo_xvmc.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xvmc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vo_xvmc.c	21 Jul 2003 21:02:33 -0000	1.2
+++ vo_xvmc.c	28 Jul 2003 20:04:09 -0000	1.3
@@ -255,7 +255,7 @@
    }
    xv_port = 0;
    number_of_surfaces = 0;
-   keycolor_handling = 1;//!!fixme
+   keycolor_handling = 3;//!!fixme
    surface_render=NULL;
    
    return 0;
@@ -458,7 +458,7 @@
          vo_x11_classhint( mDisplay,vo_window,"xvmc" );
          vo_hidecursor(mDisplay,vo_window);
 
-         vo_x11_selectinput_witherr(mDisplay, vo_window, StructureNotifyMask | KeyPressMask | PropertyChangeMask |
+         vo_x11_selectinput_witherr(mDisplay, vo_window, StructureNotifyMask | KeyPressMask | PropertyChangeMask | ExposureMask |
 	      ((WinID==0) ? 0 : (PointerMotionMask
 		| ButtonPressMask | ButtonReleaseMask)) );
          XSetStandardProperties(mDisplay, vo_window, hello, hello, None, NULL, 0, &hint);
@@ -594,11 +594,8 @@
 int e=vo_x11_check_events(mDisplay);
    if(e&VO_EVENT_RESIZE)
    {
-      if (vo_fs) {
-        e |= VO_EVENT_EXPOSE;
-        XClearWindow(mDisplay, vo_window);
-        XFlush(mDisplay);
-      }
+      e |= VO_EVENT_EXPOSE;
+      
       XGetGeometry( mDisplay,vo_window,&mRoot,&drwX,&drwY,&vo_dwidth,&vo_dheight,
                    &drwBorderWidth,&drwDepth );
       drwX = drwY = 0;
@@ -619,6 +616,7 @@
    if ( e & VO_EVENT_EXPOSE )
    {
       mDrawColorKey(drwX,drwY,vo_dwidth,vo_dheight);     
+     if(p_render_surface_visible != NULL)
       XvMCPutSurface(mDisplay, p_render_surface_visible->p_surface,vo_window,
                      0, 0, image_width, image_height,
                      drwX,drwY,vo_dwidth,vo_dheight,