From 602b0aea944a0a0ce94ab9090cb8294963e24d09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Strohh=C3=A4cker?=
 <c2woody@users.sourceforge.net>
Date: Sat, 30 Jun 2007 19:53:41 +0000
Subject: [PATCH] add scaler forcing option (idea from ykhwong)

Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@2908
---
 include/render.h         |  1 +
 src/gui/render.cpp       | 23 +++++++++++++++++++----
 src/gui/render_scalers.h |  6 +++---
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/include/render.h b/include/render.h
index 93d20f29..cfd36817 100644
--- a/include/render.h
+++ b/include/render.h
@@ -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;
diff --git a/src/gui/render.cpp b/src/gui/render.cpp
index d82f39f7..eefcb800 100644
--- a/src/gui/render.cpp
+++ b/src/gui/render.cpp
@@ -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; }
diff --git a/src/gui/render_scalers.h b/src/gui/render_scalers.h
index 3f2b34db..2b9d59b5 100644
--- a/src/gui/render_scalers.h
+++ b/src/gui/render_scalers.h
@@ -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 {