X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=backend.c;h=5fbe8f01e662d5a98369cbc4e398837bcd7cd383;hb=29df666d997ad990de5376c962b154b26eb73f2f;hp=958f503f7b41b64adec758eec0d466a7673e809b;hpb=a180888cfea059c10e147b2357571c421cb4346f;p=xboard.git diff --git a/backend.c b/backend.c index 958f503..5fbe8f0 100644 --- a/backend.c +++ b/backend.c @@ -47,7 +47,7 @@ * * See the file ChangeLog for a revision history. */ -/* [AS] For debugging purposes */ +/* [AS] Also useful here for debugging */ #ifdef WIN32 #include @@ -144,12 +144,6 @@ typedef struct { int seen_stat; /* 1 if we've seen the stat01: line */ } ChessProgramStats; -/* [AS] Search stats from chessprogram, for the played move */ -typedef struct { - int score; - int depth; -} ChessProgramStats_Move; - int establish P((void)); void read_from_player P((InputSourceRef isr, VOIDSTAR closure, char *buf, int count, int error)); @@ -222,6 +216,8 @@ void InitBackEnd3 P((void)); void FeatureDone P((ChessProgramState* cps, int val)); void InitChessProgram P((ChessProgramState *cps)); +void GetInfoFromComment( int, char * ); + extern int tinyLayout, smallLayout; static ChessProgramStats programStats; @@ -597,8 +593,17 @@ InitBackEnd1() first.analyzing = second.analyzing = FALSE; first.initDone = second.initDone = FALSE; + /* New features added by Tord: */ + first.useFEN960 = FALSE; second.useFEN960 = FALSE; + first.useOOCastle = TRUE; second.useOOCastle = TRUE; + /* End of new features added by Tord. */ + first.scoreIsAbsolute = appData.firstScoreIsAbsolute; /* [AS] */ second.scoreIsAbsolute = appData.secondScoreIsAbsolute; /* [AS] */ + first.isUCI = appData.firstIsUCI; /* [AS] */ + second.isUCI = appData.secondIsUCI; /* [AS] */ + first.hasOwnBookUCI = appData.firstHasOwnBookUCI; /* [AS] */ + second.hasOwnBookUCI = appData.secondHasOwnBookUCI; /* [AS] */ if (appData.firstProtocolVersion > PROTOVER || appData.firstProtocolVersion < 1) { @@ -663,7 +668,7 @@ InitBackEnd1() switch (variant) { case VariantBughouse: /* need four players and two boards */ case VariantKriegspiel: /* need to hide pieces and move details */ - case VariantFischeRandom: /* castling doesn't work, shuffle not done */ + /* case VariantFischeRandom: (Fabien: moved below) */ sprintf(buf, "Variant %s supported only in ICS mode", appData.variant); DisplayFatalError(buf, 0, 2); return; @@ -686,6 +691,7 @@ InitBackEnd1() case VariantNormal: /* definitely works! */ case VariantWildCastle: /* pieces not automatically shuffled */ case VariantNoCastle: /* pieces not automatically shuffled */ + case VariantFischeRandom: /* Fabien: pieces not automatically shuffled */ case VariantCrazyhouse: /* holdings not shown, offboard interposition not understood */ case VariantLosers: /* should work except for win condition, @@ -1592,6 +1598,8 @@ static int player1Rating = -1; static int player2Rating = -1; /*----------------------------*/ +ColorClass curColor = ColorNormal; + void read_from_ics(isr, closure, data, count, error) InputSourceRef isr; @@ -1615,7 +1623,6 @@ read_from_ics(isr, closure, data, count, error) static int parse_pos = 0; static char buf[BUF_SIZE + 1]; static int firstTime = TRUE, intfSet = FALSE; - static ColorClass curColor = ColorNormal; static ColorClass prevColor = ColorNormal; static int savingComment = FALSE; char str[500]; @@ -2900,6 +2907,7 @@ ParseBoard12(string) movesPerSession = 0; gameInfo.timeControl = TimeControlTagValue(); gameInfo.variant = StringToVariant(gameInfo.event); + gameInfo.outOfBook = NULL; /* Do we have the ratings? */ if (strcmp(player1Name, white) == 0 && @@ -3235,7 +3243,25 @@ SendMoveToProgram(moveNum, cps) } SendToProgram(buf, cps); } else { - SendToProgram(moveList[moveNum], cps); + /* Added by Tord: Send castle moves in "O-O" in FRC games if required by + * the engine. It would be nice to have a better way to identify castle + * moves here. */ + if(gameInfo.variant == VariantFischeRandom && cps->useOOCastle) { + int fromX = moveList[moveNum][0] - 'a'; + int fromY = moveList[moveNum][1] - '1'; + int toX = moveList[moveNum][2] - 'a'; + int toY = moveList[moveNum][3] - '1'; + if((boards[currentMove][fromY][fromX] == WhiteKing + && boards[currentMove][toY][toX] == WhiteRook) + || (boards[currentMove][fromY][fromX] == BlackKing + && boards[currentMove][toY][toX] == BlackRook)) { + if(toX > fromX) SendToProgram("O-O\n", cps); + else SendToProgram("O-O-O\n", cps); + } + else SendToProgram(moveList[moveNum], cps); + } + else SendToProgram(moveList[moveNum], cps); + /* End of additions by Tord */ } } @@ -3256,12 +3282,20 @@ SendMoveToICS(moveType, fromX, fromY, toX, toY) case BlackKingSideCastle: case WhiteQueenSideCastleWild: case BlackQueenSideCastleWild: + /* PUSH Fabien */ + case WhiteHSideCastleFR: + case BlackHSideCastleFR: + /* POP Fabien */ sprintf(user_move, "o-o\n"); break; case WhiteQueenSideCastle: case BlackQueenSideCastle: case WhiteKingSideCastleWild: case BlackKingSideCastleWild: + /* PUSH Fabien */ + case WhiteASideCastleFR: + case BlackASideCastleFR: + /* POP Fabien */ sprintf(user_move, "o-o-o\n"); break; case WhitePromotionQueen: @@ -3361,6 +3395,12 @@ ParseOneMove(move, moveNum, moveType, fromX, fromY, toX, toY, promoChar) case WhiteQueenSideCastleWild: case BlackKingSideCastleWild: case BlackQueenSideCastleWild: + /* Code added by Tord: */ + case WhiteHSideCastleFR: + case WhiteASideCastleFR: + case BlackHSideCastleFR: + case BlackASideCastleFR: + /* End of code added by Tord */ case IllegalMove: /* bug or odd chess variant */ *fromX = currentMoveString[0] - 'a'; *fromY = currentMoveString[1] - '1'; @@ -3407,6 +3447,91 @@ ParseOneMove(move, moveNum, moveType, fromX, fromY, toX, toY, promoChar) } } +/* [AS] FRC game initialization */ +static int FindEmptySquare( Board board, int n ) +{ + int i = 0; + + while( 1 ) { + while( board[0][i] != EmptySquare ) i++; + if( n == 0 ) + break; + n--; + i++; + } + + return i; +} + +static void ShuffleFRC( Board board ) +{ + int i; + + srand( time(0) ); + + for( i=0; i<8; i++ ) { + board[0][i] = EmptySquare; + } + + board[0][(rand() % 4)*2 ] = WhiteBishop; /* On dark square */ + board[0][(rand() % 4)*2+1] = WhiteBishop; /* On lite square */ + board[0][FindEmptySquare(board, rand() % 6)] = WhiteQueen; + board[0][FindEmptySquare(board, rand() % 5)] = WhiteKnight; + board[0][FindEmptySquare(board, rand() % 4)] = WhiteKnight; + board[0][FindEmptySquare(board, 0)] = WhiteRook; + board[0][FindEmptySquare(board, 0)] = WhiteKing; + board[0][FindEmptySquare(board, 0)] = WhiteRook; + + for( i=0; i<8; i++ ) { + board[7][i] = board[0][i] + BlackPawn - WhitePawn; + } +} + +static unsigned char FRC_KnightTable[10] = { + 0x00, 0x01, 0x02, 0x03, 0x11, 0x12, 0x13, 0x22, 0x23, 0x33 +}; + +static void SetupFRC( Board board, int pos_index ) +{ + int i; + unsigned char knights; + + /* Bring the position index into a safe range (just in case...) */ + if( pos_index < 0 ) pos_index = 0; + + pos_index %= 960; + + /* Clear the board */ + for( i=0; i<8; i++ ) { + board[0][i] = EmptySquare; + } + + /* Place bishops and queen */ + board[0][ (pos_index % 4)*2 + 1 ] = WhiteBishop; /* On lite square */ + pos_index /= 4; + + board[0][ (pos_index % 4)*2 ] = WhiteBishop; /* On dark square */ + pos_index /= 4; + + board[0][ FindEmptySquare(board, pos_index % 6) ] = WhiteQueen; + pos_index /= 6; + + /* Place knigths */ + knights = FRC_KnightTable[ pos_index ]; + + board[0][ FindEmptySquare(board, knights / 16) ] = WhiteKnight; + board[0][ FindEmptySquare(board, knights % 16) ] = WhiteKnight; + + /* Place rooks and king */ + board[0][ FindEmptySquare(board, 0) ] = WhiteRook; + board[0][ FindEmptySquare(board, 0) ] = WhiteKing; + board[0][ FindEmptySquare(board, 0) ] = WhiteRook; + + /* Mirror piece placement for black */ + for( i=0; i<8; i++ ) { + board[7][i] = board[0][i] + BlackPawn - WhitePawn; + } +} void InitPosition(redraw) @@ -3441,11 +3566,17 @@ InitPosition(redraw) break; case VariantFischeRandom: CopyBoard(boards[0], initialPosition); - /* !!shuffle according to FR rules */ + if( appData.defaultFrcPosition < 0 ) { + ShuffleFRC( boards[0] ); + } + else { + SetupFRC( boards[0], appData.defaultFrcPosition ); + } break; } + if (redraw) - DrawPosition(FALSE, boards[currentMove]); + DrawPosition(TRUE, boards[currentMove]); } void @@ -3456,7 +3587,7 @@ SendBoard(cps, moveNum) char message[MSG_SIZ]; if (cps->useSetboard) { - char* fen = PositionToFEN(moveNum); + char* fen = PositionToFEN(moveNum, cps->useFEN960); sprintf(message, "setboard %s\n", fen); SendToProgram(message, cps); free(fen); @@ -3909,6 +4040,17 @@ FinishMove(moveType, fromX, fromY, toX, toY, promoChar) } } +void SendProgramStatsToFrontend( ChessProgramState * cps ) +{ + SetProgramStats( cps == &first ? 0 : 1, + programStats.depth, + programStats.nodes, + programStats.score, + programStats.time, + programStats.movelist, + lastHint ); +} + void HandleMachineMove(message, cps) char *message; @@ -3952,11 +4094,9 @@ HandleMachineMove(message, cps) /* * Look for machine move. */ - if ((sscanf(message, "%s %s %s", buf1, buf2, machineMove) == 3 && - strcmp(buf2, "...") == 0) || - (sscanf(message, "%s %s", buf1, machineMove) == 2 && - strcmp(buf1, "move") == 0)) { - + if ((sscanf(message, "%s %s %s", buf1, buf2, machineMove) == 3 && strcmp(buf2, "...") == 0) || + (sscanf(message, "%s %s", buf1, machineMove) == 2 && strcmp(buf1, "move") == 0)) + { /* This method is only useful on engines that support ping */ if (cps->lastPing != cps->lastPong) { if (gameMode == BeginningOfGame) { @@ -4056,12 +4196,50 @@ HandleMachineMove(message, cps) /* [AS] Save move info and clear stats for next move */ pvInfoList[ forwardMostMove ].score = programStats.score; pvInfoList[ forwardMostMove ].depth = programStats.depth; + pvInfoList[ forwardMostMove ].time = -1; ClearProgramStats(); thinkOutput[0] = NULLCHAR; hiddenThinkOutputState = 0; MakeMove(fromX, fromY, toX, toY, promoChar);/*updates forwardMostMove*/ + /* [AS] Adjudicate game if needed (note: remember that forwardMostMove now points past the last move) */ + if( gameMode == TwoMachinesPlay && adjudicateLossThreshold != 0 && forwardMostMove >= adjudicateLossPlies ) { + int count = 0; + + while( count < adjudicateLossPlies ) { + int score = pvInfoList[ forwardMostMove - count - 1 ].score; + + if( count & 1 ) { + score = -score; /* Flip score for winning side */ + } + + if( score > adjudicateLossThreshold ) { + break; + } + + count++; + } + + if( count >= adjudicateLossPlies ) { + ShowMove(fromX, fromY, toX, toY); /*updates currentMove*/ + + GameEnds( WhiteOnMove(forwardMostMove) ? WhiteWins : BlackWins, + "Xboard adjudication", + GE_XBOARD ); + + return; + } + } + + if( appData.adjudicateDrawMoves > 0 && forwardMostMove > (2*appData.adjudicateDrawMoves) ) { + ShowMove(fromX, fromY, toX, toY); /*updates currentMove*/ + + GameEnds( GameIsDrawn, "Xboard adjudication: long game", GE_XBOARD ); + + return; + } + if (gameMode == TwoMachinesPlay) { if (cps->other->sendTime) { SendTimeRemaining(cps->other, @@ -4091,32 +4269,6 @@ HandleMachineMove(message, cps) if (gameMode != TwoMachinesPlay) SetUserThinkingEnables(); - - /* [AS] Adjudicate game if needed (note: forwardMostMove now points past the last move */ - if( gameMode == TwoMachinesPlay && adjudicateLossThreshold != 0 && forwardMostMove >= adjudicateLossPlies ) { - int count = 0; - - while( count < adjudicateLossPlies ) { - int score = pvInfoList[ forwardMostMove - count - 1 ].score; - - if( count & 1 ) { - score = -score; /* Flip score for winning side */ - } - - if( score > adjudicateLossThreshold ) { - break; - } - - count++; - } - - if( count >= adjudicateLossPlies ) { - GameEnds( WhiteOnMove(forwardMostMove) ? WhiteWins : BlackWins, - "Xboard adjudication", - GE_XBOARD ); - } - } - return; } @@ -4571,19 +4723,21 @@ HandleMachineMove(message, cps) if (plyext != ' ' && plyext != '\t') { time *= 100; } - programStats.depth = plylev; - programStats.nodes = nodes; - programStats.time = time; - programStats.score = curscore; - programStats.got_only_move = 0; - /* [AS] Negate score if machine is playing black and it's reporting absolute scores */ + /* [AS] Negate score if machine is playing black and reporting absolute scores */ if( cps->scoreIsAbsolute && ((gameMode == MachinePlaysBlack) || (gameMode == TwoMachinesPlay && cps->twoMachinesColor[0] == 'b')) ) { - programStats.score = -curscore; + curscore = -curscore; } + + programStats.depth = plylev; + programStats.nodes = nodes; + programStats.time = time; + programStats.score = curscore; + programStats.got_only_move = 0; + /* Buffer overflow protection */ if (buf1[0] != NULLCHAR) { if (strlen(buf1) >= sizeof(programStats.movelist) @@ -4610,6 +4764,8 @@ HandleMachineMove(message, cps) programStats.line_is_book = 0; } + SendProgramStatsToFrontend( cps ); + /* [AS] Protect the thinkOutput buffer from overflow... this is only useful if buf1 hasn't overflowed first! @@ -4660,6 +4816,8 @@ HandleMachineMove(message, cps) isn't searching, so stats won't change) */ programStats.line_is_book = 1; + SendProgramStatsToFrontend( cps ); + if (currentMove == forwardMostMove || gameMode==AnalyzeMode || gameMode == AnalyzeFile) { DisplayMove(currentMove - 1); DisplayAnalysis(); @@ -4683,6 +4841,9 @@ HandleMachineMove(message, cps) programStats.nr_moves = mvtot; strcpy(programStats.move_name, mvname); programStats.ok_to_send = 1; + + SendProgramStatsToFrontend( cps ); + DisplayAnalysis(); return; @@ -4723,6 +4884,40 @@ HandleMachineMove(message, cps) return; } } + else { + buf1[0] = NULLCHAR; + + if (sscanf(message, "%d%c %d %d %lu %[^\n]\n", + &plylev, &plyext, &curscore, &time, &nodes, buf1) >= 5) + { + if (plyext != ' ' && plyext != '\t') { + time *= 100; + } + + /* [AS] Negate score if machine is playing black and reporting absolute scores */ + if( cps->scoreIsAbsolute && ((gameMode == MachinePlaysBlack) || (gameMode == TwoMachinesPlay && cps->twoMachinesColor[0] == 'b')) ) { + curscore = -curscore; + } + + programStats.depth = plylev; + programStats.nodes = nodes; + programStats.time = time; + programStats.score = curscore; + programStats.got_only_move = 0; + programStats.movelist[0] = '\0'; + + if (buf1[0] != NULLCHAR) { + safeStrCpy( programStats.movelist, buf1, sizeof(programStats.movelist) ); + } + + programStats.ok_to_send = 0; + programStats.line_is_book = 0; + programStats.nr_moves = 0; + programStats.moves_left = 0; + + SendProgramStatsToFrontend( cps ); + } + } } } @@ -4790,6 +4985,12 @@ ParseGameHistory(game) case WhiteQueenSideCastleWild: case BlackKingSideCastleWild: case BlackQueenSideCastleWild: + /* PUSH Fabien */ + case WhiteHSideCastleFR: + case WhiteASideCastleFR: + case BlackHSideCastleFR: + case BlackASideCastleFR: + /* POP Fabien */ case IllegalMove: /* maybe suicide chess, etc. */ fromX = currentMoveString[0] - 'a'; fromY = currentMoveString[1] - '1'; @@ -4910,6 +5111,30 @@ ApplyMove(fromX, fromY, toX, toY, promoChar, board) board[toY][toX] = (ChessSquare) fromX; } else if (fromX == toX && fromY == toY) { return; + } + + /* Code added by Tord: */ + /* FRC castling assumed when king captures friendly rook. */ + else if (board[fromY][fromX] == WhiteKing && + board[toY][toX] == WhiteRook) { + board[fromY][fromX] = EmptySquare; + board[toY][toX] = EmptySquare; + if(toX > fromX) { + board[0][6] = WhiteKing; board[0][5] = WhiteRook; + } else { + board[0][2] = WhiteKing; board[0][3] = WhiteRook; + } + } else if (board[fromY][fromX] == BlackKing && + board[toY][toX] == BlackRook) { + board[fromY][fromX] = EmptySquare; + board[toY][toX] = EmptySquare; + if(toX > fromX) { + board[7][6] = BlackKing; board[7][5] = BlackRook; + } else { + board[7][2] = BlackKing; board[7][3] = BlackRook; + } + /* End of code added by Tord */ + } else if (fromY == 0 && fromX == 4 && board[fromY][fromX] == WhiteKing && toY == 0 && toX == 6) { @@ -5101,6 +5326,7 @@ ShowMove(fromX, fromY, toX, toY) } if (instant) return; + DisplayMove(currentMove - 1); DrawPosition(FALSE, boards[currentMove]); DisplayBothClocks(); @@ -5651,6 +5877,10 @@ AutoPlayOneMove() if (currentMove >= forwardMostMove) { gameMode = EditGame; ModeHighlight(); + + /* [AS] Clear current move marker at the end of a game */ + /* HistorySet(parseList, backwardMostMove, forwardMostMove, -1); */ + return FALSE; } @@ -5664,6 +5894,9 @@ AutoPlayOneMove() } else { fromX = moveList[currentMove][0] - 'a'; fromY = moveList[currentMove][1] - '1'; + + HistorySet(parseList, backwardMostMove, forwardMostMove, currentMove); /* [AS] */ + AnimateMove(boards[currentMove], fromX, fromY, toX, toY); if (appData.highlightLastMove) { @@ -5743,6 +5976,12 @@ LoadGameOneMove(readAhead) case WhiteQueenSideCastleWild: case BlackKingSideCastleWild: case BlackQueenSideCastleWild: + /* PUSH Fabien */ + case WhiteHSideCastleFR: + case WhiteASideCastleFR: + case BlackHSideCastleFR: + case BlackASideCastleFR: + /* POP Fabien */ if (appData.debugMode) fprintf(debugFP, "Parsed %s into %s\n", yy_text, currentMoveString); fromX = currentMoveString[0] - 'a'; @@ -6379,10 +6618,12 @@ LoadGame(f, gameNumber, title, useList) gameInfo.variant = StringToVariant(gameInfo.event); } if (!matchMode) { + if( appData.autoDisplayTags ) { tags = PGNTags(&gameInfo); TagsPopUp(tags, CmailMsg()); free(tags); } + } } else { /* Make something up, but don't display it now */ SetGameInfo(); @@ -6784,6 +7025,80 @@ SavePart(str) #define PGN_MAX_LINE 75 +#define PGN_SIDE_WHITE 0 +#define PGN_SIDE_BLACK 1 + +static int FindFirstMoveOutOfBook( int side ) +{ + int result = -1; + + if( backwardMostMove == 0 && ! startedFromSetupPosition) { + int index = backwardMostMove; + int has_book_hit = 0; + + if( (index % 2) != side ) { + index++; + } + + while( index < forwardMostMove ) { + /* Check to see if engine is in book */ + int depth = pvInfoList[index].depth; + int score = pvInfoList[index].score; + int in_book = 0; + + if( depth == 0 ) { + in_book = 1; /* Yace */ + } + if( score == 0 ) { + if( depth <= 1 || depth == 63 /* Zappa */ ) { + in_book = 1; + } + } + + has_book_hit += in_book; + + if( ! in_book ) { + result = index; + + break; + } + + index += 2; + } + } + + return result; +} + +void GetOutOfBookInfo( char * buf ) +{ + int oob[2]; + int i; + int offset = backwardMostMove & (~1L); /* output move numbers start at 1 */ + + oob[0] = FindFirstMoveOutOfBook( PGN_SIDE_WHITE ); + oob[1] = FindFirstMoveOutOfBook( PGN_SIDE_BLACK ); + + *buf = '\0'; + + if( oob[0] >= 0 || oob[1] >= 0 ) { + for( i=0; i<2; i++ ) { + int idx = oob[i]; + + if( idx >= 0 ) { + if( i > 0 && oob[0] >= 0 ) { + strcat( buf, " " ); + } + + sprintf( buf+strlen(buf), "%d%s. ", (idx - offset)/2 + 1, idx & 1 ? ".." : "" ); + sprintf( buf+strlen(buf), "%s%.2f", + pvInfoList[idx].score >= 0 ? "+" : "", + pvInfoList[idx].score / 100.0 ); + } + } + } +} + /* Save game in PGN style and close the file */ int SaveGamePGN(f) @@ -6796,23 +7111,36 @@ SaveGamePGN(f) int movelen, numlen, blank; char move_buffer[100]; /* [AS] Buffer for move+PV info */ + offset = backwardMostMove & (~1L); /* output move numbers start at 1 */ + tm = time((time_t *) NULL); PrintPGNTags(f, &gameInfo); if (backwardMostMove > 0 || startedFromSetupPosition) { - char *fen = PositionToFEN(backwardMostMove); + char *fen = PositionToFEN(backwardMostMove, 1); fprintf(f, "[FEN \"%s\"]\n[SetUp \"1\"]\n", fen); fprintf(f, "\n{--------------\n"); PrintPosition(f, backwardMostMove); fprintf(f, "--------------}\n"); free(fen); - } else { + } + else { + /* [AS] Out of book annotation */ + if( appData.saveOutOfBookInfo ) { + char buf[64]; + + GetOutOfBookInfo( buf ); + + if( buf[0] != '\0' ) { + fprintf( f, "[%s \"%s\"]\n", PGN_OUT_OF_BOOK, buf ); + } + } + fprintf(f, "\n"); } i = backwardMostMove; - offset = backwardMostMove & (~1L); /* output move numbers start at 1 */ linelen = 0; newblock = TRUE; @@ -6856,7 +7184,7 @@ SaveGamePGN(f) movetext = SavePart(parseList[i]); /* [AS] Add PV info if present */ - if( i > 0 && appData.saveExtendedInfoInPGN && pvInfoList[i].depth > 0 ) { + if( i >= 0 && appData.saveExtendedInfoInPGN && pvInfoList[i].depth > 0 ) { sprintf( move_buffer, "%s {%s%.2f/%d}", movetext, pvInfoList[i].score >= 0 ? "+" : "", @@ -7026,7 +7354,7 @@ SavePosition(f, dummy, dummy2) PrintPosition(f, currentMove); fprintf(f, "--------------]\n"); } else { - fen = PositionToFEN(currentMove); + fen = PositionToFEN(currentMove, 1); fprintf(f, "%s\n", fen); free(fen); } @@ -7416,13 +7744,13 @@ ExitEvent(status) DoSleep( appData.delayBeforeQuit ); SendToProgram("quit\n", &first); DoSleep( appData.delayAfterQuit ); - DestroyChildProcess(first.pr, first.useSigterm); + DestroyChildProcess(first.pr, 10 /* [AS] first.useSigterm */ ); } if (second.pr != NoProc) { DoSleep( appData.delayBeforeQuit ); SendToProgram("quit\n", &second); DoSleep( appData.delayAfterQuit ); - DestroyChildProcess(second.pr, second.useSigterm); + DestroyChildProcess(second.pr, 10 /* [AS] second.useSigterm */ ); } if (first.isr != NULL) { RemoveInputSource(first.isr); @@ -8037,6 +8365,7 @@ EditPositionDone() gameMode = EditGame; ModeHighlight(); HistorySet(parseList, backwardMostMove, forwardMostMove, currentMove-1); + ClearHighlights(); /* [AS] */ } /* Pause for `ms' milliseconds */ @@ -8544,6 +8873,8 @@ void BackwardInner(target) int target; { + int full_redraw = TRUE; /* [AS] Was FALSE, had to change it! */ + if (appData.debugMode) fprintf(debugFP, "BackwardInner(%d), current %d, forward %d\n", target, currentMove, forwardMostMove); @@ -8551,7 +8882,7 @@ BackwardInner(target) if (gameMode == EditPosition) return; if (currentMove <= backwardMostMove) { ClearHighlights(); - DrawPosition(FALSE, boards[currentMove]); + DrawPosition(full_redraw, boards[currentMove]); return; } if (gameMode == PlayFromGameFile && !pausing) @@ -8592,7 +8923,7 @@ BackwardInner(target) } DisplayBothClocks(); DisplayMove(currentMove - 1); - DrawPosition(FALSE, boards[currentMove]); + DrawPosition(full_redraw, boards[currentMove]); HistorySet(parseList,backwardMostMove,forwardMostMove,currentMove-1); if (commentList[currentMove] != NULL) { DisplayComment(currentMove - 1, commentList[currentMove]); @@ -8684,7 +9015,7 @@ RetractMoveEvent() DisplayBothClocks(); DisplayMove(currentMove - 1); ClearHighlights();/*!! could figure this out*/ - DrawPosition(FALSE, boards[currentMove]); + DrawPosition(TRUE, boards[currentMove]); /* [AS] Changed to full redraw! */ SendToProgram("remove\n", &first); /*first.maybeThinking = TRUE;*/ /* GNU Chess does not ponder here */ break; @@ -8918,7 +9249,7 @@ SetGameInfo() switch (gameMode) { case MachinePlaysWhite: - gameInfo.event = StrSave("Computer chess game"); + gameInfo.event = StrSave( appData.pgnEventHeader ); gameInfo.site = StrSave(HostName()); gameInfo.date = PGNDate(); gameInfo.round = StrSave("-"); @@ -8928,7 +9259,7 @@ SetGameInfo() break; case MachinePlaysBlack: - gameInfo.event = StrSave("Computer chess game"); + gameInfo.event = StrSave( appData.pgnEventHeader ); gameInfo.site = StrSave(HostName()); gameInfo.date = PGNDate(); gameInfo.round = StrSave("-"); @@ -8938,7 +9269,7 @@ SetGameInfo() break; case TwoMachinesPlay: - gameInfo.event = StrSave("Computer chess game"); + gameInfo.event = StrSave( appData.pgnEventHeader ); gameInfo.site = StrSave(HostName()); gameInfo.date = PGNDate(); if (matchGame > 0) { @@ -9043,6 +9374,8 @@ AppendComment(index, text) int oldlen, len; char *old; + GetInfoFromComment( index, text ); + CrushCRs(text); while (*text == '\n') text++; len = strlen(text); @@ -9067,6 +9400,78 @@ AppendComment(index, text) } } +static char * FindStr( char * text, char * sub_text ) +{ + char * result = strstr( text, sub_text ); + + if( result != NULL ) { + result += strlen( sub_text ); + } + + return result; +} + +/* [AS] Try to extract PV info from PGN comment */ +void GetInfoFromComment( int index, char * text ) +{ + if( text != NULL && index > 0 ) { + int score = 0; + int depth = 0; + int time = -1; + char * s_eval = FindStr( text, "[%eval " ); + char * s_emt = FindStr( text, "[%emt " ); + + if( s_eval != NULL || s_emt != NULL ) { + /* New style */ + char delim; + + if( s_eval != NULL ) { + if( sscanf( s_eval, "%d,%d%c", &score, &depth, &delim ) != 3 ) { + return; + } + + if( delim != ']' ) { + return; + } + } + + if( s_emt != NULL ) { + } + } + else { + /* We expect something like: [+|-]nnn.nn/dd */ + char * sep = strchr( text, '/' ); + int score_lo = 0; + + if( sep == NULL || sep < (text+4) ) { + return; + } + + if( sscanf( text, "%d.%d/%d", &score, &score_lo, &depth ) != 3 ) { + return; + } + + if( score_lo < 0 || score_lo >= 100 ) { + return; + } + + score = score >= 0 ? score*100 + score_lo : score*100 - score_lo; + } + + if( depth <= 0 ) { + return; + } + + if( time < 0 ) { + time = -1; + } + + pvInfoList[index-1].depth = depth; + pvInfoList[index-1].score = score; + pvInfoList[index-1].time = time; + } +} + void SendToProgram(message, cps) char *message; @@ -9353,6 +9758,10 @@ ParseFeatures(args, cps) FeatureDone(cps, val); continue; } + /* Added by Tord: */ + if (BoolFeature(&p, "fen960", &cps->useFEN960, cps)) continue; + if (BoolFeature(&p, "oocastle", &cps->useOOCastle, cps)) continue; + /* End of additions by Tord */ /* unknown feature: complain and skip */ q = p; @@ -9592,6 +10001,7 @@ DisplayComment(moveNumber, text) { char title[MSG_SIZ]; + if( appData.autoDisplayComment ) { if (moveNumber < 0 || parseList[moveNumber][0] == NULLCHAR) { strcpy(title, "Comment"); } else { @@ -9601,6 +10011,7 @@ DisplayComment(moveNumber, text) } CommentPopUp(title, text); + } } /* This routine sends a ^C interrupt to gnuchess, to awaken it if it @@ -10135,8 +10546,9 @@ PGNDate() char * -PositionToFEN(move) +PositionToFEN(move, useFEN960) int move; + int useFEN960; { int i, j, fromX, fromY, toX, toY; int whiteToPlay; @@ -10174,7 +10586,66 @@ PositionToFEN(move) *p++ = whiteToPlay ? 'w' : 'b'; *p++ = ' '; - /* !!We don't keep track of castling availability, so fake it */ + /* HACK: we don't keep track of castling availability, so fake it! */ + + /* PUSH Fabien & Tord */ + + /* Declare all potential FRC castling rights (conservative) */ + /* outermost rook on each side of the king */ + + if( gameInfo.variant == VariantFischeRandom ) { + int fk, fr; + + q = p; + + /* White castling rights */ + + for (fk = 1; fk < 7; fk++) { + + if (boards[move][0][fk] == WhiteKing) { + + for (fr = 7; fr > fk; fr--) { /* H side */ + if (boards[move][0][fr] == WhiteRook) { + *p++ = useFEN960 ? 'A' + fr : 'K'; + break; + } + } + + for (fr = 0; fr < fk; fr++) { /* A side */ + if (boards[move][0][fr] == WhiteRook) { + *p++ = useFEN960 ? 'A' + fr : 'Q'; + break; + } + } + } + } + + /* Black castling rights */ + + for (fk = 1; fk < 7; fk++) { + + if (boards[move][7][fk] == BlackKing) { + + for (fr = 7; fr > fk; fr--) { /* H side */ + if (boards[move][7][fr] == BlackRook) { + *p++ = useFEN960 ? 'a' + fr : 'k'; + break; + } + } + + for (fr = 0; fr < fk; fr++) { /* A side */ + if (boards[move][7][fr] == BlackRook) { + *p++ = useFEN960 ? 'a' + fr : 'q'; + break; + } + } + } + } + + if (q == p) *p++ = '-'; /* No castling rights */ + *p++ = ' '; + } + else { q = p; if (boards[move][0][4] == WhiteKing) { if (boards[move][0][7] == WhiteRook) *p++ = 'K'; @@ -10186,6 +10657,9 @@ PositionToFEN(move) } if (q == p) *p++ = '-'; *p++ = ' '; + } + + /* POP Fabien & Tord */ /* En passant target square */ if (move > backwardMostMove) { @@ -10207,7 +10681,7 @@ PositionToFEN(move) *p++ = '-'; } - /* !!We don't keep track of halfmove clock for 50-move rule */ + /* We don't keep track of halfmove clock for 50-move rule */ strcpy(p, " 0 "); p += 3; @@ -10263,6 +10737,7 @@ ParseFEN(board, blackPlaysFirst, fen) default: return FALSE; } + /* !!We ignore the rest of the FEN notation */ return TRUE; }