diff options
| author | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-09-04 15:21:00 +0000 |
|---|---|---|
| committer | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-09-04 15:21:00 +0000 |
| commit | d62c80d3bd462257c6ebdef6d0eefc9dc6d677b4 (patch) | |
| tree | 50c548107999d8a45ce6cf46fdf3cb226686fec9 /libvo/vo_x11.c | |
| parent | 8ecd9ea9064d81eb2147f2aa22df863619fcefb5 (diff) | |
| download | mpv-d62c80d3bd462257c6ebdef6d0eefc9dc6d677b4.tar.bz2 mpv-d62c80d3bd462257c6ebdef6d0eefc9dc6d677b4.tar.xz | |
fix xshape, mixer, fullscreen, etc
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1853 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/vo_x11.c')
| -rw-r--r-- | libvo/vo_x11.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c index c728485038..7ad2218acb 100644 --- a/libvo/vo_x11.c +++ b/libvo/vo_x11.c @@ -375,13 +375,11 @@ printf( "w: %d h: %d\n\n",vo_dwidth,vo_dheight ); #ifdef HAVE_NEW_GUI if ( vo_window == None ) #endif - XSelectInput( mDisplay,mywindow,StructureNotifyMask | KeyPressMask ); - + { + XSelectInput( mDisplay,mywindow,StructureNotifyMask | KeyPressMask ); + saver_off(mDisplay); + } X_already_started++; - -// vo_initthread( mThread ); - - saver_off(mDisplay); return 0; } @@ -553,9 +551,16 @@ static uint32_t query_format( uint32_t format ) static void uninit(void) { -saver_on(mDisplay); // screen saver back on +#ifdef HAVE_NEW_GUI + if ( vo_window == None ) +#endif + saver_on(mDisplay); // screen saver back on #ifdef HAVE_XF86VM + #ifdef HAVE_NEW_GUI + if ((vidmodes!=NULL)&&( vo_window == None ) ) + #else if (vidmodes!=NULL) + #endif { int screen; screen=DefaultScreen( mDisplay ); XF86VidModeSwitchToMode(mDisplay,screen,vidmodes[0]); @@ -563,7 +568,7 @@ saver_on(mDisplay); // screen saver back on free(vidmodes); } #endif - + XClearWindow( mDisplay,mywindow ); printf("vo: uninit!\n"); } |