X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=backend.c;h=1113781b5f1d0e9ecebe43228a228ed3d07d2d20;hb=aa694af0138b799c4de3e031d15c2a9be3112b6c;hp=a463fa7fbaa82654f700905d10e1cc7449e52e0e;hpb=f38964b851874781439f481fd00b3eef6f592603;p=xboard.git

diff --git a/backend.c b/backend.c
index a463fa7..1113781 100644
--- a/backend.c
+++ b/backend.c
@@ -129,6 +129,7 @@ extern int gettimeofday(struct timeval *, struct timezone *);
 # include "zippy.h"
 #endif
 #include "backendz.h"
+#include "evalgraph.h"
 #include "gettext.h"
 
 #ifdef ENABLE_NLS
@@ -270,6 +271,7 @@ char lastMsg[MSG_SIZ];
 ChessSquare pieceSweep = EmptySquare;
 ChessSquare promoSweep = EmptySquare, defaultPromoChoice;
 int promoDefaultAltered;
+int keepInfo = 0; /* [HGM] to protect PGN tags in auto-step game analysis */
 
 /* States for ics_getting_history */
 #define H_FALSE 0
@@ -2510,6 +2512,12 @@ PlotSeekAd (int i)
 }
 
 void
+PlotSingleSeekAd (int i)
+{
+	PlotSeekAd(i);
+}
+
+void
 AddAd (char *handle, char *rating, int base, int inc,  char rated, char *type, int nr, Boolean plot)
 {
 	char buf[MSG_SIZ], *ext = "";
@@ -2529,7 +2537,7 @@ AddAd (char *handle, char *rating, int base, int inc,  char rated, char *type, i
 	    seekNrList[nrOfSeekAds] = nr;
 	    zList[nrOfSeekAds] = 0;
 	    seekAdList[nrOfSeekAds++] = StrSave(buf);
-	    if(plot) PlotSeekAd(nrOfSeekAds-1);
+	    if(plot) PlotSingleSeekAd(nrOfSeekAds-1);
 	}
 }
 
