X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=backend.c;h=d14530f7734ad0a6ef9d6d8f3514ee18cefe9e7f;hb=4f14696c5aa9a10817022fcb4cbaa857e40a176b;hp=a2c554f3956e58bea7943a35cac63839dd1e1290;hpb=272e35c7f6874eae7f6f5487ad427a57212b9eca;p=xboard.git

diff --git a/backend.c b/backend.c
index a2c554f..d14530f 100644
--- a/backend.c
+++ b/backend.c
@@ -5293,20 +5293,12 @@ fprintf(debugFP,"parsePV: %d %c%c%c%c yy='%s'\nPV = '%s'\n", valid, fromX+AAA, f
     endPV++;
     CopyBoard(boards[endPV], boards[endPV-1]);
     ApplyMove(fromX, fromY, toX, toY, promoChar, boards[endPV]);
-    moveList[endPV-1][0] = fromX + AAA;
-    moveList[endPV-1][1] = fromY + ONE;
-    moveList[endPV-1][2] = toX + AAA;
-    moveList[endPV-1][3] = toY + ONE;
-    moveList[endPV-1][4] = promoChar;
-    moveList[endPV-1][5] = NULLCHAR;
+    CoordsToComputerAlgebraic(fromY, fromX, toY, toX, promoChar, moveList[endPV - 1]);
     strncat(moveList[endPV-1], "\n", MOVE_LEN);
-    if(storeComments)
-	CoordsToAlgebraic(boards[endPV - 1],
+    CoordsToAlgebraic(boards[endPV - 1],
 			     PosFlags(endPV - 1),
 			     fromY, fromX, toY, toX, promoChar,
 			     parseList[endPV - 1]);
-    else
-	parseList[endPV-1][0] = NULLCHAR;
   } while(valid);
   currentMove = (atEnd || endPV == forwardMostMove) ? endPV : forwardMostMove + 1;
   if(currentMove == forwardMostMove) ClearPremoveHighlights(); else
@@ -5315,23 +5307,42 @@ fprintf(debugFP,"parsePV: %d %c%c%c%c yy='%s'\nPV = '%s'\n", valid, fromX+AAA, f
   DrawPosition(TRUE, boards[currentMove]);
 }
 
+int
+MultiPV(ChessProgramState *cps)
+{	// check if engine supports MultiPV, and if so, return the number of the option that sets it
+	int i;
+	for(i=0; i<cps->nrOptions; i++)
+	    if(!strcmp(cps->option[i].name, "MultiPV") && cps->option[i].type == Spin)
+		return i;
+	return -1;
+}
+
 Boolean
 LoadMultiPV(int x, int y, char *buf, int index, int *start, int *end)
 {
-	int startPV;
-	char *p;
+	int startPV, multi, lineStart, origIndex = index;
+	char *p, buf2[MSG_SIZ];
 
 	if(index < 0 || index >= strlen(buf)) return FALSE; // sanity
 	lastX = x; lastY = y;
 	while(index > 0 && buf[index-1] != '\n') index--; // beginning of line
-	startPV = index;
+	lineStart = startPV = index;
 	while(buf[index] != '\n') if(buf[index++] == '\t') startPV = index;
 	if(index == startPV && (p = StrCaseStr(buf+index, "PV="))) startPV = p - buf + 3;
 	index = startPV;
 	do{ while(buf[index] && buf[index] != '\n') index++;
 	} while(buf[index] == '\n' && buf[index+1] == '\\' && buf[index+2] == ' ' && index++); // join kibitzed PV continuation line
 	buf[index] = 0;
-	ParsePV(buf+startPV, FALSE, !shiftKey);
+	if(lineStart == 0 && gameMode == AnalyzeMode && (multi = MultiPV(&first)) >= 0) {
+		int n = first.option[multi].value;
+		if(origIndex > 17 && origIndex < 24) { if(n>1) n--; } else if(origIndex > index - 6) n++;
+		snprintf(buf2, MSG_SIZ, "option MultiPV=%d\n", n);
+		if(first.option[multi].value != n) SendToProgram(buf2, &first);
+		first.option[multi].value = n;
+		*start = *end = 0;
+		return FALSE;
+	}
+	ParsePV(buf+startPV, FALSE, gameMode != AnalyzeMode);
 	*start = startPV; *end = index-1;
 	return TRUE;
 }
@@ -5351,15 +5362,22 @@ UnLoadPV()
   int oldFMM = forwardMostMove; // N.B.: this was currentMove before PV was loaded!
   if(endPV < 0) return;
   endPV = -1;
-  if(shiftKey && gameMode == AnalyzeMode) {
-	if(pushed) storedGames--; // abandon shelved tail of original game
+  if(gameMode == AnalyzeMode && currentMove > forwardMostMove) {
+	Boolean saveAnimate = appData.animate;
+	if(pushed) {
+	    if(shiftKey && storedGames < MAX_VARIATIONS-2) { // wants to start variation, and there is space
+		if(storedGames == 1) GreyRevert(FALSE);      // we already pushed the tail, so just make it official
+	    } else storedGames--; // abandon shelved tail of original game
+	}
 	pushed = FALSE;
 	forwardMostMove = currentMove;
 	currentMove = oldFMM;
+	appData.animate = FALSE;
 	ToNrEvent(forwardMostMove);
+	appData.animate = saveAnimate;
   }
   currentMove = forwardMostMove;
-  if(pushed) { PopInner(0); pushed = FALSE; } // restore shelved game contnuation
+  if(pushed) { PopInner(0); pushed = FALSE; } // restore shelved game continuation
   ClearPremoveHighlights();
   DrawPosition(TRUE, boards[currentMove]);
 }