Describe -overrideLineGap option in texi file

[xboard.git] / gamelist.c

diff --git a/gamelist.c b/gamelist.c
index aae489a..8497192 100644 (file)
--- a/gamelist.c
+++ b/gamelist.c
@@ -1,7 +1,7 @@
 /*
  * gamelist.c -- Functions to manage a gamelist
  *
 /*
  * gamelist.c -- Functions to manage a gamelist
  *

- * Copyright 1995,2009 Free Software Foundation, Inc.
+ * Copyright 1995, 2009, 2010, 2011 Free Software Foundation, Inc.

  *
  * Enhancements Copyright 2005 Alessandro Scotti
  *
  *
  * Enhancements Copyright 2005 Alessandro Scotti
  *


@@ -18,7 +18,7 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License

- * along with this program. If not, see http://www.gnu.org/licenses/.  
+ * along with this program. If not, see http://www.gnu.org/licenses/.

  *
  *------------------------------------------------------------------------
  ** See the file ChangeLog for a revision history.  */
  *
  *------------------------------------------------------------------------
  ** See the file ChangeLog for a revision history.  */


@@ -42,12 +42,24 @@
 #include "frontend.h"
 #include "backend.h"
 #include "parser.h"
 #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
  */
 List gameList;
 
 
 /* Variables
  */
 List gameList;

-
+extern Board initialPosition;
+extern int quickFlag;
+extern int movePtr;

 
 /* Local function prototypes
  */
 
 /* Local function prototypes
  */


@@ -212,20 +224,24 @@ int GameListBuild(f)
     ChessMove cm, lastStart;
     int gameNumber;
     ListGame *currentListGame = NULL;
     ChessMove cm, lastStart;
     int gameNumber;
     ListGame *currentListGame = NULL;

-    int error;
+    int error, scratch=100, plyNr=0, fromX, fromY, toX, toY;

     int offset;
     int offset;

-    char lastComment[MSG_SIZ];
+    char lastComment[MSG_SIZ], buf[MSG_SIZ];
+    TimeMark t, t2;

 
 

+    GetTimeMark(&t);

     GameListFree(&gameList);
     yynewfile(f);
     gameNumber = 0;
     GameListFree(&gameList);
     yynewfile(f);
     gameNumber = 0;

+    movePtr = 0;

 
     lastStart = (ChessMove) 0;
     yyskipmoves = FALSE;
     do {
 
     lastStart = (ChessMove) 0;
     yyskipmoves = FALSE;
     do {

-        yyboardindex = 0;
+        yyboardindex = scratch;

        offset = yyoffset();
        offset = yyoffset();

-       cm = (ChessMove) yylex();
+       quickFlag = plyNr + 1;
+       cm = (ChessMove) Myylex();

        switch (cm) {
          case GNUChessGame:
            if ((error = GameListNewGame(&currentListGame))) {
        switch (cm) {
          case GNUChessGame:
            if ((error = GameListNewGame(&currentListGame))) {


@@ -235,6 +251,7 @@ int GameListBuild(f)
            }
            currentListGame->number = ++gameNumber;
            currentListGame->offset = offset;
            }
            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);
            }
            if (currentListGame->gameInfo.event != NULL) {
                free(currentListGame->gameInfo.event);
            }


@@ -261,6 +278,7 @@ int GameListBuild(f)
                }
                currentListGame->number = ++gameNumber;
                currentListGame->offset = offset;
                }
                currentListGame->number = ++gameNumber;
                currentListGame->offset = offset;

+               if(1) { CopyBoard(boards[scratch], initialPosition); plyNr = 0; currentListGame->moves = PackGame(boards[scratch]); }

                lastStart = cm;
                break;
              default:
                lastStart = cm;
                break;
              default:


@@ -280,15 +298,24 @@ int GameListBuild(f)
            do {
                yyboardindex = 1;
                offset = yyoffset();
            do {
                yyboardindex = 1;
                offset = yyoffset();

-               cm = (ChessMove) yylex();
+               cm = (ChessMove) Myylex();

                if (cm == PGNTag) {
                    ParsePGNTag(yy_text, &currentListGame->gameInfo);
                }
            } while (cm == PGNTag || cm == Comment);
                if (cm == PGNTag) {
                    ParsePGNTag(yy_text, &currentListGame->gameInfo);
                }
            } while (cm == PGNTag || cm == Comment);