@@ -2599,7 +2607,7 @@ DrawSeekGraph ()
     for(i=0; i<4000; i+= 100) if(i>=minRating && i<maxRating) {
 	int yy =((double)i - minRating)/(maxRating - minRating)*(h-vMargin-squareSize/8-1) + vMargin;
 	yy = h-1-yy;
-	DrawSeekAxis(hMargin+5*(i%500==0), yy, hMargin-5, yy); // rating ticks
+	DrawSeekAxis(hMargin-5, yy, hMargin+5*(i%500==0), yy); // rating ticks
 	if(i%500 == 0) {
 	    char buf[MSG_SIZ];
 	    snprintf(buf, MSG_SIZ, "%d", i);
@@ -4898,6 +4906,13 @@ GetMoveListEvent ()
 }
 
 void
+SendToBoth (char *msg)
+{   // to make it easy to keep two engines in step in dual analysis
+    SendToProgram(msg, &first);
+    if(second.analyzing) SendToProgram(msg, &second);
+}
+
+void
 AnalysisPeriodicEvent (int force)
 {
     if (((programStats.ok_to_send == 0 || programStats.line_is_book)
@@ -4905,8 +4920,7 @@ AnalysisPeriodicEvent (int force)
       return;
 
     /* Send . command to Crafty to collect stats */
-    SendToProgram(".\n", &first);
-    if(second.analyzing) SendToProgram(".\n", &second);
+    SendToBoth(".\n");
 
     /* Don't send another until we get a response (this makes
        us stop sending to old Crafty's which don't understand
@@ -6222,7 +6236,7 @@ ExcludeOneMove (int fromY, int fromX, int toY, int toX, char promoChar, char sta
     // inform engine
     snprintf(buf, MSG_SIZ, "%sclude ", state == '+' ? "in" : "ex");
     CoordsToComputerAlgebraic(fromY, fromX, toY, toX, promoChar, buf+8);
-    SendToProgram(buf, &first);
+    SendToBoth(buf);
     return (state == '+');
 }
 
@@ -6235,16 +6249,16 @@ ExcludeClick (int index)
 	if(index < 13) { // none: include all
 	    WriteMap(0); // clear map
 	    for(i=0; i<exCnt; i++) exclusionHeader[excluTab[i].mark] = '+'; // and moves
-	    SendToProgram("include all\n", &first); // and inform engine
+	    SendToBoth("include all\n"); // and inform engine
 	} else if(index > 18) { // tail
 	    if(exclusionHeader[19] == '-') { // tail was excluded
-		SendToProgram("include all\n", &first);
+		SendToBoth("include all\n");
 		WriteMap(0); // clear map completely
 		// now re-exclude selected moves
 		for(i=0; i<exCnt; i++) if(exclusionHeader[e[i].mark] == '-')
 		    ExcludeOneMove(e[i].fr, e[i].ff, e[i].tr, e[i].tf, e[i].pc, '-');
 	    } else { // tail was included or in mixed state
-		SendToProgram("exclude all\n", &first);
+		SendToBoth("exclude all\n");
 		WriteMap(0xFF); // fill map completely
 		// now re-include selected moves
 		j = 0; // count them
@@ -6738,7 +6752,7 @@ UserMoveEvent(int fromX, int fromY, int toX, int toY, int promoChar)
 	}
     }
 
-    if(doubleClick) { // [HGM] exclude: move entered with double-click on from square is for exclusion, not playing
+    if(doubleClick && gameMode == AnalyzeMode) { // [HGM] exclude: move entered with double-click on from square is for exclusion, not playing
         if(ExcludeOneMove(fromY, fromX, toY, toX, promoChar, '*')) // toggle
 	     ClearPremoveHighlights(); // was included
 	else ClearHighlights(), SetPremoveHighlights(ff, rf, ft, rt); // exclusion indicated  by premove highlights
@@ -6855,7 +6869,6 @@ FinishMove (ChessMove moveType, int fromX, int fromY, int toX, int toY, int prom
   }
 
   /* Relay move to ICS or chess engine */
-  if(second.analyzing) ToggleSecond(); // for now, we just stop second analyzing engine
   if (appData.icsActive) {
     if (gameMode == IcsPlayingWhite || gameMode == IcsPlayingBlack ||
 	gameMode == IcsExamining) {
@@ -6874,14 +6887,21 @@ FinishMove (ChessMove moveType, int fromX, int fromY, int toX, int toY, int prom
 			   gameMode == MachinePlaysBlack)) {
       SendTimeRemaining(&first, gameMode != MachinePlaysBlack);
     }
-    if (gameMode != EditGame && gameMode != PlayFromGameFile) {
+    if (gameMode != EditGame && gameMode != PlayFromGameFile && gameMode != AnalyzeMode) {
 	 // [HGM] book: if program might be playing, let it use book
 	bookHit = SendMoveToBookUser(forwardMostMove-1, &first, FALSE);
 	first.maybeThinking = TRUE;
     } else if(fromY == DROP_RANK && fromX == EmptySquare) {
 	if(!first.useSetboard) SendToProgram("undo\n", &first); // kludge to change stm in engines that do not support setboard
 	SendBoard(&first, currentMove+1);
-    } else SendMoveToProgram(forwardMostMove-1, &first);
+	if(second.analyzing) {
+	    if(!second.useSetboard) SendToProgram("undo\n", &second);
+	    SendBoard(&second, currentMove+1);
+	}
+    } else {
+	SendMoveToProgram(forwardMostMove-1, &first);
+	if(second.analyzing) SendMoveToProgram(forwardMostMove-1, &second);
+    }
     if (currentMove == cmailOldMove + 1) {
       cmailMoveType[lastLoadGameNumber - 1] = CMAIL_MOVE;
     }
@@ -7089,6 +7109,9 @@ LeftClick (ClickType clickType, int xPix, int yPix)
 	return;
       }
       doubleClick = FALSE;
+      if(gameMode == AnalyzeMode && pausing && first.excludeMoves) { // use pause state to exclude moves
+	doubleClick = TRUE; gatingPiece = boards[currentMove][y][x];
+      }
       fromX = x; fromY = y; toX = toY = -1;
       if(!appData.oneClick || !OnlyMove(&x, &y, FALSE) ||
 	 // even if only move, we treat as normal when this would trigger a promotion popup, to allow sweep selection
@@ -7241,17 +7264,19 @@ LeftClick (ClickType clickType, int xPix, int yPix)
 	    ClearHighlights();
 	}
     } else {
+#if 0
+// [HGM] this must be done after the move is made, as with arrow it could lead to a board redraw with piece still on from square
 	/* Finish drag move */
 	if (appData.highlightLastMove) {
 	    SetHighlights(fromX, fromY, toX, toY);
 	} else {
 	    ClearHighlights();
 	}
+#endif
 	DragPieceEnd(xPix, yPix); dragging = 0;
 	/* Don't animate move and drag both */
 	appData.animate = FALSE;
     }
-    MarkTargetSquares(1);
 
     // moves into holding are invalid for now (except in EditPosition, adapting to-square)
     if(x >= 0 && x < BOARD_LEFT || x >= BOARD_RGHT) {
@@ -7276,6 +7301,7 @@ LeftClick (ClickType clickType, int xPix, int yPix)
 	}
 	ClearHighlights();
 	fromX = fromY = -1;
+        MarkTargetSquares(1);
 	DrawPosition(TRUE, boards[currentMove]);
 	return;
     }
@@ -7287,6 +7313,7 @@ LeftClick (ClickType clickType, int xPix, int yPix)
 
     if (HasPromotionChoice(fromX, fromY, toX, toY, &promoChoice, appData.sweepSelect)) {
 	SetHighlights(fromX, fromY, toX, toY);
+        MarkTargetSquares(1);
 	if(gameInfo.variant == VariantSuper || gameInfo.variant == VariantGreat || gameInfo.variant == VariantGrand) {
 	    // [HGM] super: promotion to captured piece selected from holdings
 	    ChessSquare p = boards[currentMove][fromY][fromX], q = boards[currentMove][toY][toX];
@@ -7309,6 +7336,7 @@ LeftClick (ClickType clickType, int xPix, int yPix)
 	if(saveAnimate && !appData.animate && currentMove != oldMove && // drag-move was performed
 	   Explode(boards[currentMove-1], fromX, fromY, toX, toY))
 	    DrawPosition(TRUE, boards[currentMove]);
+        MarkTargetSquares(1);
 	fromX = fromY = -1;
     }
     appData.animate = saveAnimate;
@@ -9695,9 +9723,6 @@ ShowMove (int fromX, int fromY, int toX, int toY)
 		AnimateMove(boards[forwardMostMove - 1],
 			    fromX, fromY, toX, toY);
 	    }
-	    if (appData.highlightLastMove) {
-		SetHighlights(fromX, fromY, toX, toY);
-	    }
 	}
 	currentMove = forwardMostMove;
     }
