X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=backend.c;h=06bf7baeeb0b081fd386f564fb70dd5c97f8a3d6;hb=f4106348203ce34462a7983c5bb1215fc591fb02;hp=174b2a297ea21dd5207b839fbfd3a51d53db829f;hpb=a83e12aca9f45c3dc2657feeed6b2d88040219d8;p=xboard.git

diff --git a/backend.c b/backend.c
index 174b2a2..06bf7ba 100644
--- a/backend.c
+++ b/backend.c
@@ -1740,6 +1740,7 @@ InitBackEnd3 P((void))
             if(!blackPlaysFirst) {
                 startedFromPositionFile = TRUE;
                 CopyBoard(filePosition, boards[0]);
+                CopyBoard(initialPosition, boards[0]);
             }
 	}
 	if (initialMode == AnalyzeMode) {
@@ -5660,21 +5661,26 @@ ParsePV (char *pv, Boolean storeComments, Boolean atEnd)
 }
 
 int
-MultiPV (ChessProgramState *cps)
+MultiPV (ChessProgramState *cps, int kind)
 {	// 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;
+	for(i=0; i<cps->nrOptions; i++) {
+	    char *s = cps->option[i].name;
+	    if((kind & 1) && !StrCaseCmp(s, "MultiPV") && cps->option[i].type == Spin) return i;
+	    if((kind & 2) && StrCaseStr(s, "multi") && StrCaseStr(s, "PV")
+			  && StrCaseStr(s, "margin") && cps->option[i].type == Spin) return -i-2;
+	}
 	return -1;
 }
 
 Boolean extendGame; // signals to UnLoadPV() if walked part of PV has to be appended to game
