X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=backend.c;h=d362be508472652b7f0e9e2c9a83fcf9218de27e;hb=ccdd18ed4c9ca090ead3c1ac844b621fdaa51984;hp=a7be826cafffa157a165016acb3fe6ae14c733a0;hpb=a47dabb3f4384723d696aaf26d5ce87b35df533f;p=xboard.git

diff --git a/backend.c b/backend.c
index a7be826..d362be5 100644
--- a/backend.c
+++ b/backend.c
@@ -2127,7 +2127,7 @@ StringToVariant (char *e)
     } else
     for (i=0; i<sizeof(variantNames)/sizeof(char*); i++) {
       if (p = StrCaseStr(e, variantNames[i])) {
-	if(p && i >= VariantShogi && (p != e || isalpha(p[strlen(variantNames[i])]))) continue;
+	if(p && i >= VariantShogi && (p != e && !appData.icsActive || isalpha(p[strlen(variantNames[i])]))) continue;
 	v = (VariantClass) i;
 	found = TRUE;
 	break;
@@ -8551,7 +8551,7 @@ DeferredBookMove (void)
 
 static int savedWhitePlayer, savedBlackPlayer, pairingReceived;
 static ChessProgramState *stalledEngine;
-static char stashedInputMove[MSG_SIZ];
+static char stashedInputMove[MSG_SIZ], abortEngineThink;
 
 void
 HandleMachineMove (char *message, ChessProgramState *cps)
@@ -8634,24 +8634,27 @@ FakeBookMove: // [HGM] book: we jump here to simulate machine moves after book h
 	    return;
 	}
 
+      if(cps->usePing) {
+
         /* This method is only useful on engines that support ping */
+        if(abortEngineThink) {
+	    if (appData.debugMode) {
+		fprintf(debugFP, "Undoing move from aborted think of %s\n", cps->which);
+	    }
+            SendToProgram("undo\n", cps);
+	    return;
+	}
+
         if (cps->lastPing != cps->lastPong) {
-	  if (gameMode == BeginningOfGame) {
 	    /* Extra move from before last new; ignore */
 	    if (appData.debugMode) {
 		fprintf(debugFP, "Ignoring extra move from %s\n", cps->which);
 	    }
-	  } else {
-	    if (appData.debugMode) {
-		fprintf(debugFP, "Undoing extra move from %s, gameMode %d\n",
-			cps->which, gameMode);
-	    }
-
-            SendToProgram("undo\n", cps);
-	  }
 	  return;
 	}
 
+      } else {
+
 	switch (gameMode) {
 	  case BeginningOfGame:
 	    /* Extra move from before last reset; ignore */
@@ -8697,6 +8700,7 @@ FakeBookMove: // [HGM] book: we jump here to simulate machine moves after book h
 	    }
 	    return;
 	}
+      }
 
         if(cps->alphaRank) AlphaRank(machineMove, 4);
 
@@ -9115,6 +9119,11 @@ FakeBookMove: // [HGM] book: we jump here to simulate machine moves after book h
 	    }
 	    initPing = -1;
         }
+	if(cps->lastPing == cps->lastPong && abortEngineThink) {
+	    abortEngineThink = FALSE;
+	    DisplayMessage("", "");
+	    ThawUI();
+	}
 	return;
     }
     if(!strncmp(message, "highlight ", 10)) {
@@ -14974,6 +14983,16 @@ EditGameEvent ()
       case MachinePlaysBlack:
       case BeginningOfGame:
 	SendToProgram("force\n", &first);
+	if(gameMode == (forwardMostMove & 1 ? MachinePlaysBlack : MachinePlaysWhite)) { // engine is thinking
+	    if (first.usePing) { // [HGM] always send ping when we might interrupt machine thinking
+		char buf[MSG_SIZ];
+		abortEngineThink = TRUE;
+		snprintf(buf, MSG_SIZ, "ping %d\n", initPing = ++first.lastPing);
+		SendToProgram(buf, &first);
+		DisplayMessage("Aborting engine think", "");
+		FreezeUI();
+	    }
+	}
 	SetUserThinkingEnables();
 	break;
       case PlayFromGameFile:
@@ -18129,7 +18148,7 @@ ParseFEN (Board board, int *blackPlaysFirst, char *fen, Boolean autoSize)
                 while (emptycount--)
                         board[i][(j++)+gameInfo.holdingsWidth] = EmptySquare;
                 if (*p == '/') p++;
-		else if(autoSize) { // we stumbled unexpectedly into end of board
+		else if(autoSize && i != BOARD_HEIGHT-1) { // we stumbled unexpectedly into end of board
                     for(k=i; k<BOARD_HEIGHT; k++) { // too few ranks; shift towards bottom
 		        for(j=0; j<BOARD_WIDTH; j++) board[k-i][j] = board[k][j];
                     }
@@ -18193,7 +18212,7 @@ ParseFEN (Board board, int *blackPlaysFirst, char *fen, Boolean autoSize)
     }
     while (*p == '/' || *p == ' ') p++;
 
-    if(autoSize) appData.NrFiles = w, InitPosition(TRUE);
+    if(autoSize && w != 0) appData.NrFiles = w, InitPosition(TRUE);
 
     /* [HGM] by default clear Crazyhouse holdings, if present */
     if(gameInfo.holdingsWidth) {