@@ -9706,6 +9731,11 @@ ShowMove (int fromX, int fromY, int toX, int toY)
 
     DisplayMove(currentMove - 1);
     DrawPosition(FALSE, boards[currentMove]);
+    if (!pausing || gameMode == PlayFromGameFile || gameMode == AnalyzeFile) {
+	    if (appData.highlightLastMove) { // [HGM] moved to after DrawPosition, as with arrow it could redraw old board
+		SetHighlights(fromX, fromY, toX, toY);
+	    }
+    }
     DisplayBothClocks();
     HistorySet(parseList,backwardMostMove,forwardMostMove,currentMove-1);
 }
@@ -10190,9 +10220,10 @@ GetEngineLine (char *s, int n)
     char buf[MSG_SIZ];
     extern char *icsNames;
     if(!s || !*s) return 0;
-    NamesToList(n == 10 ? icsNames : firstChessProgramNames, command, mnemonic, "all");
+    NamesToList(n >= 10 ? icsNames : firstChessProgramNames, command, mnemonic, "all");
     for(i=1; mnemonic[i]; i++) if(!strcmp(s, mnemonic[i])) break;
     if(!mnemonic[i]) return 0;
+    if(n == 11) return 1; // just testing if there was a match
     snprintf(buf, MSG_SIZ, "-%s %s", n == 10 ? "icshost" : "fcp", command[i]);
     if(n == 1) SwapEngines(n);
     ParseArgsFromString(buf);
@@ -10995,6 +11026,11 @@ AutoPlayGameLoop ()
     }
 }
 