-           break;
+           if(1) {
+               int btm=0;
+               if(currentListGame->gameInfo.fen) ParseFEN(boards[scratch], &btm, currentListGame->gameInfo.fen);
+               else CopyBoard(boards[scratch], initialPosition);
+               plyNr = (btm != 0);
+               currentListGame->moves = PackGame(boards[scratch]);
+           }
+           if(cm != NormalMove) break;
+         case IllegalMove:
+               if(appData.testLegality) break;

          case NormalMove:
            /* Allow the first game to start with an unnumbered move */
          case NormalMove:
            /* Allow the first game to start with an unnumbered move */

-           yyskipmoves = TRUE;
+           yyskipmoves = FALSE;

            if (lastStart == (ChessMove) 0) {
              if ((error = GameListNewGame(&currentListGame))) {
                rewind(f);
            if (lastStart == (ChessMove) 0) {
              if ((error = GameListNewGame(&currentListGame))) {
                rewind(f);


@@ -297,28 +324,62 @@ int GameListBuild(f)
              }
              currentListGame->number = ++gameNumber;
              currentListGame->offset = offset;
              }
              currentListGame->number = ++gameNumber;
              currentListGame->offset = offset;

+             if(1) { CopyBoard(boards[scratch], initialPosition); plyNr = 0; currentListGame->moves = PackGame(boards[scratch]); }

              lastStart = MoveNumberOne;
            }
              lastStart = MoveNumberOne;
            }

+         case WhiteCapturesEnPassant:
+         case BlackCapturesEnPassant:
+         case WhitePromotion:
+         case BlackPromotion:
+         case WhiteNonPromotion:
+         case BlackNonPromotion:
+         case WhiteKingSideCastle:
+         case WhiteQueenSideCastle:
+         case BlackKingSideCastle:
+         case BlackQueenSideCastle:
+         case WhiteKingSideCastleWild:
+         case WhiteQueenSideCastleWild:
+         case BlackKingSideCastleWild:
+         case BlackQueenSideCastleWild:
+         case WhiteHSideCastleFR:
+         case WhiteASideCastleFR:
+         case BlackHSideCastleFR:
+         case BlackASideCastleFR:
+               fromX = currentMoveString[0] - AAA;
+               fromY = currentMoveString[1] - ONE;
+               toX = currentMoveString[2] - AAA;
+               toY = currentMoveString[3] - ONE;
+               plyNr++;
+               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:
            break;
         case WhiteWins: // [HGM] rescom: save last comment as result details
         case BlackWins:
         case GameIsDrawn:
         case GameUnfinished:

+           if(!currentListGame) break;

            if (currentListGame->gameInfo.resultDetails != NULL) {
                free(currentListGame->gameInfo.resultDetails);
            }
            if (currentListGame->gameInfo.resultDetails != NULL) {
                free(currentListGame->gameInfo.resultDetails);
            }

-           if(yy_text[0] == '{') { char *p;
-               strcpy(lastComment, yy_text+1);
-               if(p = strchr(lastComment, '}')) *p = 0;
+           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;
        }
                currentListGame->gameInfo.resultDetails = StrSave(lastComment);
            }
            break;
          default:
            break;
        }

+       if(gameNumber % 1000 == 0) {
+           snprintf(buf, MSG_SIZ, _("Reading game file (%d)"), gameNumber);
+           DisplayTitle(buf);
+       }

     }
     while (cm != (ChessMove) 0);
 
     }
     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;
 
     if (appData.debugMode) {
        for (currentListGame = (ListGame *) gameList.head;


@@ -330,7 +391,11 @@ int GameListBuild(f)
            PrintPGNTags(debugFP, &currentListGame->gameInfo);
        }
     }
            PrintPGNTags(debugFP, &currentListGame->gameInfo);
        }
     }

-
+  }
+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;
     return 0;
     rewind(f);
     yyskipmoves = FALSE;
     return 0;


@@ -389,7 +454,7 @@ GameListLineOld(number, gameInfo)
     char *white = gameInfo->white ? gameInfo->white : "?";
     char *black = gameInfo->black ? gameInfo->black : "?";
     char *date = gameInfo->date ? gameInfo->date : "?";
     char *white = gameInfo->white ? gameInfo->white : "?";
     char *black = gameInfo->black ? gameInfo->black : "?";
     char *date = gameInfo->date ? gameInfo->date : "?";

