X-Git-Url: http://winboard.nl/cgi-bin?p=xboard.git;a=blobdiff_plain;f=gamelist.c;h=34e899a8a205fe45e5803607a9abccc8b3aeb26d;hp=712d9b9593cc40ac678cdc101753d6c15526fc73;hb=HEAD;hpb=f214727e064bfa242138148a3993177f0aa7b5e7 diff --git a/gamelist.c b/gamelist.c index 712d9b9..34e899a 100644 --- a/gamelist.c +++ b/gamelist.c @@ -1,7 +1,8 @@ /* * gamelist.c -- Functions to manage a gamelist * - * Copyright 1995, 2009, 2010, 2011 Free Software Foundation, Inc. + * Copyright 1995, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Free + * Software Foundation, Inc. * * Enhancements Copyright 2005 Alessandro Scotti * @@ -42,6 +43,16 @@ #include "frontend.h" #include "backend.h" #include "parser.h" +#include "moves.h" +#include "gettext.h" + +#ifdef ENABLE_NLS +# define _(s) gettext (s) +# define N_(s) gettext_noop (s) +#else +# define _(s) (s) +# define N_(s) s +#endif /* Variables @@ -60,7 +71,7 @@ static int GameListNewGame P((ListGame **)); /* [AS] Wildcard pattern matching */ Boolean -HasPattern( const char * text, const char * pattern ) +HasPattern (const char * text, const char * pattern) { while( *pattern != '\0' ) { if( *pattern == '*' ) { @@ -92,7 +103,7 @@ HasPattern( const char * text, const char * pattern ) } Boolean -SearchPattern( const char * text, const char * pattern ) +SearchPattern (const char * text, const char * pattern) { Boolean result = TRUE; @@ -118,8 +129,8 @@ SearchPattern( const char * text, const char * pattern ) /* Delete a ListGame; implies removint it from a list. */ -static void GameListDeleteGame(listGame) - ListGame *listGame; +static void +GameListDeleteGame (ListGame *listGame) { if (listGame) { if (listGame->gameInfo.event) free(listGame->gameInfo.event); @@ -140,10 +151,10 @@ static void GameListDeleteGame(listGame) /* Free the previous list of games. */ -static void GameListFree(gameList) - List *gameList; +static void +GameListFree (List *gameList) { - while (!ListEmpty(gameList)) + while (!ListEmpty(gameList)) { GameListDeleteGame((ListGame *) gameList->head); } @@ -153,8 +164,8 @@ static void GameListFree(gameList) /* Initialize a new GameInfo structure. */ -void GameListInitGameInfo(gameInfo) - GameInfo *gameInfo; +void +GameListInitGameInfo (GameInfo *gameInfo) { gameInfo->event = NULL; gameInfo->site = NULL; @@ -170,6 +181,7 @@ void GameListInitGameInfo(gameInfo) gameInfo->whiteRating = -1; /* unknown */ gameInfo->blackRating = -1; /* unknown */ gameInfo->variant = VariantNormal; + gameInfo->variantName = NULL; gameInfo->outOfBook = NULL; gameInfo->resultDetails = NULL; } @@ -179,8 +191,8 @@ void GameListInitGameInfo(gameInfo) * * Note, that the ListGame is *not* added to any list */ -static ListGame *GameListCreate() - +static ListGame * +GameListCreate () { ListGame *listGame; @@ -193,8 +205,8 @@ static ListGame *GameListCreate() /* Creates a new game for the gamelist. */ -static int GameListNewGame(listGamePtr) - ListGame **listGamePtr; +static int +GameListNewGame (ListGame **listGamePtr) { if (!(*listGamePtr = (ListGame *) GameListCreate())) { GameListFree(&gameList); @@ -208,8 +220,8 @@ static int GameListNewGame(listGamePtr) /* Build the list of games in the open file f. * Returns 0 for success or error number. */ -int GameListBuild(f) - FILE *f; +int +GameListBuild (FILE *f) { ChessMove cm, lastStart; int gameNumber; @@ -217,20 +229,20 @@ int GameListBuild(f) int error, scratch=100, plyNr=0, fromX, fromY, toX, toY; int offset; char lastComment[MSG_SIZ], buf[MSG_SIZ]; -struct { - long sec; /* Assuming this is >= 32 bits */ - int ms; /* Assuming this is >= 16 bits */ -} t,t2; GetTimeMark(&t); + TimeMark t, t2; + + GetTimeMark(&t); GameListFree(&gameList); yynewfile(f); gameNumber = 0; - quickFlag = 1; + movePtr = 0; lastStart = (ChessMove) 0; yyskipmoves = FALSE; do { - yyboardindex = scratch + (plyNr & 1); + yyboardindex = scratch; offset = yyoffset(); + quickFlag = plyNr + 1; cm = (ChessMove) Myylex(); switch (cm) { case GNUChessGame: @@ -241,6 +253,7 @@ struct { } currentListGame->number = ++gameNumber; currentListGame->offset = offset; + if(1) { CopyBoard(boards[scratch], initialPosition); plyNr = 0; currentListGame->moves = PackGame(boards[scratch]); } if (currentListGame->gameInfo.event != NULL) { free(currentListGame->gameInfo.event); } @@ -267,6 +280,7 @@ struct { } currentListGame->number = ++gameNumber; currentListGame->offset = offset; + if(1) { CopyBoard(boards[scratch], initialPosition); plyNr = 0; currentListGame->moves = PackGame(boards[scratch]); } lastStart = cm; break; default: @@ -291,7 +305,13 @@ struct { ParsePGNTag(yy_text, ¤tListGame->gameInfo); } } while (cm == PGNTag || cm == Comment); - if(1) { CopyBoard(boards[scratch], initialPosition); plyNr = 0; currentListGame->moves = PackGame(boards[scratch]); } + if(1) { + int btm=0; + if(currentListGame->gameInfo.fen) ParseFEN(boards[scratch], &btm, currentListGame->gameInfo.fen, FALSE); + else CopyBoard(boards[scratch], initialPosition); + plyNr = (btm != 0); + currentListGame->moves = PackGame(boards[scratch]); + } if(cm != NormalMove) break; case IllegalMove: if(appData.testLegality) break; @@ -306,6 +326,7 @@ struct { } currentListGame->number = ++gameNumber; currentListGame->offset = offset; + if(1) { CopyBoard(boards[scratch], initialPosition); plyNr = 0; currentListGame->moves = PackGame(boards[scratch]); } lastStart = MoveNumberOne; } case WhiteCapturesEnPassant: @@ -330,35 +351,40 @@ struct { fromY = currentMoveString[1] - ONE; toX = currentMoveString[2] - AAA; toY = currentMoveString[3] - ONE; - CopyBoard(boards[scratch + (plyNr+1&1)], boards[scratch + (plyNr&1)]); plyNr++; - ApplyMove(fromX, fromY, toX, toY, currentMoveString[4], boards[scratch + (plyNr&1)]); - PackMove(fromX, fromY, toX, toY, currentMoveString[4]); + ApplyMove(fromX, fromY, toX, toY, currentMoveString[4], boards[scratch]); + if(currentListGame && currentListGame->moves) PackMove(fromX, fromY, toX, toY, boards[scratch][toY][toX]); break; case WhiteWins: // [HGM] rescom: save last comment as result details case BlackWins: case GameIsDrawn: case GameUnfinished: if(!currentListGame) break; + if(currentListGame->gameInfo.result == GameUnfinished) + currentListGame->gameInfo.result = cm; // correct result tag with actual result if (currentListGame->gameInfo.resultDetails != NULL) { free(currentListGame->gameInfo.resultDetails); } - if(yy_text[0] == '{') { char *p; - safeStrCpy(lastComment, yy_text+1, sizeof(lastComment)/sizeof(lastComment[0])); - if(p = strchr(lastComment, '}')) *p = 0; - currentListGame->gameInfo.resultDetails = StrSave(lastComment); + if(yy_text[0] == '{') { + char *p; + safeStrCpy(lastComment, yy_text+1, sizeof(lastComment)/sizeof(lastComment[0])); + if((p = strchr(lastComment, '}'))) *p = 0; + currentListGame->gameInfo.resultDetails = StrSave(lastComment); } break; default: break; } if(gameNumber % 1000 == 0) { - snprintf(buf, MSG_SIZ,"Reading game file (%d)", gameNumber); - DisplayTitle(buf); + snprintf(buf, MSG_SIZ, _("Reading game file (%d)"), gameNumber); + DisplayTitle(buf); DoEvents(); } } while (cm != (ChessMove) 0); + if(currentListGame) { + if(!currentListGame->moves) DisplayError("Game cache overflowed\nPosition-searching might not work properly", 0); + if (appData.debugMode) { for (currentListGame = (ListGame *) gameList.head; currentListGame->node.succ; @@ -369,8 +395,10 @@ struct { PrintPGNTags(debugFP, ¤tListGame->gameInfo); } } -GetTimeMark(&t2);printf("GameListBuild %d msec\n", SubtractTimeMarks(&t2,&t)); + } + if(appData.debugMode) { GetTimeMark(&t2);printf("GameListBuild %ld msec\n", SubtractTimeMarks(&t2,&t)); } quickFlag = 0; + PackGame(boards[scratch]); // for appending end-of-game marker. DisplayTitle("WinBoard"); rewind(f); yyskipmoves = FALSE; @@ -380,8 +408,8 @@ GetTimeMark(&t2);printf("GameListBuild %d msec\n", SubtractTimeMarks(&t2,&t)); /* Clear an existing GameInfo structure. */ -void ClearGameInfo(gameInfo) - GameInfo *gameInfo; +void +ClearGameInfo (GameInfo *gameInfo) { if (gameInfo->event != NULL) { free(gameInfo->event); @@ -413,6 +441,9 @@ void ClearGameInfo(gameInfo) if (gameInfo->extraTags != NULL) { free(gameInfo->extraTags); } + if (gameInfo->variantName != NULL) { + free(gameInfo->variantName); + } if (gameInfo->outOfBook != NULL) { free(gameInfo->outOfBook); } @@ -421,9 +452,7 @@ void ClearGameInfo(gameInfo) /* [AS] Replaced by "dynamic" tag selection below */ char * -GameListLineOld(number, gameInfo) - int number; - GameInfo *gameInfo; +GameListLineOld (int number, GameInfo *gameInfo) { char *event = (gameInfo->event && strcmp(gameInfo->event, "?") != 0) ? gameInfo->event : gameInfo->site ? gameInfo->site : "?"; @@ -440,7 +469,8 @@ GameListLineOld(number, gameInfo) #define MAX_FIELD_LEN 80 /* To avoid overflowing the buffer */ -char * GameListLine( int number, GameInfo * gameInfo ) +char * +GameListLine (int number, GameInfo * gameInfo) { char buffer[2*MSG_SIZ]; char * buf = buffer; @@ -490,6 +520,8 @@ char * GameListLine( int number, GameInfo * gameInfo ) strncpy( buf, gameInfo->timeControl ? gameInfo->timeControl : "?", MAX_FIELD_LEN ); break; case GLT_VARIANT: + strncpy( buf, gameInfo->variantName ? gameInfo->variantName : VariantName(gameInfo->variant), MAX_FIELD_LEN ); +// strncpy( buf, VariantName(gameInfo->variant), MAX_FIELD_LEN ); break; case GLT_OUT_OF_BOOK: strncpy( buf, gameInfo->outOfBook ? gameInfo->outOfBook : "?", MAX_FIELD_LEN ); @@ -517,7 +549,8 @@ char * GameListLine( int number, GameInfo * gameInfo ) return strdup( buffer ); } -char * GameListLineFull( int number, GameInfo * gameInfo ) +char * +GameListLineFull (int number, GameInfo * gameInfo) { char * event = gameInfo->event ? gameInfo->event : "?"; char * site = gameInfo->site ? gameInfo->site : "?"; @@ -565,7 +598,8 @@ static GLT_Item GLT_ItemInfo[] = { char lpUserGLT[LPUSERGLT_SIZE]; // back-end: convert the tag id-char to a full tag name -char * GLT_FindItem( char id ) +char * +GLT_FindItem (char id) { char * result = 0; @@ -585,7 +619,7 @@ char * GLT_FindItem( char id ) // back-end: build the list of tag names void -GLT_TagsToList( char * tags ) +GLT_TagsToList (char *tags) { char * pc = tags; @@ -612,7 +646,7 @@ GLT_TagsToList( char * tags ) // back-end: retrieve item from dialog and translate to id-char char -GLT_ListItemToTag( int index ) +GLT_ListItemToTag (int index) { char result = '\0'; char name[MSG_SIZ]; @@ -635,7 +669,7 @@ GLT_ListItemToTag( int index ) // back-end: add items id-chars one-by-one to temp tags string void -GLT_ParseList() +GLT_ParseList () { char * pc = lpUserGLT; int idx = 0; @@ -647,4 +681,3 @@ GLT_ParseList() idx++; } while( id != '\0' ); } -