+void
+AnalyzeNextGame()
+{
+    ReloadGame(1); // next game
+}
 
 int
 AutoPlayOneMove ()
@@ -11016,7 +11052,14 @@ AutoPlayOneMove ()
     }
 
     if (currentMove >= forwardMostMove) {
-      if(gameMode == AnalyzeFile) { ExitAnalyzeMode(); SendToProgram("force\n", &first); }
+      if(gameMode == AnalyzeFile) {
+	  if(appData.loadGameIndex == -1) {
+	    GameEnds(EndOfFile, NULL, GE_FILE);
+          ScheduleDelayedEvent(AnalyzeNextGame, 10);
+	  } else {
+          ExitAnalyzeMode(); SendToProgram("force\n", &first);
+        }
+      }
 //      gameMode = EndOfGame;
 //      ModeHighlight();
 
@@ -11860,6 +11903,9 @@ LoadGame (FILE *f, int gameNumber, char *title, int useList)
 	    gn = 1;
 	}
 	else {
+	    if(gameMode == AnalyzeFile && appData.loadGameIndex == -1)
+	      appData.loadGameIndex = 0; // [HGM] suppress error message if we reach file end after auto-stepping analysis
+	    else
 	    DisplayError(_("Game number out of range"), 0);
 	    return FALSE;
 	}
@@ -12253,7 +12299,10 @@ LoadGame (FILE *f, int gameNumber, char *title, int useList)
 
     if (oldGameMode == AnalyzeFile ||
 	oldGameMode == AnalyzeMode) {
+      appData.loadGameIndex = -1; // [HGM] order auto-stepping through games
+      keepInfo = 1;
       AnalyzeFileEvent();
+      keepInfo = 0;
     }
 
     if (!matchMode && pos > 0) {
@@ -13347,6 +13396,7 @@ PauseEvent ()
 		 WhiteOnMove(forwardMostMove))) {
 		StopClocks();
 	    }
+	  case AnalyzeMode:
 	    pausing = TRUE;
 	    ModeHighlight();
 	    break;
@@ -13396,18 +13446,59 @@ ToggleSecond ()
   }
 }
 
+/* Toggle ShowThinking */
 void