-    int len = 10 + strlen(event) + 2 + strlen(white) + 1 + 
+    int len = 10 + strlen(event) + 2 + strlen(white) + 1 +

       strlen(black) + 11 + strlen(date) + 1;
     char *ret = (char *) malloc(len);
     sprintf(ret, "%d. %s, %s-%s, %s, %s",
       strlen(black) + 11 + strlen(date) + 1;
     char *ret = (char *) malloc(len);
     sprintf(ret, "%d. %s, %s-%s, %s, %s",


@@ -401,10 +466,10 @@ GameListLineOld(number, gameInfo)
 
 char * GameListLine( int number, GameInfo * gameInfo )
 {
 
 char * GameListLine( int number, GameInfo * gameInfo )
 {

-    char buffer[1024];
+    char buffer[2*MSG_SIZ];

     char * buf = buffer;
     char * glt = appData.gameListTags;
     char * buf = buffer;
     char * glt = appData.gameListTags;

-    
+

     buf += sprintf( buffer, "%d.", number );
 
     while( *glt != '\0' ) {
     buf += sprintf( buffer, "%d.", number );
 
     while( *glt != '\0' ) {


@@ -431,19 +496,19 @@ char * GameListLine( int number, GameInfo * gameInfo )
             strncpy( buf, gameInfo->black ? gameInfo->black : "?", MAX_FIELD_LEN );
             break;
         case GLT_RESULT:
             strncpy( buf, gameInfo->black ? gameInfo->black : "?", MAX_FIELD_LEN );
             break;
         case GLT_RESULT:

-            strcpy( buf, PGNResult(gameInfo->result) );
+           safeStrCpy( buf, PGNResult(gameInfo->result), 2*MSG_SIZ );

             break;
         case GLT_WHITE_ELO:
             if( gameInfo->whiteRating > 0 )
             break;
         case GLT_WHITE_ELO:
             if( gameInfo->whiteRating > 0 )

-                sprintf( buf, "%d", gameInfo->whiteRating );
+             sprintf( buf,  "%d", gameInfo->whiteRating );

             else
             else

-                strcpy( buf, "?" );
+             safeStrCpy( buf, "?" , 2*MSG_SIZ);

             break;
         case GLT_BLACK_ELO:
             if( gameInfo->blackRating > 0 )
                 sprintf( buf, "%d", gameInfo->blackRating );
             else
             break;
         case GLT_BLACK_ELO:
             if( gameInfo->blackRating > 0 )
                 sprintf( buf, "%d", gameInfo->blackRating );
             else

-                strcpy( buf, "?" );
+             safeStrCpy( buf, "?" , 2*MSG_SIZ);

             break;
         case GLT_TIME_CONTROL:
             strncpy( buf, gameInfo->timeControl ? gameInfo->timeControl : "?", MAX_FIELD_LEN );
             break;
         case GLT_TIME_CONTROL:
             strncpy( buf, gameInfo->timeControl ? gameInfo->timeControl : "?", MAX_FIELD_LEN );


@@ -486,7 +551,7 @@ char * GameListLineFull( int number, GameInfo * gameInfo )
     char * date = gameInfo->date ? gameInfo->date : "?";
     char * oob = gameInfo->outOfBook ? gameInfo->outOfBook : "";
     char * reason = gameInfo->resultDetails ? gameInfo->resultDetails : "";
     char * date = gameInfo->date ? gameInfo->date : "?";
     char * oob = gameInfo->outOfBook ? gameInfo->outOfBook : "";
     char * reason = gameInfo->resultDetails ? gameInfo->resultDetails : "";

-    
+

     int len = 64 + strlen(event) + strlen(site) + strlen(white) + strlen(black) + strlen(date) + strlen(oob) + strlen(reason);
 
     char *ret = (char *) malloc(len);
     int len = 64 + strlen(event) + strlen(site) + strlen(white) + strlen(black) + strlen(date) + strlen(oob) + strlen(reason);
 
     char *ret = (char *) malloc(len);


@@ -496,7 +561,6 @@ char * GameListLineFull( int number, GameInfo * gameInfo )
 
     return ret;
 }
 
     return ret;
 }

-

 // --------------------------------------- Game-List options dialog --------------------------------------
 
 // back-end
 // --------------------------------------- Game-List options dialog --------------------------------------
 
 // back-end


@@ -522,7 +586,7 @@ static GLT_Item GLT_ItemInfo[] = {
     { 0, 0 }
 };
 
     { 0, 0 }
 };
 

-char lpUserGLT[64];
+char lpUserGLT[LPUSERGLT_SIZE];

 
 // back-end: convert the tag id-char to a full tag name
 char * GLT_FindItem( char id )
 
 // back-end: convert the tag id-char to a full tag name
 char * GLT_FindItem( char id )


@@ -575,7 +639,7 @@ char
 GLT_ListItemToTag( int index )
 {
     char result = '\0';
 GLT_ListItemToTag( int index )
 {
     char result = '\0';

-    char name[128];
+    char name[MSG_SIZ];

 
     GLT_Item * list = GLT_ItemInfo;
 
 
     GLT_Item * list = GLT_ItemInfo;