X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=backend.c;h=dc20c26e4559d0ee986bd5527d98b9329c673c39;hb=3086238e38acd1656c4be07c2a4ca26e5ffdfdc9;hp=c4e931643a1c3f0345c913401a4c9f6e5aa48fd6;hpb=941395daf4333598be57255c9b722c7c09b3adf3;p=xboard.git

diff --git a/backend.c b/backend.c
old mode 100755
new mode 100644
index c4e9316..dc20c26
--- a/backend.c
+++ b/backend.c
@@ -450,6 +450,20 @@ int loadFlag = 0;
 int shuffleOpenings;
 int mute; // mute all sounds
 
+// [HGM] vari: next 12 to save and restore variations
+#define MAX_VARIATIONS 10
+int framePtr = MAX_MOVES-1; // points to free stack entry
+int storedGames = 0;
+int savedFirst[MAX_VARIATIONS];
+int savedLast[MAX_VARIATIONS];
+int savedFramePtr[MAX_VARIATIONS];
+char *savedDetails[MAX_VARIATIONS];
+ChessMove savedResult[MAX_VARIATIONS];
+
+void PushTail P((int firstMove, int lastMove));
+Boolean PopTail P((Boolean annotate));
+void CleanupTail P((void));
+
 ChessSquare  FIDEArray[2][BOARD_FILES] = {
     { WhiteRook, WhiteKnight, WhiteBishop, WhiteQueen,
 	WhiteKing, WhiteBishop, WhiteKnight, WhiteRook },
@@ -641,7 +655,7 @@ InitBackEnd1()
     {
         int i, j;
 
-        for( i=0; i<MAX_MOVES; i++ ) {
+        for( i=0; i<=framePtr; i++ ) {
             pvInfoList[i].depth = -1;
             boards[i][EP_STATUS] = EP_NONE;
             for( j=0; j<BOARD_FILES-2; j++ ) boards[i][CASTLING][j] = NoRights;
@@ -3437,7 +3451,7 @@ ParseBoard12(string)
     /* Convert the move number to internal form */
     moveNum = (moveNum - 1) * 2;
     if (to_play == 'B') moveNum++;
-    if (moveNum >= MAX_MOVES) {
+    if (moveNum > framePtr) { // [HGM] vari: do not run into saved variations
       DisplayFatalError(_("Game too long; increase MAX_MOVES and recompile"),
 			0, 1);
       return;
@@ -4611,7 +4625,7 @@ InitPosition(redraw)
 
     /* [AS] Initialize pv info list [HGM] and game status */
     {
-        for( i=0; i<MAX_MOVES; i++ ) {
+        for( i=0; i<=framePtr; i++ ) { // [HGM] vari: spare saved variations
             pvInfoList[i].depth = 0;
             boards[i][EP_STATUS] = EP_NONE;
             for( j=0; j<BOARD_FILES-2; j++ ) boards[i][CASTLING][j] = NoRights;
@@ -5100,12 +5114,6 @@ OKToStartUserMove(x, y)
 	    /* Could disallow this or prompt for confirmation */
 	    cmailOldMove = -1;
 	}
-	if (currentMove < forwardMostMove) {
-	    /* Discarding moves */
-	    /* Could prompt for confirmation here,
-	       but I don't think that's such a good idea */
-	    forwardMostMove = currentMove;
-	}
 	break;
 
       case BeginningOfGame:
@@ -5134,6 +5142,7 @@ OKToStartUserMove(x, y)
 	break;
     }
     if (currentMove != forwardMostMove && gameMode != AnalyzeMode
+	&& gameMode != EditGame // [HGM] vari: treat as AnalyzeMode
 	&& gameMode != AnalyzeFile && gameMode != Training) {
 	DisplayMoveError(_("Displayed position is not current"));
 	return FALSE;
@@ -5305,7 +5314,7 @@ UserMoveTest(fromX, fromY, toX, toY, promoChar, captureOwn)
             return ImpossibleMove;
 	}
     }
-if(appData.debugMode) fprintf(debugFP, "moveType 3 = %d, promochar = %x\n", moveType, promoChar);
+
     return moveType;
     /* [HGM] <popupFix> in stead of calling FinishMove directly, this
        function is made into one that returns an OK move type if FinishMove
@@ -5324,7 +5333,7 @@ FinishMove(moveType, fromX, fromY, toX, toY, promoChar)
      /*char*/int promoChar;
 {
     char *bookHit = 0;
-if(appData.debugMode) fprintf(debugFP, "moveType 5 = %d, promochar = %x\n", moveType, promoChar);
+
     if((gameInfo.variant == VariantSuper || gameInfo.variant == VariantGreat) && promoChar != NULLCHAR) { 
 	// [HGM] superchess: suppress promotions to non-available piece
 	int k = PieceToNumber(CharToPiece(ToUpper(promoChar)));
@@ -5339,13 +5348,12 @@ if(appData.debugMode) fprintf(debugFP, "moveType 5 = %d, promochar = %x\n", move
        move type in caller when we know the move is a legal promotion */
     if(moveType == NormalMove && promoChar)
         moveType = PromoCharToMoveType(WhiteOnMove(currentMove), promoChar);
-if(appData.debugMode) fprintf(debugFP, "moveType 1 = %d, promochar = %x\n", moveType, promoChar);
+
     /* [HGM] convert drag-and-drop piece drops to standard form */
-    if( fromX == BOARD_LEFT-2 || fromX == BOARD_RGHT+1) {
+    if( (fromX == BOARD_LEFT-2 || fromX == BOARD_RGHT+1) && fromY != DROP_RANK ){
          moveType = WhiteOnMove(currentMove) ? WhiteDrop : BlackDrop;
 	   if(appData.debugMode) fprintf(debugFP, "Drop move %d, curr=%d, x=%d,y=%d, p=%d\n", 
 		moveType, currentMove, fromX, fromY, boards[currentMove][fromY][fromX]);
-//         fromX = boards[currentMove][fromY][fromX];
 	   // holdings might not be sent yet in ICS play; we have to figure out which piece belongs here
 	   if(fromX == 0) fromY = BOARD_HEIGHT-1 - fromY; // black holdings upside-down
 	   fromX = fromX ? WhitePawn : BlackPawn; // first piece type in selected holdings
@@ -5354,7 +5362,7 @@ if(appData.debugMode) fprintf(debugFP, "moveType 1 = %d, promochar = %x\n", move
     }
 
     /* [HGM] <popupFix> The following if has been moved here from
-       UserMoveEvent(). Because it seemed to belon here (why not allow
+       UserMoveEvent(). Because it seemed to belong here (why not allow
        piece drops in training games?), and because it can only be
        performed after it is known to what we promote. */
     if (gameMode == Training) {
@@ -5394,8 +5402,9 @@ if(appData.debugMode) fprintf(debugFP, "moveType 1 = %d, promochar = %x\n", move
 
   /* Ok, now we know that the move is good, so we can kill
      the previous line in Analysis Mode */
-  if (gameMode == AnalyzeMode && currentMove < forwardMostMove) {
-    forwardMostMove = currentMove;
+  if ((gameMode == AnalyzeMode || gameMode == EditGame) 
+				&& currentMove < forwardMostMove) {
+    PushTail(currentMove, forwardMostMove); // [HGM] vari: save tail of game
   }
 
   /* If we need the chess program but it's dead, restart it */
@@ -5428,7 +5437,7 @@ if(appData.debugMode) fprintf(debugFP, "moveType 1 = %d, promochar = %x\n", move
     }
     ModeHighlight();
   }
-if(appData.debugMode) fprintf(debugFP, "moveType 2 = %d, promochar = %x\n", moveType, promoChar);
+
   /* Relay move to ICS or chess engine */
   if (appData.icsActive) {
     if (gameMode == IcsPlayingWhite || gameMode == IcsPlayingBlack ||
@@ -7686,7 +7695,7 @@ MakeMove(fromX, fromY, toX, toY, promoChar)
         fflush(serverMoves);
     }
 
-    if (forwardMostMove+1 >= MAX_MOVES) {
+    if (forwardMostMove+1 > framePtr) { // [HGM] vari: do not run into saved variations
       DisplayFatalError(_("Game too long; increase MAX_MOVES and recompile"),
 			0, 1);
       return;
@@ -8468,6 +8477,7 @@ Reset(redraw, init)
 	fprintf(debugFP, "Reset(%d, %d) from gameMode %d\n",
 		redraw, init, gameMode);
     }
+    CleanupTail(); // [HGM] vari: delete any stored variations
     pausing = pauseExamInvalid = FALSE;
     startedFromSetupPosition = blackPlaysFirst = FALSE;
     firstMove = TRUE;
@@ -9852,7 +9862,7 @@ SaveGamePGN(f)
 	/* Print comments preceding this move */
 	if (commentList[i] != NULL) {
 	    if (linelen > 0) fprintf(f, "\n");
-	    fprintf(f, "%s\n", commentList[i]);
+	    fprintf(f, "%s", commentList[i]);
 	    linelen = 0;
 	    newblock = TRUE;
 	}
@@ -9905,17 +9915,9 @@ SaveGamePGN(f)
         /* [AS] Add PV info if present */
         if( i >= 0 && appData.saveExtendedInfoInPGN && pvInfoList[i].depth > 0 ) {
             /* [HGM] add time */
-            char buf[MSG_SIZ]; int seconds = 0;
+            char buf[MSG_SIZ]; int seconds;
 
-            if(i >= backwardMostMove) {
-		if(WhiteOnMove(i))
-			seconds = timeRemaining[0][i] - timeRemaining[0][i+1]
-				  + GetTimeQuota(i/2) / (1000*WhitePlayer()->timeOdds);
-		else
-			seconds = timeRemaining[1][i] - timeRemaining[1][i+1]
-                                  + GetTimeQuota(i/2) / (1000*WhitePlayer()->other->timeOdds);
-            }
-            seconds = (seconds+50)/100; // deci-seconds, rounded to nearest
+            seconds = (pvInfoList[i].time+5)/10; // deci-seconds, rounded to nearest
 
             if( seconds <= 0) buf[0] = 0; else
             if( seconds < 30 ) sprintf(buf, " %3.1f%c", seconds/10., 0); else {
@@ -10085,6 +10087,7 @@ SavePosition(f, dummy, dummy2)
     time_t tm;
     char *fen;
     
+    if (gameMode == EditPosition) EditPositionDone(TRUE);
     if (appData.oldSaveStyle) {
 	tm = time((time_t *) NULL);
     
@@ -10861,7 +10864,8 @@ TwoMachinesEvent P((void))
 	break;
     }
 
-    forwardMostMove = currentMove;
+//    forwardMostMove = currentMove;
+    TruncateGame(); // [HGM] vari: MachineWhite and MachineBlack do this...
     ResurrectChessProgram();	/* in case first program isn't running */
 
     if (second.pr == NULL) {
@@ -11785,7 +11789,7 @@ void
 ToStartEvent()
 {
     if (gameMode == AnalyzeMode || gameMode == AnalyzeFile) {
-	/* to optimze, we temporarily turn off analysis mode while we undo
+	/* to optimize, we temporarily turn off analysis mode while we undo
 	 * all the moves. Otherwise we get analysis output after each undo.
 	 */ 
         if (first.analysisSupport) {
@@ -11826,6 +11830,9 @@ ToNrEvent(int to)
 void
 RevertEvent()
 {
+    if(PopTail(TRUE)) { // [HGM] vari: restore old game tail
+	return;
+    }
     if (gameMode != IcsExamining) {
 	DisplayError(_("You are not examining a game"), 0);
 	return;
@@ -11923,6 +11930,7 @@ TruncateGameEvent()
 void
 TruncateGame()
 {
+    CleanupTail(); // [HGM] vari: only keep current variation if we explicitly truncate
     if (forwardMostMove > currentMove) {
 	if (gameInfo.resultDetails != NULL) {
 	    free(gameInfo.resultDetails);
@@ -12085,6 +12093,14 @@ SetGameInfo()
 {
     /* This routine is used only for certain modes */
     VariantClass v = gameInfo.variant;
+    ChessMove r = GameUnfinished;
+    char *p = NULL;
+
+    if(gameMode == EditGame) { // [HGM] vari: do not erase result on EditGame
+	r = gameInfo.result; 
+	p = gameInfo.resultDetails; 
+	gameInfo.resultDetails = NULL;
+    }
     ClearGameInfo(&gameInfo);
     gameInfo.variant = v;
 
@@ -12137,6 +12153,8 @@ SetGameInfo()
 	gameInfo.round = StrSave("-");
 	gameInfo.white = StrSave("-");
 	gameInfo.black = StrSave("-");
+	gameInfo.result = r;
+	gameInfo.resultDetails = p;
 	break;
 
       case EditPosition:
@@ -12186,7 +12204,9 @@ ReplaceComment(index, text)
 	commentList[index] = NULL;
 	return;
     }
-  if(*text == '{' || *text == '(' || *text == '[') {
+  if( *text == '{' && strchr(text, '}') || // [HGM] braces: if certainy malformed, put braces
+      *text == '[' && strchr(text, ']') || // otherwise hope the user knows what he is doing
+      *text == '(' && strchr(text, ')')) { // (perhaps check if this parses as comment-only?)
     commentList[index] = (char *) malloc(len + 2);
     strncpy(commentList[index], text, len);
     commentList[index][len] = '\n';
@@ -12196,9 +12216,10 @@ ReplaceComment(index, text)
     char *p;
     commentList[index] = (char *) malloc(len + 6);
     strcpy(commentList[index], "{\n");
-    strcat(commentList[index], text);
+    strncpy(commentList[index]+2, text, len);
+    commentList[index][len+2] = NULLCHAR;
     while(p = strchr(commentList[index], '}')) *p = ')'; // kill all } to make it one comment
-    strcat(commentList[index], "\n}");
+    strcat(commentList[index], "\n}\n");
   }
 }
 
@@ -12239,25 +12260,30 @@ if(appData.debugMode) fprintf(debugFP, "Append: in='%s' %d\n", text, addBraces);
     if (commentList[index] != NULL) {
 	old = commentList[index];
 	oldlen = strlen(old);
-	commentList[index] = (char *) malloc(oldlen + len + 4); // might waste 2
+	while(commentList[index][oldlen-1] ==  '\n')
+	  commentList[index][--oldlen] = NULLCHAR;
+	commentList[index] = (char *) malloc(oldlen + len + 6); // might waste 4
 	strcpy(commentList[index], old);
 	free(old);
-	// [HGM] braces: join "{A\n}" + "{B}" as "{A\nB\n}"
+	// [HGM] braces: join "{A\n}\n" + "{\nB}" as "{A\nB\n}"
 	if(commentList[index][oldlen-1] == '}' && (text[0] == '{' || addBraces)) {
 	  if(addBraces) addBraces = FALSE; else { text++; len--; }
 	  while (*text == '\n') { text++; len--; }
-	  commentList[index][oldlen-1] = NULLCHAR;
-	  oldlen--;
+	  commentList[index][--oldlen] = NULLCHAR;
       }
-	strncpy(&commentList[index][oldlen], text, len);
-	if(addBraces) strcpy(&commentList[index][oldlen + len], "\n}");
-	else          strcpy(&commentList[index][oldlen + len], "\n");
+	if(addBraces) strcat(commentList[index], "\n{\n");
+	else          strcat(commentList[index], "\n");
+	strcat(commentList[index], text);
+	if(addBraces) strcat(commentList[index], "\n}\n");
+	else          strcat(commentList[index], "\n");
     } else {
-	commentList[index] = (char *) malloc(len + 4); // perhaps wastes 2...
-	if(addBraces) commentList[index][0] = '{';
-	strcpy(commentList[index] + addBraces, text);
+	commentList[index] = (char *) malloc(len + 6); // perhaps wastes 4...
+	if(addBraces)
+	     strcpy(commentList[index], "{\n");
+	else commentList[index][0] = NULLCHAR;
+	strcat(commentList[index], text);
 	strcat(commentList[index], "\n");
-	if(addBraces) strcat(commentList[index], "}");
+	if(addBraces) strcat(commentList[index], "}\n");
     }
 }
 
@@ -12389,7 +12415,7 @@ SendToProgram(message, cps)
             } else {
                 gameInfo.result = cps->twoMachinesColor[0]=='w' ? BlackWins : WhiteWins;
             }
-            gameInfo.resultDetails = buf;
+            gameInfo.resultDetails = StrSave(buf);
         }
         DisplayFatalError(buf, error, 1);
     }
@@ -12420,7 +12446,7 @@ ReceiveFromProgram(isr, closure, message, count, error)
                 } else {
                     gameInfo.result = cps->twoMachinesColor[0]=='w' ? BlackWins : WhiteWins;
                 }
-                gameInfo.resultDetails = buf;
+                gameInfo.resultDetails = StrSave(buf);
             }
 	    RemoveInputSource(cps->isr);
 	    DisplayFatalError(buf, 0, 1);
@@ -14117,3 +14143,110 @@ int wrap(char *dest, char *src, int count, int width, int *lp)
 
     return len;
 }
+
+// [HGM] vari: routines for shelving variations
+
+void 
+PushTail(int firstMove, int lastMove)
+{
+	int i, j, nrMoves = lastMove - firstMove;
+
+	if(appData.icsActive) { // only in local mode
+		forwardMostMove = currentMove; // mimic old ICS behavior
+		return;
+	}
+	if(storedGames >= MAX_VARIATIONS-1) return;
+
+	// push current tail of game on stack
+	savedResult[storedGames] = gameInfo.result;
+	savedDetails[storedGames] = gameInfo.resultDetails;
+	gameInfo.resultDetails = NULL;
+	savedFirst[storedGames] = firstMove;
+	savedLast [storedGames] = lastMove;
+	savedFramePtr[storedGames] = framePtr;
+	framePtr -= nrMoves; // reserve space for the boards
+	for(i=nrMoves; i>=1; i--) { // copy boards to stack, working downwards, in case of overlap
+	    CopyBoard(boards[framePtr+i], boards[firstMove+i]);
+	    for(j=0; j<MOVE_LEN; j++)
+		moveList[framePtr+i][j] = moveList[firstMove+i-1][j];
+	    for(j=0; j<2*MOVE_LEN; j++)
+		parseList[framePtr+i][j] = parseList[firstMove+i-1][j];
+	    timeRemaining[0][framePtr+i] = timeRemaining[0][firstMove+i];
+	    timeRemaining[1][framePtr+i] = timeRemaining[1][firstMove+i];
+	    pvInfoList[framePtr+i] = pvInfoList[firstMove+i-1];
+	    pvInfoList[firstMove+i-1].depth = 0;
+	    commentList[framePtr+i] = commentList[firstMove+i];
+	    commentList[firstMove+i] = NULL;
+	}
+
+	storedGames++;
+	forwardMostMove = currentMove; // truncte game so we can start variation
+	if(storedGames == 1) GreyRevert(FALSE);
+}
+
+Boolean
+PopTail(Boolean annotate)
+{
+	int i, j, nrMoves;
+	char buf[8000], moveBuf[20];
+
+	if(appData.icsActive) return FALSE; // only in local mode
+	if(!storedGames) return FALSE; // sanity
+
+	storedGames--;
+	ToNrEvent(savedFirst[storedGames]); // sets currentMove
+	nrMoves = savedLast[storedGames] - currentMove;
+	if(annotate) {
+		int cnt = 10;
+		if(!WhiteOnMove(currentMove)) sprintf(buf, "(%d...", currentMove+2>>1);
+		else strcpy(buf, "(");
+		for(i=currentMove; i<forwardMostMove; i++) {
+			if(WhiteOnMove(i))
+			     sprintf(moveBuf, " %d. %s", i+2>>1, SavePart(parseList[i]));
+			else sprintf(moveBuf, " %s", SavePart(parseList[i]));
+			strcat(buf, moveBuf);
+			if(!--cnt) { strcat(buf, "\n"); cnt = 10; }
+		}
+		strcat(buf, ")");
+	}
+	for(i=1; i<nrMoves; i++) { // copy last variation back
+	    CopyBoard(boards[currentMove+i], boards[framePtr+i]);
+	    for(j=0; j<MOVE_LEN; j++)
+		moveList[currentMove+i-1][j] = moveList[framePtr+i][j];
+	    for(j=0; j<2*MOVE_LEN; j++)
+		parseList[currentMove+i-1][j] = parseList[framePtr+i][j];
+	    timeRemaining[0][currentMove+i] = timeRemaining[0][framePtr+i];
+	    timeRemaining[1][currentMove+i] = timeRemaining[1][framePtr+i];
+	    pvInfoList[currentMove+i-1] = pvInfoList[framePtr+i];
+	    if(commentList[currentMove+i]) free(commentList[currentMove+i]);
+	    commentList[currentMove+i] = commentList[framePtr+i];
+	    commentList[framePtr+i] = NULL;
+	}
+	if(annotate) AppendComment(currentMove+1, buf, FALSE);
+	framePtr = savedFramePtr[storedGames];
+	gameInfo.result = savedResult[storedGames];
+	if(gameInfo.resultDetails != NULL) {
+	    free(gameInfo.resultDetails);
+      }
+	gameInfo.resultDetails = savedDetails[storedGames];
+	forwardMostMove = currentMove + nrMoves;
+	if(storedGames == 0) GreyRevert(TRUE);
+	return TRUE;
+}
+
+void 
+CleanupTail()
+{	// remove all shelved variations
+	int i;
+	for(i=0; i<storedGames; i++) {
+	    if(savedDetails[i])
+		free(savedDetails[i]);
+	    savedDetails[i] = NULL;
+	}
+	for(i=framePtr; i<MAX_MOVES; i++) {
+		if(commentList[i]) free(commentList[i]);
+		commentList[i] = NULL;
+	}
+	framePtr = MAX_MOVES-1;
+	storedGames = 0;
+}