summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authoriive <iive@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-07-28 20:04:09 +0000
committeriive <iive@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-07-28 20:04:09 +0000
commitb8650f660d9184d4c7cac89539dcb628f683b15a (patch)
tree9756991aa2a81269cc7ecf28597e3ad15102e941 /libvo
parent5d920fad095298c29b8e5dff7c2197a411b75e26 (diff)
downloadmpv-b8650f660d9184d4c7cac89539dcb628f683b15a.tar.bz2
mpv-b8650f660d9184d4c7cac89539dcb628f683b15a.tar.xz
draw rectangle with color key, avoid blue bars. avoid PutSurface before 1'st image
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10498 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r--libvo/vo_xvmc.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/libvo/vo_xvmc.c b/libvo/vo_xvmc.c
index cdd5b42d0e..ef773be0d4 100644
--- a/libvo/vo_xvmc.c
+++ b/libvo/vo_xvmc.c
@@ -255,7 +255,7 @@ int mc_ver,mc_rev;
}
xv_port = 0;
number_of_surfaces = 0;
- keycolor_handling = 1;//!!fixme
+ keycolor_handling = 3;//!!fixme
surface_render=NULL;
return 0;
@@ -458,7 +458,7 @@ static uint32_t vm_height;
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 @@ uint32_t drwBorderWidth,drwDepth;
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 @@ int e=vo_x11_check_events(mDisplay);
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,