X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=backend.c;h=4b09ab80bf1e31ebc3e035370408e69e2473e336;hb=961180c518bc7939a4b35dcb9f651176a6141e48;hp=849259ef9c3b021098662227a1e6affe1ad8ab95;hpb=7bd64558c77750f8cb1082cb4dab1e2a8cf532d0;p=xboard.git

diff --git a/backend.c b/backend.c
index 849259e..4b09ab8 100644
--- a/backend.c
+++ b/backend.c
@@ -5415,7 +5415,8 @@ ParsePV (char *pv, Boolean storeComments, Boolean atEnd)
   Boolean valid;
   int nr = 0;
 
-  if (gameMode == AnalyzeMode && currentMove < forwardMostMove) {
+  lastParseAttempt = pv; if(!*pv) return;    // turns out we crash when we parse an empty PV
+  if ((gameMode == AnalyzeMode || gameMode == AnalyzeFile) && currentMove < forwardMostMove) {
     PushInner(currentMove, forwardMostMove); // [HGM] engine might not be thinking on forwardMost position!
     pushed = TRUE;
   }
@@ -5520,7 +5521,7 @@ PvToSAN (char *pv)
 	static char buf[10*MSG_SIZ];
 	int i, k=0, savedEnd=endPV, saveFMM = forwardMostMove;
 	*buf = NULLCHAR;
-	if(forwardMostMove < endPV) PushInner(forwardMostMove, endPV);
+	if(forwardMostMove < endPV) PushInner(forwardMostMove, endPV); // shelve PV of PV-walk
 	ParsePV(pv, FALSE, 2); // this appends PV to game, suppressing any display of it
 	for(i = forwardMostMove; i<endPV; i++){
 	    if(i&1) snprintf(buf+k, 10*MSG_SIZ-k, "%s ", parseList[i]);
@@ -5528,6 +5529,7 @@ PvToSAN (char *pv)
 	    k += strlen(buf+k);
 	}
 	snprintf(buf+k, 10*MSG_SIZ-k, "%s", lastParseAttempt); // if we ran into stuff that could not be parsed, print it verbatim
+	if(pushed) { PopInner(0); pushed = FALSE; } // restore game continuation shelved by ParsePV
 	if(forwardMostMove < savedEnd) { PopInner(0); forwardMostMove = saveFMM; } // PopInner would set fmm to endPV!
 	endPV = savedEnd;
 	return buf;
@@ -8038,6 +8040,8 @@ DeferredBookMove (void)
 }
 
 static int savedWhitePlayer, savedBlackPlayer, pairingReceived;
+static ChessProgramState *stalledEngine;
+static char stashedInputMove[MSG_SIZ];
 
 void
 HandleMachineMove (char *message, ChessProgramState *cps)
