ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sdl: Use the current monitor resolution for OpenGL fullscreen 

This prevents FCEUX from changing the screen resolution (antisocial behavior in X11) and fixes all aspect ratio issues.
This commit is contained in:
plombo 2011-02-08 05:02:13 +00:00
parent b838d8da53
commit f4b57edc48
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/drivers/sdl/sdl-opengl.cpp
View File

@ -222,6 +222,14 @@ InitOpenGL(int l,
InitBlitToHigh(4,0xFF,0xFF00,0xFF0000,efx&2,0,0);
#endif
}
if(screen->flags & SDL_FULLSCREEN)
{
xscale=(double)screen->w / (double)(r-l);
yscale=(double)screen->h / (double)(b-t);
if(xscale<yscale) yscale = xscale;
if(yscale<xscale) xscale = yscale;
}
{
int rw=(int)((r-l)*xscale);

16
src/drivers/sdl/sdl-video.cpp
View File

@ -70,6 +70,8 @@ static int s_eefx;
static int s_clipSides;
static int s_fullscreen;
static int noframe;
static int s_nativeWidth = -1;
static int s_nativeHeight = -1;
#define NWIDTH (256 - (s_clipSides ? 16 : 0))
#define NOFFSET (s_clipSides ? 8 : 0)
@ -206,6 +208,14 @@ InitVideo(FCEUGI *gi)
flags |= SDL_HWSURFACE;
}
// get the monitor's current resolution if we do not already have it
if(s_nativeWidth < 0) {
s_nativeWidth = vinf->current_w;
}
if(s_nativeHeight < 0) {
s_nativeHeight = vinf->current_h;
}
// check if we are rendering fullscreen
if(s_fullscreen) {
flags |= SDL_FULLSCREEN;
@ -314,7 +324,9 @@ InitVideo(FCEUGI *gi)
}
s_screen = SDL_SetVideoMode(xres, yres, desbpp, flags);
s_screen = SDL_SetVideoMode(s_useOpenGL ? s_nativeWidth : xres,
s_useOpenGL ? s_nativeHeight : yres,
desbpp, flags);
if(!s_screen) {
FCEUD_PrintError(SDL_GetError());
return -1;
@ -359,7 +371,7 @@ InitVideo(FCEUGI *gi)
}
#endif
#ifdef _GTK
#if defined(_GTK) && defined(SDL_VIDEO_DRIVER_X11)
int noGui;
g_config->getOption("SDL.NoGUI", &noGui);
if(noGui == 0)