X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=backend.c;h=4522ca1b650b95607b82ac622f92e2f6ea6fdf20;hb=08aa97a16435e4569975d203c7e1f3050b207d8a;hp=52fb5156abf849c668cb4a2d771fa8d5e1958207;hpb=ad3790c613d301fb6f234e78cb63a5a743bde0d6;p=xboard.git

diff --git a/backend.c b/backend.c
index 52fb515..4522ca1 100644
--- a/backend.c
+++ b/backend.c
@@ -2511,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 = "";
@@ -2530,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);
 	}
 }
 
@@ -2594,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);
@@ -2618,6 +2627,7 @@ DrawSeekGraph ()
 	}
     }
     for(i=0; i<nrOfSeekAds; i++) PlotSeekAd(i);
+    DrawSeekClose();
     return TRUE;
 }
 
@@ -7102,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
@@ -7254,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) {
@@ -7289,6 +7304,7 @@ LeftClick (ClickType clickType, int xPix, int yPix)
 	}
 	ClearHighlights();
 	fromX = fromY = -1;
+        MarkTargetSquares(1);
 	DrawPosition(TRUE, boards[currentMove]);
 	return;
     }
@@ -7322,6 +7338,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;
@@ -9708,9 +9725,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;
     }
@@ -9719,6 +9733,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);
 }
@@ -10203,9 +10222,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);
@@ -13378,6 +13398,7 @@ PauseEvent ()
 		 WhiteOnMove(forwardMostMove))) {
 		StopClocks();
 	    }
+	  case AnalyzeMode:
 	    pausing = TRUE;
 	    ModeHighlight();
 	    break;