+static int multi, pv_margin;
+static ChessProgramState *activeCps;
 
 Boolean
 LoadMultiPV (int x, int y, char *buf, int index, int *start, int *end, int pane)
 {
-	int startPV, multi, lineStart, origIndex = index;
+	int startPV, lineStart, origIndex = index;
 	char *p, buf2[MSG_SIZ];
 	ChessProgramState *cps = (pane ? &second : &first);
 
@@ -5688,14 +5694,22 @@ LoadMultiPV (int x, int y, char *buf, int index, int *start, int *end, int pane)
 	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;
-	if(lineStart == 0 && gameMode == AnalyzeMode && (multi = MultiPV(cps)) >= 0) {
-		int n = cps->option[multi].value;
-		if(origIndex > 17 && origIndex < 24) { if(n>1) n--; } else if(origIndex > index - 6) n++;
+	if(lineStart == 0 && gameMode == AnalyzeMode) {
+	    int n = 0;
+	    if(origIndex > 17 && origIndex < 24) n--; else if(origIndex > index - 6) n++;
+	    if(n == 0) { // click not on "fewer" or "more"
+		if((multi = -2 - MultiPV(cps, 2)) >= 0) {
+		    pv_margin = cps->option[multi].value;
+		    activeCps = cps; // non-null signals margin adjustment
+		}
+	    } else if((multi = MultiPV(cps, 1)) >= 0) {
+		n += cps->option[multi].value; if(n < 1) n = 1;
 		snprintf(buf2, MSG_SIZ, "option MultiPV=%d\n", n);
 		if(cps->option[multi].value != n) SendToProgram(buf2, cps);
 		cps->option[multi].value = n;
 		*start = *end = 0;
 		return FALSE;
+	    }
 	} else if(strstr(buf+lineStart, "exclude:") == buf+lineStart) { // exclude moves clicked
 		ExcludeClick(origIndex - lineStart);
 		return FALSE;
@@ -5743,6 +5757,16 @@ void
 UnLoadPV ()
 {
   int oldFMM = forwardMostMove; // N.B.: this was currentMove before PV was loaded!
+  if(activeCps) {
+    if(pv_margin != activeCps->option[multi].value) {
+      char buf[MSG_SIZ];
+      snprintf(buf, MSG_SIZ, "option %s=%d\n", "Multi-PV Margin", pv_margin);
+      SendToProgram(buf, activeCps);
+      activeCps->option[multi].value = pv_margin;
+    }
+    activeCps = NULL;
+    return;
+  }
   if(endPV < 0) return;
   if(appData.autoCopyPV) CopyFENToClipboard();
   endPV = -1;
@@ -5771,6 +5795,17 @@ MovePV (int x, int y, int h)
 { // step through PV based on mouse coordinates (called on mouse move)
   int margin = h>>3, step = 0, threshold = (pieceSweep == EmptySquare ? 10 : 15);
 
+  if(activeCps) { // adjusting engine's multi-pv margin
+    if(x > lastX) pv_margin++; else
+    if(x < lastX) pv_margin -= (pv_margin > 0);
+    if(x != lastX) {
+      char buf[MSG_SIZ];
+      snprintf(buf, MSG_SIZ, "margin = %d", pv_margin);
+      DisplayMessage(buf, "");
+    }
+    lastX = x;
+    return;
+  }
   // we must somehow check if right button is still down (might be released off board!)
   if(endPV < 0 && pieceSweep == EmptySquare) return; // needed in XBoard because lastX/Y is shared :-(
   if(abs(x - lastX) < threshold && abs(y - lastY) < threshold) return;
@@ -7540,7 +7575,7 @@ LeftClick (ClickType clickType, int xPix, int yPix)
 	    return;
 	}
     }
-printf("to click %d,%d\n",x,y);
+
     /* fromX != -1 */
     if (clickType == Press && gameMode != EditPosition) {
 	ChessSquare fromP;
@@ -7603,10 +7638,10 @@ printf("to click %d,%d\n",x,y);
 	// ignore clicks on holdings
 	if(x < BOARD_LEFT || x >= BOARD_RGHT) return;
     }
-printf("A type=%d\n",clickType);
 
-    if(x == fromX && y == fromY && gameMode == EditPosition && SubtractTimeMarks(&lastClickTime, &prevClickTime) < 200) {
+    if(x == fromX && y == fromY && clickType == Press && gameMode == EditPosition && SubtractTimeMarks(&lastClickTime, &prevClickTime) < 200) {
 	gatingPiece = boards[currentMove][fromY][fromX]; // prepare to copy rather than move
+	DragPieceBegin(xPix, yPix, FALSE); dragging = 1;
 	return;
     }
 
@@ -7641,7 +7676,7 @@ printf("A type=%d\n",clickType);
     }
 
     clearFlag = 0;
-printf("B\n");
+
     if(gameMode != EditPosition && !appData.testLegality && !legal[y][x] &&
        fromX >= BOARD_LEFT && fromX < BOARD_RGHT && (x != killX || y != killY) && !sweepSelecting) {
 	if(dragging) DragPieceEnd(xPix, yPix), dragging = 0;
@@ -7649,7 +7684,7 @@ printf("B\n");
 	DrawPosition(TRUE, NULL);
 	return; // ignore to-click
     }
-printf("(%d,%d)-(%d,%d) %d %d\n",fromX,fromY,toX,toY,x,y);
+
     /* we now have a different from- and (possibly off-board) to-square */
     /* Completed move */
     if(!sweepSelecting) {
@@ -12989,7 +13024,7 @@ LoadGame (FILE *f, int gameNumber, char *title, int useList)
 	gameInfo.event = StrSave(yy_text);
     }
 
-    startedFromSetupPosition = FALSE;
+    startedFromSetupPosition = startedFromPositionFile; // [HGM]
     while (cm == PGNTag) {
 	if (appData.debugMode)
 	  fprintf(debugFP, "Parsed PGNTag: %s\n", yy_text);
@@ -18148,7 +18183,7 @@ ParseFEN (Board board, int *blackPlaysFirst, char *fen, Boolean autoSize)
                 while (emptycount--)
                         board[i][(j++)+gameInfo.holdingsWidth] = EmptySquare;
                 if (*p == '/') p++;
-		else if(autoSize) { // we stumbled unexpectedly into end of board
+		else if(autoSize && i != BOARD_HEIGHT-1) { // we stumbled unexpectedly into end of board
                     for(k=i; k<BOARD_HEIGHT; k++) { // too few ranks; shift towards bottom
 		        for(j=0; j<BOARD_WIDTH; j++) board[k-i][j] = board[k][j];
                     }
@@ -18212,7 +18247,7 @@ ParseFEN (Board board, int *blackPlaysFirst, char *fen, Boolean autoSize)
     }
     while (*p == '/' || *p == ' ') p++;
 
-    if(autoSize) appData.NrFiles = w, InitPosition(TRUE);
+    if(autoSize && w != 0) appData.NrFiles = w, InitPosition(TRUE);
 
     /* [HGM] by default clear Crazyhouse holdings, if present */
     if(gameInfo.holdingsWidth) {