Update of /cvsroot/mplayer/main/libvo In directory mail:/var/tmp.root/cvs-serv21369/libvo Modified Files: vo_x11.c vo_xmga.c x11_common.c Log Message: fix Arpi's bugs Index: vo_x11.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_x11.c,v retrieving revision 1.104 retrieving revision 1.105 diff -u -r1.104 -r1.105 --- vo_x11.c 11 May 2002 16:54:15 -0000 1.104 +++ vo_x11.c 12 May 2002 16:01:08 -0000 1.105 @@ -1,4 +1,3 @@ -#define DISP /* * video_out_x11.c,X11 interface @@ -103,7 +102,7 @@ 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 void Display_Image( XImage *myximage,uint8_t *ImageData ) { -#ifdef DISP #ifdef HAVE_SHM if ( Shmem_Flag ) { @@ -454,7 +452,6 @@ ( vo_dwidth - swsContext->dstW ) / 2,( vo_dheight - myximage->height ) / 2, swsContext->dstW,myximage->height); } -#endif } static void draw_osd(void) @@ -469,6 +466,8 @@ { uint8_t *dst[3]; int dstStride[3]; + + check_events(); if((old_vo_dwidth != vo_dwidth || old_vo_dheight != vo_dheight) /*&& y==0*/ && zoomFlag) { Index: vo_xmga.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_xmga.c,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- vo_xmga.c 11 May 2002 14:57:41 -0000 1.67 +++ vo_xmga.c 12 May 2002 16:01:08 -0000 1.68 @@ -335,8 +335,6 @@ { if(!inited) return; inited=0; - XSetBackground( mDisplay,vo_gc,0 ); - XClearWindow( mDisplay,vo_window ); mga_uninit(); saver_on(mDisplay); vo_x11_uninit(mDisplay, vo_window); Index: x11_common.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/x11_common.c,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- x11_common.c 11 May 2002 17:21:32 -0000 1.79 +++ x11_common.c 12 May 2002 16:01:08 -0000 1.80 @@ -490,7 +490,7 @@ vo_MotifWmHints.flags=MWM_HINTS_FUNCTIONS | MWM_HINTS_DECORATIONS; if ( d ) { - vo_MotifWmHints.functions=MWM_FUNC_MOVE | MWM_FUNC_CLOSE | MWM_FUNC_MINIMIZE | MWM_FUNC_MAXIMIZE; + vo_MotifWmHints.functions=MWM_FUNC_MOVE | MWM_FUNC_CLOSE | MWM_FUNC_MINIMIZE | MWM_FUNC_MAXIMIZE | MWM_FUNC_RESIZE; d=MWM_DECOR_ALL; } #if 0 @@ -529,6 +529,9 @@ if ( !use_gui ) #endif { + XSetBackground( mDisplay,vo_gc,0 ); + XClearWindow( mDisplay,vo_window ); + /* and -wid is set */ if (WinID < 0) {