X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.c;h=0e3fbe25cc1a9357842dcfced2258894e5c10694;hb=e260cc7f9b3b558ec91d94e4ce69e81f90c2e32f;hp=7678dae4160e2ecda21b7d5c26dbdabdabd7370a;hpb=5808ac6ec32f1355eead1c78bf71927b1c91d738;p=xboard.git

diff --git a/winboard/winboard.c b/winboard/winboard.c
index 7678dae..0e3fbe2 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -1462,6 +1462,15 @@ ExitArgError(char *msg, char *badArg)
   exit(2);
 }
 
+int
+ValidateInt(char *s)
+{
+  char *p = s;
+  if(*p == '-' || *p == '+') p++;
+  while(*p) if(!isdigit(*p++)) ExitArgError("Bad integer value", s);
+  return atoi(s);
+}
+
 /* Command line font name parser.  NULL name means do nothing.
    Syntax like "Courier New:10.0 bi" or "Arial:10" or "Arial:10b"
    For backward compatibility, syntax without the colon is also
@@ -1773,19 +1782,19 @@ ParseArgs(GetFunc get, void *cl)
 
     switch (ad->argType) {
     case ArgInt:
-      *(int *) ad->argLoc = atoi(argValue);
+      *(int *) ad->argLoc = ValidateInt(argValue);
       break;
 
     case ArgX:
-      *(int *) ad->argLoc = atoi(argValue) + boardX; // [HGM] placement: translate stored relative to absolute 
+      *(int *) ad->argLoc = ValidateInt(argValue) + boardX; // [HGM] placement: translate stored relative to absolute 
       break;
 
     case ArgY:
-      *(int *) ad->argLoc = atoi(argValue) + boardY; // (this is really kludgey, it should be done where used...)
+      *(int *) ad->argLoc = ValidateInt(argValue) + boardY; // (this is really kludgey, it should be done where used...)
       break;
 
     case ArgZ:
-      *(int *) ad->argLoc = atoi(argValue);
+      *(int *) ad->argLoc = ValidateInt(argValue);
       EnsureOnScreen(&boardX, &boardY, minX, minY); 
       break;
 
@@ -3286,6 +3295,8 @@ InitDrawingSizes(BoardSize boardSize, int flags)
     blackRect.right = blackRect.left + boardWidth/2 - 1;
     blackRect.top = whiteRect.top;
     blackRect.bottom = whiteRect.bottom;
+
+    logoHeight = 0; // [HGM] logo: suppress logo after change to tiny layout!
   }
 
   messageRect.left = OUTER_MARGIN + MESSAGE_LINE_LEFTMARGIN;
@@ -7186,13 +7197,8 @@ TypeInMoveDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 	}
 	// [HGM] movenum: allow move number to be typed in any mode
 	if(sscanf(move, "%d", &n) == 1 && n != 0 ) {
-	  currentMove = 2*n-1;
-	  if(currentMove > forwardMostMove)  currentMove = forwardMostMove;
-	  if(currentMove < backwardMostMove) currentMove = backwardMostMove;
+	  ToNrEvent(2*n-1);
 	  EndDialog(hDlg, TRUE);
-	  DrawPosition(TRUE, boards[currentMove]);
-	  if(currentMove > backwardMostMove) DisplayMove(currentMove - 1);
-	  else DisplayMessage("", "");
 	  return TRUE;
 	}
       }