1
0
mirror of https://github.com/mpv-player/mpv synced 2025-03-19 18:05:21 +00:00

VM fixes by Nilmoni Deb.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5020 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
atmos4 2002-03-10 08:16:07 +00:00
parent 73966ff69a
commit 9d43571cd8

View File

@ -672,16 +672,27 @@ void vo_vm_switch(uint32_t X, uint32_t Y, int* modeline_width, int* modeline_hei
void vo_vm_close(Display *dpy)
{
#ifdef HAVE_NEW_GUI
if ((vidmodes!=NULL)&&( vo_window == None ) )
if (vidmodes!=NULL && vo_window != None)
#else
if (vidmodes!=NULL)
#endif
{
int screen; screen=DefaultScreen( dpy );
XF86VidModeSwitchToMode(dpy,screen,vidmodes[0]);
XF86VidModeSwitchToMode(dpy,screen,vidmodes[0]);
free(vidmodes);
}
{
int i, modecount;
int screen; screen=DefaultScreen( dpy );
free(vidmodes); vidmodes=NULL;
XF86VidModeGetAllModeLines(mDisplay,mScreen,&modecount,&vidmodes);
for (i=0; i<modecount; i++)
if ((vidmodes[i]->hdisplay == vo_screenwidth) && (vidmodes[i]->vdisplay == vo_screenheight))
{
printf("\nReturning to original mode %dx%d\n", vo_screenwidth, vo_screenheight);
break;
}
XF86VidModeSwitchToMode(dpy,screen,vidmodes[i]);
XF86VidModeSwitchToMode(dpy,screen,vidmodes[i]);
free(vidmodes);
}
}
#endif