+ToggleShowThinking()
+{
+  appData.showThinking = !appData.showThinking;
+  ShowThinkingEvent();
+}
+
+int
 AnalyzeModeEvent ()
 {
-    if (gameMode == AnalyzeMode) { ToggleSecond(); return; }
+    char buf[MSG_SIZ];
+
+    if (!first.analysisSupport) {
+      snprintf(buf, sizeof(buf), _("%s does not support analysis"), first.tidy);
+      DisplayError(buf, 0);
+      return 0;
+    }
+    /* [DM] icsEngineAnalyze [HGM] This is horrible code; reverse the gameMode and isEngineAnalyze tests! */
+    if (appData.icsActive) {
+        if (gameMode != IcsObserving) {
+	  snprintf(buf, MSG_SIZ, _("You are not observing a game"));
+            DisplayError(buf, 0);
+            /* secure check */
+            if (appData.icsEngineAnalyze) {
+                if (appData.debugMode)
+                    fprintf(debugFP, _("Found unexpected active ICS engine analyze \n"));
+                ExitAnalyzeMode();
+                ModeHighlight();
+            }
+            return 0;
+        }
+        /* if enable, user wants to disable icsEngineAnalyze */
+        if (appData.icsEngineAnalyze) {
+                ExitAnalyzeMode();
+                ModeHighlight();
+                return 0;
+        }
+        appData.icsEngineAnalyze = TRUE;
+        if (appData.debugMode)
+            fprintf(debugFP, _("ICS engine analyze starting... \n"));
+    }
+
+    if (gameMode == AnalyzeMode) { ToggleSecond(); return 0; }
     if (appData.noChessProgram || gameMode == AnalyzeMode)
-      return;
+      return 0;
 
     if (gameMode != AnalyzeFile) {
         if (!appData.icsEngineAnalyze) {
                EditGameEvent();
-               if (gameMode != EditGame) return;
+               if (gameMode != EditGame) return 0;
         }
+	if (!appData.showThinking) ToggleShowThinking();
 	ResurrectChessProgram();
 	SendToProgram("analyze\n", &first);
 	first.analyzing = TRUE;
@@ -13423,6 +13514,7 @@ AnalyzeModeEvent ()
     StartAnalysisClock();
     GetTimeMark(&lastNodeCountTime);
     lastNodeCount = 0;
+    return 1;
 }
 
 void
@@ -13431,9 +13523,17 @@ AnalyzeFileEvent ()
     if (appData.noChessProgram || gameMode == AnalyzeFile)
       return;
 
+    if (!first.analysisSupport) {
+      char buf[MSG_SIZ];
+      snprintf(buf, sizeof(buf), _("%s does not support analysis"), first.tidy);
+      DisplayError(buf, 0);
+      return;
+    }
+
     if (gameMode != AnalyzeMode) {
 	EditGameEvent();
 	if (gameMode != EditGame) return;
+	if (!appData.showThinking) ToggleShowThinking();
 	ResurrectChessProgram();
 	SendToProgram("analyze\n", &first);
 	first.analyzing = TRUE;
@@ -13450,6 +13550,7 @@ AnalyzeFileEvent ()
     GetTimeMark(&lastNodeCountTime);
     lastNodeCount = 0;
     if(appData.timeDelay > 0) StartLoadGameTimer((long)(1000.0f * appData.timeDelay));
+    AnalysisPeriodicEvent(1);
 }
 
 void
@@ -13997,12 +14098,8 @@ ExitAnalyzeMode ()
         DisplayMessage("",_("Close ICS engine analyze..."));
     }
     if (first.analysisSupport && first.analyzing) {
-      SendToProgram("exit\n", &first);
-      first.analyzing = FALSE;
-    }
-    if (second.analyzing) {
-      SendToProgram("exit\n", &second);
-      second.analyzing = FALSE;
+      SendToBoth("exit\n");
+      first.analyzing = second.analyzing = FALSE;
     }
     thinkOutput[0] = NULLCHAR;
 }
@@ -14586,8 +14683,8 @@ ForwardInner (int target)
     if (gameMode == EditGame || gameMode == AnalyzeMode ||
 	gameMode == Training || gameMode == PlayFromGameFile ||
 	gameMode == AnalyzeFile) {
-      if(target != currentMove && second.analyzing) ToggleSecond(); // for now, we just stop second analyzing engine
 	while (currentMove < target) {
+	    if(second.analyzing) SendMoveToProgram(currentMove, &second);
 	    SendMoveToProgram(currentMove++, &first);
 	}
     } else {
@@ -14691,7 +14788,6 @@ BackwardInner (int target)
     }
     if (gameMode == EditGame || gameMode==AnalyzeMode ||
 	gameMode == PlayFromGameFile || gameMode == AnalyzeFile) {
-      if(target != currentMove && second.analyzing) ToggleSecond(); // for now, we just stop second analyzing engine
 	while (currentMove > target) {
 	    if(moveList[currentMove-1][1] == '@' && moveList[currentMove-1][0] == '@') {
 		// null move cannot be undone. Reload program with move history before it.
@@ -14700,10 +14796,14 @@ BackwardInner (int target)
 		    if(moveList[i-1][1] == '@' && moveList[i-1][0] == '@') break;
 		}
 		SendBoard(&first, i); 
-		for(currentMove=i; currentMove<target; currentMove++) SendMoveToProgram(currentMove, &first);
+	      if(second.analyzing) SendBoard(&second, i);
+		for(currentMove=i; currentMove<target; currentMove++) {
+		    SendMoveToProgram(currentMove, &first);
+		    if(second.analyzing) SendMoveToProgram(currentMove, &second);
+		}
 		break;
 	    }
-	    SendToProgram("undo\n", &first);
+	    SendToBoth("undo\n");
 	    currentMove--;
 	}
     } else {
@@ -15042,6 +15142,8 @@ SetGameInfo ()
     ChessMove r = GameUnfinished;
     char *p = NULL;
 
+    if(keepInfo) return;
+
     if(gameMode == EditGame) { // [HGM] vari: do not erase result on EditGame
 	r = gameInfo.result;
 	p = gameInfo.resultDetails;