mirror of
https://github.com/mpv-player/mpv
synced 2024-12-12 09:56:30 +00:00
fix Arpi's bugs
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6060 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
2df03728bd
commit
762d6ac6aa
@ -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)
|
||||
{
|
||||
|
@ -335,8 +335,6 @@ uninit(void)
|
||||
{
|
||||
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);
|
||||
|
@ -490,7 +490,7 @@ void vo_x11_decoration( Display * vo_Display,Window w,int d )
|
||||
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 @@ int vo_x11_uninit(Display *display, Window window)
|
||||
if ( !use_gui )
|
||||
#endif
|
||||
{
|
||||
XSetBackground( mDisplay,vo_gc,0 );
|
||||
XClearWindow( mDisplay,vo_window );
|
||||
|
||||
/* and -wid is set */
|
||||
if (WinID < 0)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user