From 35d0dae6c17db11a542ad245de39f87237ccc77a Mon Sep 17 00:00:00 2001
From: Albert Cahalan <albert@users.sourceforge.net>
Date: Wed, 24 Nov 2004 04:19:06 +0000
Subject: [PATCH] allow any sane window size, such as 1234x666, and many insane
 sizes too

---
 docs/CHANGES.txt |  3 ++
 src/tuxpaint.c   | 80 ++++++++++++++++++++----------------------------
 2 files changed, 37 insertions(+), 46 deletions(-)

diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index efa768608..266af6e54 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -8,6 +8,9 @@ http://www.newbreedsoftware.com/tuxpaint/
 
 
 2004.November.23 (0.9.15)
+  * Can now use pretty much any window size, like 1234x666.
+    Albert Cahalan <albert@users.sf.net>
+
   * abstracted stamp scaling (prep for large sizes)
     Per-stamp sane scaling range enforced. (generally bigger)
     Albert Cahalan <albert@users.sf.net>
diff --git a/src/tuxpaint.c b/src/tuxpaint.c
index 47a1f3500..6b8fd6a05 100644
--- a/src/tuxpaint.c
+++ b/src/tuxpaint.c
@@ -4301,35 +4301,21 @@ static void setup(int argc, char * argv[])
 	{
 	  noshortcuts = 0;
 	}
-      else if (strcmp(argv[i], "--1600x1200") == 0)
+      else if ( argv[i][0]=='-' && argv[i][1]=='-' && argv[i][2]>='1' && argv[i][2]<='9' )
 	{
-	  WINDOW_WIDTH = 1600;
-	  WINDOW_HEIGHT = 1200;
-	}
-      else if (strcmp(argv[i], "--1400x1050") == 0)
-	{
-	  WINDOW_WIDTH = 1400;
-	  WINDOW_HEIGHT = 1050;
-	}
-      else if (strcmp(argv[i], "--1280x1024") == 0)
-	{
-	  WINDOW_WIDTH = 1280;
-	  WINDOW_HEIGHT = 1024;
-	}
-      else if (strcmp(argv[i], "--1024x768") == 0)
-	{
-	  WINDOW_WIDTH = 1024;
-	  WINDOW_HEIGHT = 768;
-	}
-      else if (strcmp(argv[i], "--800x600") == 0)
-	{
-	  WINDOW_WIDTH = 800;
-	  WINDOW_HEIGHT = 600;
-	}
-      else if (strcmp(argv[i], "--640x480") == 0)
-	{
-	  WINDOW_WIDTH = 640;
-	  WINDOW_HEIGHT = 480;
+	  char *endp1;
+	  char *endp2;
+	  int w,h;
+	  w = strtoul(argv[i]+2, &endp1, 10);
+	  h = strtoul(endp1+1,   &endp2, 10);
+	  // sanity check it
+	  if(argv[i]+2==endp1 || endp1+1==endp2 || *endp1!='x' || *endp2 || w<500 || h<480 || h>w*3 || w>h*4)
+	    {
+	      show_usage(stderr, (char *) getfilename(argv[0]));
+	      exit(1);
+	    }
+	  WINDOW_WIDTH  = w;
+	  WINDOW_HEIGHT = h;
 	}
       else if (strcmp(argv[i], "--nooutlines") == 0)
 	{
@@ -12515,32 +12501,34 @@ static void parse_options(FILE * fi)
 	    {
 	      noshortcuts = 0;
 	    }
-	  else if (strcmp(str, "windowsize=1600x1200") == 0)
+	  else if (!memcmp("windowsize=",str,11))
 	    {
-	      WINDOW_WIDTH = 1600;
-	      WINDOW_HEIGHT = 1200;
-	    }
-	  else if (strcmp(str, "windowsize=1400x1050") == 0)
-	    {
-	      WINDOW_WIDTH = 1400;
-	      WINDOW_HEIGHT = 1050;
-	    }
-	  else if (strcmp(str, "windowsize=1280x1024") == 0)
-	    {
-	      WINDOW_WIDTH = 1280;
-	      WINDOW_HEIGHT = 1024;
-	    }
-	  else if (strcmp(str, "windowsize=1024x768") == 0)
-	    {
-	      WINDOW_WIDTH = 1024;
-	      WINDOW_HEIGHT = 768;
+	      char *endp1;
+	      char *endp2;
+	      int w,h;
+	      w = strtoul(str+11,  &endp1, 10);
+	      h = strtoul(endp1+1, &endp2, 10);
+	      // sanity check it
+	      if(str+11==endp1 || endp1+1==endp2 || *endp1!='x' || *endp2 || w<500 || h<480 || h>w*3 || w>h*4)
+		{
+		  // Oddly, config files have no error checking.
+		  //show_usage(stderr, (char *) getfilename(argv[0]));
+		  //exit(1);
+		}
+	      else
+	        {
+		  WINDOW_WIDTH  = w;
+		  WINDOW_HEIGHT = h;
+		}
 	    }
+	  // to handle old config files
 	  else if (strcmp(str, "800x600=yes") == 0 ||
 		   strcmp(str, "windowsize=800x600") == 0)
 	    {
 	      WINDOW_WIDTH = 800;
 	      WINDOW_HEIGHT = 600;
 	    }
+	  // also for old config files
 	  else if (strcmp(str, "800x600=no") == 0 ||
 		   strcmp(str, "640x480=yes") == 0 ||
 		   strcmp(str, "windowsize=640x480") == 0)