X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=backend.c;h=9083ba95fe1e38fc56d79a5c1b8d2a0086c895e4;hb=2efc0144a02840f0454378b19b4dbaf428c226bd;hp=449157d651cfdecdcf5a437f4619ed771bf54f5a;hpb=c5dcdc1244715170a3837053879655dcadb524da;p=xboard.git

diff --git a/backend.c b/backend.c
index 449157d..9083ba9 100644
--- a/backend.c
+++ b/backend.c
@@ -243,7 +243,11 @@ static int exiting = 0; /* [HGM] moved to top */
 static int setboardSpoiledMachineBlack = 0 /*, errorExitFlag = 0*/;
 int startedFromPositionFile = FALSE; Board filePosition;       /* [HGM] loadPos */
 Board partnerBoard;     /* [HGM] bughouse: for peeking at partner game          */
+Boolean partnerBoardValid = 0;
+char partnerStatus[MSG_SIZ];
 Boolean partnerUp;
+Boolean originalFlip;
+Boolean twoBoards = 0;
 char endingGame = 0;    /* [HGM] crash: flag to prevent recursion of GameEnds() */
 int whiteNPS, blackNPS; /* [HGM] nps: for easily making clocks aware of NPS     */
 VariantClass currentlyInitializedVariant; /* [HGM] variantswitch */
