diff options
| author | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-05-08 16:41:44 +0000 |
|---|---|---|
| committer | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-05-08 16:41:44 +0000 |
| commit | 1bff6e8bc37081ef8a76c944726219c2cb53413e (patch) | |
| tree | fdab40e6729842f22940f100536e94f251808c4c /libvo/x11_common.c | |
| parent | 8a99b7a507c9cd01127ec5c18970a1e27327517f (diff) | |
| download | mpv-1bff6e8bc37081ef8a76c944726219c2cb53413e.tar.bz2 mpv-1bff6e8bc37081ef8a76c944726219c2cb53413e.tar.xz | |
some bugfix, x[11|mga|v] ( fullscreen with more files )
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6014 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/x11_common.c')
| -rw-r--r-- | libvo/x11_common.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/libvo/x11_common.c b/libvo/x11_common.c index c6eb590331..d5cb3bfa7d 100644 --- a/libvo/x11_common.c +++ b/libvo/x11_common.c @@ -37,6 +37,7 @@ #ifdef HAVE_NEW_GUI #include "../Gui/interface.h" +#include "../mplayer.h" #endif /* @@ -355,6 +356,12 @@ int vo_init( void ) return 1; } +void vo_uninit( void ) +{ + printf("vo: uninit ...\n" ); + if( !vo_depthonscreen ) return; + XCloseDisplay( mDisplay ); +} #include "../linux/keycodes.h" #include "wskeys.h" @@ -507,14 +514,14 @@ int vo_x11_uninit(Display *display, Window window) #ifdef HAVE_NEW_GUI /* destroy window only if it's not controlled by GUI */ - if (vo_window == None) + if ( !use_gui ) #endif { /* and -wid is set */ if (!(WinID > 0)) XDestroyWindow(display, window); - XCloseDisplay(display); vo_depthonscreen = 0; + vo_fs=0; } return(1); } @@ -721,7 +728,7 @@ void vo_x11_fullscreen( void ) // 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: |