summaryrefslogtreecommitdiffstats
path: root/libvo/vo_x11.c
diff options
context:
space:
mode:
authorpontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-05-12 16:01:08 +0000
committerpontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-05-12 16:01:08 +0000
commit762d6ac6aad55f59959037ffbfbfbaa5ec34439d (patch)
treed4834be196bf0a048ddc2676d998b39bd5b7c9db /libvo/vo_x11.c
parent2df03728bdab49791757749f0218c7cfad683594 (diff)
downloadmpv-762d6ac6aad55f59959037ffbfbfbaa5ec34439d.tar.bz2
mpv-762d6ac6aad55f59959037ffbfbfbaa5ec34439d.tar.xz
fix Arpi's bugs
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6060 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/vo_x11.c')
-rw-r--r--libvo/vo_x11.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c
index 1530229dd8..6c874b1af1 100644
--- a/libvo/vo_x11.c
+++ b/libvo/vo_x11.c
@@ -1,4 +1,3 @@
-#define DISP
/*
* video_out_x11.c,X11 interface
@@ -103,7 +102,7 @@ static void check_events(){
int ret = vo_x11_check_events(mDisplay);
/* clear the old window */
- if (ret & VO_EVENT_RESIZE)
+ if ( (ret & VO_EVENT_RESIZE)||(ret & VO_EVENT_EXPOSE) )
{
XSetBackground(mDisplay, vo_gc, 0);
XClearWindow(mDisplay, vo_window);
@@ -437,7 +436,6 @@ static const vo_info_t* get_info( void )
static void Display_Image( XImage *myximage,uint8_t *ImageData )
{
-#ifdef DISP
#ifdef HAVE_SHM
if ( Shmem_Flag )
{
@@ -454,7 +452,6 @@ static void Display_Image( XImage *myximage,uint8_t *ImageData )
( vo_dwidth - swsContext->dstW ) / 2,( vo_dheight - myximage->height ) / 2,
swsContext->dstW,myximage->height);
}
-#endif
}
static void draw_osd(void)
@@ -469,6 +466,8 @@ static uint32_t draw_slice( uint8_t *src[],int stride[],int w,int h,int x,int y
{
uint8_t *dst[3];
int dstStride[3];
+
+ check_events();
if((old_vo_dwidth != vo_dwidth || old_vo_dheight != vo_dheight) /*&& y==0*/ && zoomFlag)
{