@@ -2701,7 +2705,7 @@ read_from_ics(isr, closure, data, count, error)
 	    if (appData.autoKibitz && started == STARTED_NONE && 
                 !appData.icsEngineAnalyze &&                     // [HGM] [DM] ICS analyze
 		(gameMode == IcsPlayingWhite || gameMode == IcsPlayingBlack || gameMode == IcsObserving)) {
-		if(looking_at(buf, &i, "* kibitzes: ") &&
+		if((looking_at(buf, &i, "* kibitzes: ") || looking_at(buf, &i, "* whispers: ")) &&
 		   (StrStr(star_match[0], gameInfo.white) == star_match[0] || 
 		    StrStr(star_match[0], gameInfo.black) == star_match[0]   )) { // kibitz of self or opponent
 		    	suppressKibitz = TRUE;
@@ -2740,6 +2744,10 @@ read_from_ics(isr, closure, data, count, error)
 	    channel = -1;
 	    if(started == STARTED_NONE && (looking_at(buf, &i, "* tells you:") || looking_at(buf, &i, "* says:") || 
 					   looking_at(buf, &i, "* whispers:") ||
+					   looking_at(buf, &i, "* kibitzes:") ||
+					   looking_at(buf, &i, "* shouts:") ||
+					   looking_at(buf, &i, "* c-shouts:") ||
+					   looking_at(buf, &i, "--> * ") ||
 					   looking_at(buf, &i, "*(*):") && (sscanf(star_match[1], "%d", &channel),1) ||
 					   looking_at(buf, &i, "*(*)(*):") && (sscanf(star_match[2], "%d", &channel),1) ||
 					   looking_at(buf, &i, "*(*)(*)(*):") && (sscanf(star_match[3], "%d", &channel),1) ||
@@ -2752,22 +2760,49 @@ read_from_ics(isr, closure, data, count, error)
 		for(p=0; p<MAX_CHAT; p++) {
 		    if(channel == atoi(chatPartner[p])) {
 		    talker[0] = '['; strcat(talker, "] ");
+		    Colorize(channel == 1 ? ColorChannel1 : ColorChannel, FALSE);
 		    chattingPartner = p; break;
 		    }
 		} else
+		if(buf[i-3] == 'e') // kibitz; look if there is a KIBITZ chatbox
+		for(p=0; p<MAX_CHAT; p++) {
+		    if(!strcmp("kibitzes", chatPartner[p])) {
+			talker[0] = '['; strcat(talker, "] ");
+			chattingPartner = p; break;
+		    }
+		} else
 		if(buf[i-3] == 'r') // whisper; look if there is a WHISPER chatbox
 		for(p=0; p<MAX_CHAT; p++) {
-		    if(!strcmp("WHISPER", chatPartner[p])) {
+		    if(!strcmp("whispers", chatPartner[p])) {
 			talker[0] = '['; strcat(talker, "] ");
 			chattingPartner = p; break;
 		    }
+		} else
+		if(buf[i-3] == 't' || buf[oldi+2] == '>') {// shout, c-shout or it; look if there is a 'shouts' chatbox
+		  if(buf[i-8] == '-' && buf[i-3] == 't')
+		  for(p=0; p<MAX_CHAT; p++) { // c-shout; check if dedicatesd c-shout box exists
+		    if(!strcmp("c-shouts", chatPartner[p])) {
+			talker[0] = '('; strcat(talker, ") "); Colorize(ColorSShout, FALSE);
+			chattingPartner = p; break;
+		    }
+		  }
+		  if(chattingPartner < 0)
+		  for(p=0; p<MAX_CHAT; p++) {
+		    if(!strcmp("shouts", chatPartner[p])) {
+			if(buf[oldi+2] == '>') { talker[0] = '<'; strcat(talker, "> "); Colorize(ColorShout, FALSE); }
+			else if(buf[i-8] == '-') { talker[0] = '('; strcat(talker, ") "); Colorize(ColorSShout, FALSE); }
+			else { talker[0] = '['; strcat(talker, "] "); Colorize(ColorShout, FALSE); }
+			chattingPartner = p; break;
+		    }
+		  }
 		}
 		if(chattingPartner<0) // if not, look if there is a chatbox for this indivdual
 		for(p=0; p<MAX_CHAT; p++) if(!StrCaseCmp(talker+1, chatPartner[p])) {
-		    talker[0] = 0;
+		    talker[0] = 0; Colorize(ColorTell, FALSE);
 		    chattingPartner = p; break;
 		}
 		if(chattingPartner<0) i = oldi; else {
+		    Colorize(curColor, TRUE); // undo the bogus colorations we just made to trigger the souds
 		    if(oldi > 0 && buf[oldi-1] == '\n') oldi--;
 		    if (oldi > next_out) SendToPlayer(&buf[next_out], oldi - next_out);
 		    started = STARTED_COMMENT;
@@ -3447,6 +3482,7 @@ read_from_ics(isr, closure, data, count, error)
 			ZippyGameStart(whitename, blackname);
 		    }
 #endif /*ZIPPY*/
+		    partnerBoardValid = FALSE; // [HGM] bughouse
 		    continue;
 		}
 
@@ -3487,6 +3523,7 @@ read_from_ics(isr, closure, data, count, error)
 		    Reset(TRUE, TRUE);
 		}
 #endif /*ZIPPY*/
+		if(appData.bgObserve && partnerBoardValid) DrawPosition(TRUE, partnerBoard);
 		continue;
 	    }
 
@@ -3633,7 +3670,7 @@ read_from_ics(isr, closure, data, count, error)
 				    gameInfo.white, white_holding,
 				    gameInfo.black, black_holding);
 			}
-
+			if(!partnerUp) // [HGM] bughouse: when peeking at partner game we already know what he captured...
                         DrawPosition(FALSE, boards[currentMove]);
 			DisplayTitle(str);
 		      } else if(appData.bgObserve) { // [HGM] bughouse: holdings of other game => background
@@ -3645,7 +3682,9 @@ read_from_ics(isr, closure, data, count, error)
                         /* [HGM] copy holdings to partner-board holdings area */
                         CopyHoldings(partnerBoard, white_holding, WhitePawn);
                         CopyHoldings(partnerBoard, black_holding, BlackPawn);
+                        if(twoBoards) { partnerUp = 1; flipView = !flipView; } // [HGM] dual: always draw
                         if(partnerUp) DrawPosition(FALSE, partnerBoard);
+                        if(twoBoards) { partnerUp = 0; flipView = !flipView; }
 		      }
 		    }
 		    /* Suppress following prompt */
@@ -3722,7 +3761,7 @@ ParseBoard12(string)
     char promoChar;
     int ranks=1, files=0; /* [HGM] ICS80: allow variable board size */
     char *bookHit = NULL; // [HGM] book
-    Boolean weird = FALSE, reqFlag = FALSE;
+    Boolean weird = FALSE, reqFlag = FALSE, repaint = FALSE;
 
     fromX = fromY = toX = toY = -1;
     
@@ -3799,7 +3838,6 @@ ParseBoard12(string)
     if((gameMode == IcsPlayingWhite || gameMode == IcsPlayingBlack)
 	 && newGameMode == IcsObserving && appData.bgObserve) {
       // [HGM] bughouse: don't act on alien boards while we play. Just parse the board and save it */
-      char buf[MSG_SIZ];
       for (k = 0; k < ranks; k++) {
         for (j = 0; j < files; j++)
           board[k][j+gameInfo.holdingsWidth] = CharToPiece(board_chars[(ranks-1-k)*(files+1) + j]);
@@ -3809,10 +3847,14 @@ ParseBoard12(string)
         }
       }
       CopyBoard(partnerBoard, board);
