diff options
author | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-01-31 11:15:54 +0000 |
---|---|---|
committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-01-31 11:15:54 +0000 |
commit | ad69a062aefb0616a2eb80627b5fc38e62705acf (patch) | |
tree | 97c098d3aaa838071bc8b3081c96118fd7db7340 /libvo | |
parent | 3c3c1da6ac135dc43703d899ef9a2cf0433c87b9 (diff) | |
download | mpv-ad69a062aefb0616a2eb80627b5fc38e62705acf.tar.bz2 mpv-ad69a062aefb0616a2eb80627b5fc38e62705acf.tar.xz |
vo_x11_uninit: dont destroy window if GUI created it
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4438 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r-- | libvo/x11_common.c | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/libvo/x11_common.c b/libvo/x11_common.c index c17a8126a7..91ef1a9658 100644 --- a/libvo/x11_common.c +++ b/libvo/x11_common.c @@ -238,17 +238,6 @@ int vo_init( void ) return 1; } -int vo_x11_uninit(Display *display, Window window) -{ - XUnmapWindow(display, window); - - /* don't destroy window if -wid specified */ - if (!(WinID > 0)) - XDestroyWindow(display, window); - - XCloseDisplay(display); - return(1); -} #include "../linux/keycodes.h" #include "wskeys.h" @@ -348,7 +337,7 @@ void vo_x11_decoration( Display * vo_Display,Window w,int d ) XSetWindowAttributes attr; attr.override_redirect = True; XChangeWindowAttributes(vo_Display, w, CWOverrideRedirect, &attr); -// XMapWindow(vo_Display], w); +// XMapWindow(vo_Display, w); } if(vo_fsmode&8){ @@ -391,6 +380,24 @@ void vo_x11_classhint( Display * display,Window window,char *name ){ } #endif +int vo_x11_uninit(Display *display, Window window) +{ + XUnmapWindow(display, window); + +#ifdef HAVE_NEW_GUI + /* destroy window only if it's not controlled by GUI */ + if (vo_window == None) +#endif + { + /* and -wid is set */ + if (!(WinID > 0)) + XDestroyWindow(display, window); + } + + XCloseDisplay(display); + return(1); +} + int vo_x11_check_events(Display *mydisplay){ int ret=0; XEvent Event; |