X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=backend.c;h=9333320d0716fcef294df9a8cdb455a84619b769;hb=54fc63f1e8ea41966f47d2b60b616db0a9c5010d;hp=6442bea2c47f9cc261907b07d3ef99da6929c16b;hpb=025a668716d9220ada1d2e3b6b87c8517ac7899a;p=xboard.git

diff --git a/backend.c b/backend.c
index 6442bea..9333320 100644
--- a/backend.c
+++ b/backend.c
@@ -270,6 +270,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 +2511,14 @@ PlotSeekAd (int i)
 }
 
 void
+PlotSingleSeekAd (int i)
+{
+	DrawSeekOpen();
+	PlotSeekAd(i);
+	DrawSeekClose();
+}
+
+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 +2538,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);
 	}
 }
 
@@ -2593,6 +2602,7 @@ DrawSeekGraph ()
     h = BOARD_HEIGHT * (squareSize + lineGap) + lineGap;
     w = BOARD_WIDTH  * (squareSize + lineGap) + lineGap;
 
+    DrawSeekOpen();
     DrawSeekBackground(0, 0, w, h);
     DrawSeekAxis(hMargin, h-1-vMargin, w-5, h-1-vMargin);
     DrawSeekAxis(hMargin, h-1-vMargin, hMargin, 5);
@@ -2617,6 +2627,7 @@ DrawSeekGraph ()
 	}
     }
     for(i=0; i<nrOfSeekAds; i++) PlotSeekAd(i);
+    DrawSeekClose();
     return TRUE;
 }
 
@@ -6744,7 +6755,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
@@ -7101,6 +7112,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
@@ -7253,17 +7267,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) {
@@ -7288,6 +7304,7 @@ LeftClick (ClickType clickType, int xPix, int yPix)
 	}
 	ClearHighlights();
 	fromX = fromY = -1;
+        MarkTargetSquares(1);
 	DrawPosition(TRUE, boards[currentMove]);
 	return;
     }
@@ -7299,6 +7316,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];
@@ -7321,6 +7339,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;
@@ -9707,9 +9726,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;
     }
@@ -9718,6 +9734,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);
 }
@@ -10202,9 +10223,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);
@@ -11007,6 +11029,11 @@ AutoPlayGameLoop ()
     }
 }
 
+void
+AnalyzeNextGame()
+{
+    ReloadGame(1); // next game
+}
 
 int
 AutoPlayOneMove ()
@@ -11028,7 +11055,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();
 
@@ -11872,6 +11906,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;
 	}
@@ -12265,7 +12302,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) {
@@ -13359,6 +13399,7 @@ PauseEvent ()
 		 WhiteOnMove(forwardMostMove))) {
 		StopClocks();
 	    }
+	  case AnalyzeMode:
 	    pausing = TRUE;
 	    ModeHighlight();
 	    break;
@@ -15053,6 +15094,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;