-      if(partnerUp) DrawPosition(FALSE, partnerBoard);
-      sprintf(buf, "W: %d:%d B: %d:%d (%d-%d) %c", white_time/60000, (white_time%60000)/1000,
+      if(appData.dualBoard && !twoBoards) { twoBoards = repaint = 1; InitDrawingSizes(-2,0); }
+      if(twoBoards) { partnerUp = 1; flipView = !flipView; } // [HGM] dual
+      if(partnerUp) DrawPosition(repaint, partnerBoard);
+      if(twoBoards) { partnerUp = 0; flipView = !flipView; } // [HGM] dual
+      sprintf(partnerStatus, "W: %d:%02d B: %d:%02d (%d-%d) %c", white_time/60000, (white_time%60000)/1000,
 		 (black_time/60000), (black_time%60000)/1000, white_stren, black_stren, to_play);
-      DisplayMessage(buf, "");
+      DisplayMessage(partnerStatus, "");
+	partnerBoardValid = TRUE;
       return;
     }
 
@@ -4345,6 +4387,7 @@ ParseBoard12(string)
 	      ClearPremoveHighlights();
 
       j = seekGraphUp; seekGraphUp = FALSE; // [HGM] seekgraph: when we draw a board, it overwrites the seek graph
+	if(partnerUp) { flipView = originalFlip; partnerUp = FALSE; j = TRUE; } // [HGM] bughouse: restore view
       DrawPosition(j, boards[currentMove]);
 
       DisplayMove(moveNum - 1);
@@ -4551,6 +4594,73 @@ SendMoveToICS(moveType, fromX, fromY, toX, toY)
 }
 
 void
+UploadGameEvent()
+{   // [HGM] upload: send entire stored game to ICS as long-algebraic moves.
+    int i, last = forwardMostMove; // make sure ICS reply cannot pre-empt us by clearing fmm
+    static char *castlingStrings[4] = { "none", "kside", "qside", "both" };
+    if(gameMode == IcsObserving || gameMode == IcsPlayingBlack || gameMode == IcsPlayingWhite) {
+	DisplayError("You cannot do this while you are playing or observing", 0);
+	return;
+    }
+    if(gameMode != IcsExamining) { // is this ever not the case?
+	char buf[MSG_SIZ], *p, *fen, command[MSG_SIZ], bsetup = 0;
+
+	if(ics_type == ICS_ICC) { // on ICC match ourselves in applicable variant
+	    sprintf(command, "match %s", ics_handle);
+	} else { // on FICS we must first go to general examine mode
+	    strcpy(command, "examine\nbsetup"); // and specify variant within it with bsetups
+	}
+	if(gameInfo.variant != VariantNormal) {
+	    // try figure out wild number, as xboard names are not always valid on ICS
+	    for(i=1; i<=36; i++) {
+		sprintf(buf, "wild/%d", i);
+		if(StringToVariant(buf) == gameInfo.variant) break;
+	    }
+	    if(i<=36 && ics_type == ICS_ICC) sprintf(buf, "%s w%d\n", command, i);
+	    else if(i == 22) sprintf(buf, "%s fr\n", command);
+	    else sprintf(buf, "%s %s\n", command, VariantName(gameInfo.variant));
+	} else sprintf(buf, "%s\n", ics_type == ICS_ICC ? command : "examine\n"); // match yourself or examine
+	SendToICS(ics_prefix);
+	SendToICS(buf);
+	if(startedFromSetupPosition || backwardMostMove != 0) {
+	  fen = PositionToFEN(backwardMostMove, NULL);
+	  if(ics_type == ICS_ICC) { // on ICC we can simply send a complete FEN to set everything
+	    sprintf(buf, "loadfen %s\n", fen);
+	    SendToICS(buf);
+	  } else { // FICS: everything has to set by separate bsetup commands
+	    p = strchr(fen, ' '); p[0] = NULLCHAR; // cut after board
+	    sprintf(buf, "bsetup fen %s\n", fen);
+	    SendToICS(buf);
+	    if(!WhiteOnMove(backwardMostMove)) {
+		SendToICS("bsetup tomove black\n");
+	    }
+	    i = (strchr(p+3, 'K') != NULL) + 2*(strchr(p+3, 'Q') != NULL);
+	    sprintf(buf, "bsetup wcastle %s\n", castlingStrings[i]);
+	    SendToICS(buf);
+	    i = (strchr(p+3, 'k') != NULL) + 2*(strchr(p+3, 'q') != NULL);
+	    sprintf(buf, "bsetup bcastle %s\n", castlingStrings[i]);
+	    SendToICS(buf);
+	    i = boards[backwardMostMove][EP_STATUS];
+	    if(i >= 0) { // set e.p.
+		sprintf(buf, "bsetup eppos %c\n", i+AAA);
+		SendToICS(buf);
+	    }
+	    bsetup++;
+	  }
+	}
+      if(bsetup || ics_type != ICS_ICC && gameInfo.variant != VariantNormal)
+	    SendToICS("bsetup done\n"); // switch to normal examining.
+    }
+    for(i = backwardMostMove; i<last; i++) {
+	char buf[20];
+	sprintf(buf, "%s\n", parseList[i]);
+	SendToICS(buf);
+    }
+    SendToICS(ics_prefix);
+    SendToICS(ics_type == ICS_ICC ? "tag result Game in progress\n" : "commit\n");
+}
+
+void
 CoordsToComputerAlgebraic(rf, ff, rt, ft, promoChar, move)
      int rf, ff, rt, ft;
      char promoChar;
