RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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
This commit is contained in:
alex 2002-01-31 11:15:54 +00:00
parent 3c3c1da6ac
commit ad69a062ae
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libvo/x11_common.c
View File

@ -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;