@@ -8103,6 +8107,18 @@ FakeBookMove: // [HGM] book: we jump here to simulate machine moves after book h
     if ((sscanf(message, "%s %s %s", buf1, buf2, machineMove) == 3 && strcmp(buf2, "...") == 0) ||
 	(sscanf(message, "%s %s", buf1, machineMove) == 2 && strcmp(buf1, "move") == 0))
     {
+        if(pausing && !cps->pause) { // for pausing engine that does not support 'pause', we stash its move for processing when we resume.
+	    if(appData.debugMode) fprintf(debugFP, "pause %s engine after move\n", cps->which);
+	    safeStrCpy(stashedInputMove, message, MSG_SIZ);
+	    stalledEngine = cps;
+	    if(appData.ponderNextMove) { // bring both engines out of ponder
+		SendToProgram("easy\n", &first);
+		if(gameMode == TwoMachinesPlay) SendToProgram("easy\n", &second);
+	    }
+	    StopClocks();
+	    return;
+	}
+
         /* This method is only useful on engines that support ping */
         if (cps->lastPing != cps->lastPong) {
 	  if (gameMode == BeginningOfGame) {
@@ -9426,8 +9442,8 @@ ApplyMove (int fromX, int fromY, int toX, int toY, int promoChar, Board board)
                ) {
 	/* white pawn promotion */
         board[toY][toX] = CharToPiece(ToUpper(promoChar));
-        if(gameInfo.variant==VariantBughouse ||
-           gameInfo.variant==VariantCrazyhouse) /* [HGM] use shadow piece */
+        if((gameInfo.variant==VariantBughouse || gameInfo.variant==VariantCrazyhouse) 
+           && PieceToChar(PROMOTED board[toY][toX]) == '~') /* [HGM] use shadow piece (if available) */
             board[toY][toX] = (ChessSquare) (PROMOTED board[toY][toX]);
 	board[fromY][fromX] = EmptySquare;
     } else if ((fromY >= BOARD_HEIGHT>>1)
@@ -9487,8 +9503,8 @@ ApplyMove (int fromX, int fromY, int toX, int toY, int promoChar, Board board)
                ) {
 	/* black pawn promotion */
 	board[toY][toX] = CharToPiece(ToLower(promoChar));
-        if(gameInfo.variant==VariantBughouse ||
-           gameInfo.variant==VariantCrazyhouse) /* [HGM] use shadow piece */
+        if((gameInfo.variant==VariantBughouse || gameInfo.variant==VariantCrazyhouse) 
+           && PieceToChar(PROMOTED board[toY][toX]) == '~') /* [HGM] use shadow piece (if available) */
             board[toY][toX] = (ChessSquare) (PROMOTED board[toY][toX]);
 	board[fromY][fromX] = EmptySquare;
     } else if ((fromY < BOARD_HEIGHT>>1)
@@ -10504,6 +10520,8 @@ GameEnds (ChessMove result, char *resultDetails, int whosays)
 
     fromX = fromY = -1; // [HGM] abort any move the user is entering.
 
+    if(pausing) PauseEvent(); // can happen when we abort a paused game (New Game or Quit)
+
     if (appData.icsActive && (whosays == GE_ENGINE || whosays >= GE_ENGINE1)) {
 	/* If we are playing on ICS, the server decides when the
 	   game is over, but the engine can offer to draw, claim
@@ -13362,6 +13380,20 @@ ExitEvent (int status)
 }
 
 void
+PauseEngine (ChessProgramState *cps)
+{
+    SendToProgram("pause\n", cps);
+    cps->pause = 2;
+}
+
+void
+UnPauseEngine (ChessProgramState *cps)
+{
+    SendToProgram("resume\n", cps);
+    cps->pause = 1;
+}
+
+void
 PauseEvent ()
 {
     if (appData.debugMode)
@@ -13369,8 +13401,24 @@ PauseEvent ()
     if (pausing) {
 	pausing = FALSE;
 	ModeHighlight();
+	if(stalledEngine) { // [HGM] pause: resume game by releasing withheld move
+	    StartClocks();
+	    if(gameMode == TwoMachinesPlay) { // we might have to make the opponent resume pondering
+		if(stalledEngine->other->pause) UnPauseEngine(stalledEngine->other);
+		else if(appData.ponderNextMove) SendToProgram("hard\n", stalledEngine->other);
+	    }
+	    if(appData.ponderNextMove) SendToProgram("hard\n", stalledEngine);
+	    HandleMachineMove(stashedInputMove, stalledEngine);
+	    stalledEngine = NULL;
+	    return;
+	}
 	if (gameMode == MachinePlaysWhite ||
-	    gameMode == MachinePlaysBlack) {
+	    gameMode == TwoMachinesPlay   ||
+	    gameMode == MachinePlaysBlack) { // the thinking engine must have used pause mode, or it would have been stalledEngine
+	    if(first.pause)  UnPauseEngine(&first);
+	    else if(appData.ponderNextMove) SendToProgram("hard\n", &first);
+	    if(second.pause) UnPauseEngine(&second);
+	    else if(gameMode == TwoMachinesPlay && appData.ponderNextMove) SendToProgram("hard\n", &second);
 	    StartClocks();
 	} else {
 	    DisplayBothClocks();
@@ -13413,12 +13461,29 @@ PauseEvent ()
 	  case TwoMachinesPlay:
 	    if (forwardMostMove == 0)
 	      return;		/* don't pause if no one has moved */
-	    if ((gameMode == MachinePlaysWhite &&
-		 !WhiteOnMove(forwardMostMove)) ||
-		(gameMode == MachinePlaysBlack &&
-		 WhiteOnMove(forwardMostMove))) {
+	    if(gameMode == TwoMachinesPlay) { // [HGM] pause: stop clocks if engine can be paused immediately
+		ChessProgramState *onMove = (WhiteOnMove(forwardMostMove) == (first.twoMachinesColor[0] == 'w') ? &first : &second);
+		if(onMove->pause) {           // thinking engine can be paused
+		    PauseEngine(onMove);      // do it
+		    if(onMove->other->pause)  // pondering opponent can always be paused immediately
+			PauseEngine(onMove->other);
+		    else
+			SendToProgram("easy\n", onMove->other);
+		    StopClocks();
+		}
+	    } else if(gameMode == (WhiteOnMove(forwardMostMove) ? MachinePlaysWhite : MachinePlaysBlack)) { // engine on move
+		if(first.pause) {
+		    PauseEngine(&first);
+		    StopClocks();
+		}
+	    } else { // human on move, pause pondering by either method
+		if(first.pause) 
+		    PauseEngine(&first);
+		else
+		    SendToProgram("easy\n", &first);
 		StopClocks();
 	    }
+	    // if no immediate pausing is possible, wait for engine to move, and stop clocks then
 	  case AnalyzeMode:
 	    pausing = TRUE;
 	    ModeHighlight();
@@ -15949,7 +16014,7 @@ ParseFeatures (char *args, ChessProgramState *cps)
     if (BoolFeature(&p, "exclude", &cps->excludeMoves, cps)) continue;
     if (BoolFeature(&p, "ics", &cps->sendICS, cps)) continue;
     if (BoolFeature(&p, "name", &cps->sendName, cps)) continue;
-    if (BoolFeature(&p, "pause", &val, cps)) continue; /* unused at present */
+    if (BoolFeature(&p, "pause", &cps->pause, cps)) continue; // [HGM] pause
     if (IntFeature(&p, "done", &val, cps)) {
       FeatureDone(cps, val);
       continue;