@@ -4634,6 +4744,8 @@ AlphaRank(char *move, int n)
     }
 }
 
+char yy_textstr[8000];
+
 /* Parser for moves from gnuchess, ICS, or user typein box */
 Boolean
 ParseOneMove(move, moveNum, moveType, fromX, fromY, toX, toY, promoChar)
@@ -4646,7 +4758,7 @@ ParseOneMove(move, moveNum, moveType, fromX, fromY, toX, toY, promoChar)
     if (appData.debugMode) {
         fprintf(debugFP, "move to parse: %s\n", move);
     }
-    *moveType = yylexstr(moveNum, move);
+    *moveType = yylexstr(moveNum, move, yy_textstr, sizeof yy_textstr);
 
     switch (*moveType) {
       case WhitePromotionChancellor:
@@ -4735,7 +4847,7 @@ ParseOneMove(move, moveNum, moveType, fromX, fromY, toX, toY, promoChar)
 
 
 void
-ParsePV(char *pv)
+ParsePV(char *pv, Boolean storeComments)
 { // Parse a string of PV moves, and append to current game, behind forwardMostMove
   int fromX, fromY, toX, toY; char promoChar;
   ChessMove moveType;
@@ -4744,11 +4856,11 @@ ParsePV(char *pv)
 
   endPV = forwardMostMove;
   do {
-    while(*pv == ' ') pv++;
-    if(*pv == '(') pv++; // first (ponder) move can be in parentheses
+    while(*pv == ' ' || *pv == '\n' || *pv == '\t') pv++; // must still read away whitespace
+    if(nr == 0 && !storeComments && *pv == '(') pv++; // first (ponder) move can be in parentheses
     valid = ParseOneMove(pv, endPV, &moveType, &fromX, &fromY, &toX, &toY, &promoChar);
 if(appData.debugMode){
-fprintf(debugFP,"parsePV: %d %c%c%c%c '%s'\n", valid, fromX+AAA, fromY+ONE, toX+AAA, toY+ONE, pv);
+fprintf(debugFP,"parsePV: %d %c%c%c%c yy='%s'\nPV = '%s'\n", valid, fromX+AAA, fromY+ONE, toX+AAA, toY+ONE, yy_textstr, pv);
 }
     if(!valid && nr == 0 &&
        ParseOneMove(pv, endPV-1, &moveType, &fromX, &fromY, &toX, &toY, &promoChar)){ 
@@ -4767,9 +4879,13 @@ fprintf(debugFP,"parsePV: %d %c%c%c%c '%s'\n", valid, fromX+AAA, fromY+ONE, toX+
           strcpy(moveList[endPV-2], "_0_0"); // suppress premove highlight on takeback move
         }
       }
+    pv = strstr(pv, yy_textstr) + strlen(yy_textstr); // skip what we parsed
+    if(nr == 0 && !storeComments && *pv == ')') pv++; // closing parenthesis of ponder move;
+    if(moveType == Comment && storeComments) AppendComment(endPV, yy_textstr, FALSE);
+    if(moveType == Comment || moveType == NAG || moveType == ElapsedTime) {
+	valid++; // allow comments in PV
+	continue;
     }
-    while(*pv && *pv++ != ' '); // skip what we parsed; assume space separators
-    if(moveType == Comment) { valid++; continue; } // allow comments in PV
     nr++;
     if(endPV+1 > framePtr) break; // no space, truncate
     if(!valid) break;
@@ -4780,7 +4896,13 @@ fprintf(debugFP,"parsePV: %d %c%c%c%c '%s'\n", valid, fromX+AAA, fromY+ONE, toX+
     moveList[endPV-1][1] = fromY + ONE;
     moveList[endPV-1][2] = toX + AAA;
     moveList[endPV-1][3] = toY + ONE;
-    parseList[endPV-1][0] = NULLCHAR;
+    if(storeComments)
+	CoordsToAlgebraic(boards[endPV - 1],
+			     PosFlags(endPV - 1),
+			     fromY, fromX, toY, toX, promoChar,
+			     parseList[endPV - 1]);
+    else
+	parseList[endPV-1][0] = NULLCHAR;
   } while(valid);
   currentMove = endPV;
   if(currentMove == forwardMostMove) ClearPremoveHighlights(); else
@@ -4795,16 +4917,19 @@ Boolean
 LoadMultiPV(int x, int y, char *buf, int index, int *start, int *end)
 {
 	int startPV;
+	char *p;
 
 	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;
-      while(buf[index] != '\n') if(buf[index++] == '\t') startPV = index;
-      index = startPV;
-	while(buf[index] && buf[index] != '\n') 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);
+	ParsePV(buf+startPV, FALSE);
 	*start = startPV; *end = index-1;
 	return TRUE;
 }
@@ -4814,7 +4939,7 @@ LoadPV(int x, int y)
 { // called on right mouse click to load PV
   int which = gameMode == TwoMachinesPlay && (WhiteOnMove(forwardMostMove) == (second.twoMachinesColor[0] == 'w'));
   lastX = x; lastY = y;
-  ParsePV(lastPV[which]); // load the PV of the thinking engine in the boards array.
+  ParsePV(lastPV[which], FALSE); // load the PV of the thinking engine in the boards array.
   return TRUE;
 }
 
@@ -6340,8 +6465,19 @@ int RightClick(ClickType action, int x, int y, int *fromX, int *fromY)
 
     if((gameMode == IcsPlayingWhite || gameMode == IcsPlayingBlack)
 	 && !appData.zippyPlay && appData.bgObserve) { // [HGM] bughouse: show background game
-	if(action == Press)   { flipView = !flipView; DrawPosition(TRUE, partnerBoard); partnerUp = TRUE; } else
-	if(action == Release) { flipView = !flipView; DrawPosition(TRUE, boards[currentMove]); partnerUp = FALSE; }
+	if(!partnerBoardValid) return -2; // suppress display of uninitialized boards
+	if( appData.dualBoard) return -2; // [HGM] dual: is already displayed
+	if(action == Press)   {
+	    originalFlip = flipView;
+	    flipView = !flipView; // temporarily flip board to see game from partners perspective
+	    DrawPosition(TRUE, partnerBoard);
+	    DisplayMessage(partnerStatus, "");
+	    partnerUp = TRUE;
+	} else if(action == Release) {
+	    flipView = originalFlip;
+	    DrawPosition(TRUE, boards[currentMove]);
+	    partnerUp = FALSE;
+	}
 	return -2;
     }
 
@@ -8786,7 +8922,10 @@ GameEnds(result, resultDetails, whosays)
 
     if(endingGame) return; /* [HGM] crash: forbid recursion */
     endingGame = 1;
-
+    if(twoBoards) { // [HGM] dual: switch back to one board
+	twoBoards = partnerUp = 0; InitDrawingSizes(-2, 0);
+	DrawPosition(TRUE, partnerBoard); // observed game becomes foreground
+    }
     if (appData.debugMode) {
       fprintf(debugFP, "GameEnds(%d, %s, %d)\n",
 	      result, resultDetails ? resultDetails : "(null)", whosays);
@@ -10056,7 +10195,9 @@ LoadGame(f, gameNumber, title, useList)
     if (numPGNTags > 0){
         char *tags;
 	if (gameInfo.variant == VariantNormal) {
-	  gameInfo.variant = StringToVariant(gameInfo.event);
+	  VariantClass v = StringToVariant(gameInfo.event);
+	  // [HGM] do not recognize variants from event tag that were introduced after supporting variant tag
+	  if(v < VariantShogi) gameInfo.variant = v;
 	}
 	if (!matchMode) {
           if( appData.autoDisplayTags ) {
@@ -12586,9 +12727,9 @@ ToNrEvent(int to)
 }
 
 void
-RevertEvent()
+RevertEvent(Boolean annotate)
 {
-    if(PopTail(TRUE)) { // [HGM] vari: restore old game tail
+    if(PopTail(annotate)) { // [HGM] vari: restore old game tail
 	return;
     }
     if (gameMode != IcsExamining) {
@@ -13243,8 +13384,10 @@ ReceiveFromProgram(isr, closure, message, count, error)
 		   sscanf(message, "error %c", &c)!=1 && sscanf(message, "illegal %c", &c)!=1 &&
 		   sscanf(message, "tell%c", &c)!=1   && sscanf(message, "0-1 %c", &c)!=1 &&
 		   sscanf(message, "1-0 %c", &c)!=1   && sscanf(message, "1/2-1/2 %c", &c)!=1 &&
-		   sscanf(message, "pong %c", &c)!=1   && start != '#')
-			{ quote = "# "; print = (appData.engineComments == 2); }
+		   sscanf(message, "pong %c", &c)!=1   && start != '#')	{
+		    quote = appData.engineComments == 2 ? "# " : "### NON-COMPLIANT! ### ";
+		    print = (appData.engineComments >= 2);
+		}
 		message[0] = start; // restore original message
 	}
 	if(print) {
@@ -14949,7 +15092,7 @@ PushTail(int firstMove, int lastMove)
 	}
 
 	storedGames++;
-	forwardMostMove = currentMove; // truncte game so we can start variation
+	forwardMostMove = firstMove; // truncate game so we can start variation
 	if(storedGames == 1) GreyRevert(FALSE);
 }
 
@@ -14961,6 +15104,7 @@ PopTail(Boolean annotate)
 
 	if(appData.icsActive) return FALSE; // only in local mode
 	if(!storedGames) return FALSE; // sanity
+	CommentPopDown(); // make sure no stale variation comments to the destroyed line can remain open
 
 	storedGames--;
 	ToNrEvent(savedFirst[storedGames]); // sets currentMove
@@ -14974,11 +15118,12 @@ PopTail(Boolean annotate)
 			     sprintf(moveBuf, " %d. %s", i+2>>1, SavePart(parseList[i]));
 			else sprintf(moveBuf, " %s", SavePart(parseList[i]));
 			strcat(buf, moveBuf);
+			if(commentList[i]) { strcat(buf, " "); strcat(buf, commentList[i]); }
 			if(!--cnt) { strcat(buf, "\n"); cnt = 10; }
 		}
 		strcat(buf, ")");
 	}
-	for(i=1; i<nrMoves; i++) { // copy last variation back
+	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];
@@ -15019,3 +15164,35 @@ CleanupTail()
 	framePtr = MAX_MOVES-1;
 	storedGames = 0;
 }
+
+void
+LoadVariation(int index, char *text)
+{       // [HGM] vari: shelve previous line and load new variation, parsed from text around text[index]
+	char *p = text, *start = NULL, *end = NULL, wait = NULLCHAR;
+	int level = 0, move;
+
+	if(gameMode != EditGame && gameMode != AnalyzeMode) return;
+	// first find outermost bracketing variation
+	while(*p) { // hope I got this right... Non-nesting {} and [] can screen each other and nesting ()
+	    if(!wait) { // while inside [] pr {}, ignore everyting except matching closing ]}
+		if(*p == '{') wait = '}'; else
+		if(*p == '[') wait = ']'; else
+		if(*p == '(' && level++ == 0 && p-text < index) start = p+1;
+		if(*p == ')' && level > 0 && --level == 0 && p-text > index && end == NULL) end = p-1;
+	    }
+	    if(*p == wait) wait = NULLCHAR; // closing ]} found
+	    p++;
+	}
+	if(!start || !end) return; // no variation found, or syntax error in PGN: ignore click
+	if(appData.debugMode) fprintf(debugFP, "at move %d load variation '%s'\n", currentMove, start);
+	end[1] = NULLCHAR; // clip off comment beyond variation
+	ToNrEvent(currentMove-1);
+	PushTail(currentMove, forwardMostMove); // shelve main variation. This truncates game
+	// kludge: use ParsePV() to append variation to game
+	move = currentMove;
+	ParsePV(start, TRUE);
+	forwardMostMove = endPV; endPV = -1; currentMove = move; // cleanup what ParsePV did
+	ClearPremoveHighlights();
+	CommentPopDown();
+	ToNrEvent(currentMove+1);
+}