valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

add scaler forcing option (idea from ykhwong)

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@2908
This commit is contained in:
Sebastian Strohhäcker 2007-06-30 19:53:41 +00:00
parent d566d3fca8
commit 602b0aea94
3 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/render.h
View file

@ -63,6 +63,7 @@ typedef struct {
scalerMode_t outMode;
scalerOperation_t op;
bool clearCache;
bool forced;
ScalerLineHandler_t lineHandler;
ScalerLineHandler_t linePalHandler;
ScalerComplexHandler_t complexHandler;

23
src/gui/render.cpp
View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* $Id: render.cpp,v 1.51 2007-02-03 13:00:16 harekiet Exp $ */
/* $Id: render.cpp,v 1.52 2007-06-30 19:53:41 c2woody Exp $ */
#include <sys/types.h>
#include <dirent.h>
@ -282,7 +282,7 @@ static void RENDER_Reset( void ) {
gfx_scalew = 1;
gfx_scaleh = 1;
}
if (dblh && dblw) {
if (dblh && dblw || (render.scale.forced && !dblh && !dblw)) {
/* Initialize always working defaults */
if (render.scale.size == 2)
simpleBlock = &ScaleNormal2x;
@ -555,11 +555,26 @@ void RENDER_Init(Section * sec) {
render.aspect=section->Get_bool("aspect");
render.frameskip.max=section->Get_int("frameskip");
render.frameskip.count=0;
const char * scaler;std::string cline;
const char * scaler;
std::string cline;
std::string scaler_str;
if (control->cmdline->FindString("-scaler",cline,false)) {
scaler=cline.c_str();
render.scale.forced=false;
} else if (control->cmdline->FindString("-forcescaler",cline,false)) {
scaler=cline.c_str();
render.scale.forced=true;
} else {
scaler=section->Get_string("scaler");
CommandLine cmd(0,section->Get_string("scaler"));
cmd.FindCommand(1,scaler_str);
scaler=scaler_str.c_str();
render.scale.forced=false;
if (cmd.GetCount()>1) {
std::string str;
if (cmd.FindCommand(2,str)) {
if (str=="forced") render.scale.forced=true;
}
}
}
if (!strcasecmp(scaler,"none")) { render.scale.op = scalerOpNormal;render.scale.size = 1; }
else if (!strcasecmp(scaler,"normal2x")) { render.scale.op = scalerOpNormal;render.scale.size = 2; }

6
src/gui/render_scalers.h
View file

@ -23,10 +23,10 @@
#include "video.h"
//MAXWIDTH: increased it for the large text modi
#define SCALER_MAXWIDTH 1280
#define SCALER_MAXHEIGHT 768
#define SCALER_MAXHEIGHT 1024
#define SCALER_COMPLEXWIDTH 512
#define SCALER_COMPLEXHEIGHT 400
#define SCALER_COMPLEXWIDTH 800
#define SCALER_COMPLEXHEIGHT 600
#define SCALER_BLOCKSIZE 16
typedef enum {