diff options
| author | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-05-08 20:24:35 +0000 |
|---|---|---|
| committer | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-05-08 20:24:35 +0000 |
| commit | 5a26c56aade3af88923779a0343a1d6a5b00c0db (patch) | |
| tree | da2b653d8d9b0e9cfb370d012250f8ac825e7ede /libvo/x11_common.c | |
| parent | b5322c7eb861d3dc67c4ec39f350d763b266fb84 (diff) | |
| download | mpv-5a26c56aade3af88923779a0343a1d6a5b00c0db.tar.bz2 mpv-5a26c56aade3af88923779a0343a1d6a5b00c0db.tar.xz | |
-zoom, -fs with x[11|mga|v] fix -- round two
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6017 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/x11_common.c')
| -rw-r--r-- | libvo/x11_common.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libvo/x11_common.c b/libvo/x11_common.c index d5cb3bfa7d..546dae4f35 100644 --- a/libvo/x11_common.c +++ b/libvo/x11_common.c @@ -358,9 +358,11 @@ int vo_init( void ) void vo_uninit( void ) { - printf("vo: uninit ...\n" ); if( !vo_depthonscreen ) return; + printf("vo: uninit ...\n" ); + XSetErrorHandler(NULL); XCloseDisplay( mDisplay ); + vo_depthonscreen = 0; } #include "../linux/keycodes.h" @@ -509,7 +511,6 @@ XSizeHints vo_hint; int vo_x11_uninit(Display *display, Window window) { - XSetErrorHandler(NULL); vo_showcursor( display,window ); #ifdef HAVE_NEW_GUI @@ -518,9 +519,11 @@ int vo_x11_uninit(Display *display, Window window) #endif { /* and -wid is set */ - if (!(WinID > 0)) - XDestroyWindow(display, window); - vo_depthonscreen = 0; + if (WinID < 0) + { + XUnmapWindow( display,window ); + XDestroyWindow(display, window); + } vo_fs=0; } return(1); @@ -724,11 +727,8 @@ void vo_x11_fullscreen( void ) switch ( vo_wm_type ) { -// case vo_wm_WMakerStyle: -// vo_x11_decoration( mDisplay,vo_window,(vo_fs) ? 1 : 0 ); - break; case vo_wm_Unknown: -// vo_x11_decoration( mDisplay,vo_window,(vo_fs) ? 1 : 0 ); + vo_x11_decoration( mDisplay,vo_window,(vo_fs) ? 1 : 0 ); XUnmapWindow( mDisplay,vo_window ); break; case vo_wm_IceWM: |