X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=common.h;h=fadc73d0448acb8d8c5063cc687d66dc376aee2c;hb=cde66749ec8a0b3c823bbc7aa3818b86821514ec;hp=cd21c7e90dfa21a61d1a2a3683f125b853e511cd;hpb=8f1501373295f172dd1118391c6ee914ecbc4e67;p=xboard.git diff --git a/common.h b/common.h index cd21c7e..fadc73d 100644 --- a/common.h +++ b/common.h @@ -5,7 +5,7 @@ * Massachusetts. * * Enhancements Copyright 1992-2001, 2002, 2003, 2004, 2005, 2006, - * 2007, 2008, 2009 Free Software Foundation, Inc. + * 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. * * Enhancements Copyright 2005 Alessandro Scotti * @@ -154,7 +154,7 @@ int pclose(FILE *); #define FIRST_HOST "localhost" #define SECOND_HOST "localhost" #define TELNET_PROGRAM "telnet" -#define DEF_BITMAP_DIR "/usr/share/games/xboard/bitmaps.xchess" /* AP: shouldn't be hardcoded directory, but better than nothing at the moment */ +#define DEF_BITMAP_DIR BITMAPDIR #define MATCH_MODE "False" #define INIT_STRING "new\nrandom\n" #define WHITE_STRING "white\ngo\n" @@ -250,23 +250,20 @@ typedef enum { typedef ChessSquare Board[BOARD_RANKS][BOARD_FILES]; typedef enum { - WhiteKingSideCastle = 1, WhiteQueenSideCastle, + EndOfFile = 0, + WhiteKingSideCastle, WhiteQueenSideCastle, WhiteKingSideCastleWild, WhiteQueenSideCastleWild, WhiteHSideCastleFR, WhiteASideCastleFR, BlackKingSideCastle, BlackQueenSideCastle, BlackKingSideCastleWild, BlackQueenSideCastleWild, BlackHSideCastleFR, BlackASideCastleFR, - WhitePromotionKnight, WhitePromotionBishop, - WhitePromotionRook, WhitePromotionQueen, WhitePromotionKing, - WhitePromotionChancellor, WhitePromotionArchbishop, WhitePromotionCentaur, - BlackPromotionKnight, BlackPromotionBishop, - BlackPromotionRook, BlackPromotionQueen, BlackPromotionKing, - BlackPromotionChancellor, BlackPromotionArchbishop, BlackPromotionCentaur, + WhitePromotion, WhiteNonPromotion, + BlackPromotion, BlackNonPromotion, WhiteCapturesEnPassant, BlackCapturesEnPassant, WhiteDrop, BlackDrop, NormalMove, AmbiguousMove, IllegalMove, ImpossibleMove, WhiteWins, BlackWins, GameIsDrawn, GameUnfinished, - GNUChessGame, XBoardGame, MoveNumberOne, + GNUChessGame, XBoardGame, MoveNumberOne, Open, Close, Nothing, Comment, PositionDiagram, ElapsedTime, PGNTag, NAG } ChessMove; @@ -321,6 +318,9 @@ typedef enum { VariantSuper, VariantGreat, VariantTwilight, + VariantMakruk, + VariantSChess, + VariantSpartan, VariantUnknown /* Catchall for other unknown variants */ } VariantClass; @@ -363,10 +363,16 @@ typedef enum { "super",\ "great",\ "twilight",\ + "makruk",\ + "seirawan",\ + "spartan",\ "unknown" \ } +#define ENGINES 2 + typedef struct { + char *language; #if !defined(_amigados) char *whitePieceColor; char *blackPieceColor; @@ -385,20 +391,17 @@ typedef struct { int premoveHighlightColor; #endif int movesPerSession; - int timeIncrement; - char *initString; - char *secondInitString; - char *firstComputerString; - char *secondComputerString; - char *firstChessProgram; - char *secondChessProgram; - char *firstDirectory; - char *secondDirectory; + float timeIncrement; + char *engInitString[ENGINES]; + char *computerString[ENGINES]; + char *chessProgram[ENGINES]; + char *directory[ENGINES]; + char *pgnName[ENGINES]; Boolean firstPlaysBlack; Boolean noChessProgram; - char *firstHost; - char *secondHost; + char *host[ENGINES]; char *bitmapDirectory; + char *soundDirectory; char *remoteShell; char *remoteUser; float timeDelay; @@ -411,6 +414,8 @@ typedef struct { char *icsHelper; Boolean icsInputBox; Boolean useTelnet; + Boolean seekGraph; + Boolean autoRefresh; char *telnetProgram; char *gateway; char *loadGameFile; @@ -444,6 +449,7 @@ typedef struct { char *cmailGameName; /* xboard only */ Boolean alwaysPromoteToQueen; Boolean oldSaveStyle; + Boolean oneClick; Boolean quietPlay; Boolean showThinking; Boolean ponderNextMove; @@ -492,8 +498,8 @@ typedef struct { char *soundIcsLoss; char *soundIcsDraw; char *soundIcsUnfinished; - Boolean reuseFirst; - Boolean reuseSecond; + Boolean disguise; /* [HGM] Promoted Pawns look like pieces in bughouse */ + Boolean reuse[ENGINES]; Boolean animateDragging; /* If True, animate mouse dragging of pieces */ Boolean animate; /* If True, animate non-mouse moves */ int animSpeed; /* Delay in milliseconds between animation frames */ @@ -514,14 +520,14 @@ typedef struct { int fontSizeTolerance; /* xboard only */ char *initialMode; char *variant; - int firstProtocolVersion; - int secondProtocolVersion; + char *chatBoxes; + int protocolVersion[ENGINES]; Boolean showButtonBar; Boolean icsEngineAnalyze; + Boolean variations; /* [HGM] enable variation-tree walking */ /* [AS] New properties (down to the "ZIPPY" part) */ - Boolean firstScoreIsAbsolute; /* If true, engine score is always from white side */ - Boolean secondScoreIsAbsolute; /* If true, engine score is always from white side */ + Boolean scoreIsAbsolute[ENGINES]; /* If true, engine score is always from white side */ Boolean saveExtendedInfoInPGN; /* If true, saved PGN games contain extended info */ Boolean hideThinkingFromHuman; /* If true, program thinking is generated but not displayed in human/computer matches */ char * liteBackTextureFile; /* Name of texture bitmap for lite squares */ @@ -550,20 +556,24 @@ typedef struct { Boolean highlightMoveWithArrow; int highlightArrowColor; Boolean useStickyWindows; + Boolean bgObserve; /* [HGM] bughouse */ + Boolean dualBoard; /* [HGM] dual */ int adjudicateDrawMoves; Boolean autoDisplayComment; Boolean autoDisplayTags; - Boolean firstIsUCI; - Boolean secondIsUCI; - Boolean firstHasOwnBookUCI; - Boolean secondHasOwnBookUCI; + Boolean isUCI[ENGINES]; + Boolean hasOwnBookUCI[ENGINES]; char * adapterCommand; + char * ucciAdapter; char * polyglotDir; Boolean usePolyglotBook; char * polyglotBook; + int bookDepth; + int bookStrength; int defaultHashSize; int defaultCacheSizeEGTB; char * defaultPathEGTB; + int defaultMatchGames; /* [HGM] Board size */ int NrFiles; @@ -571,6 +581,8 @@ typedef struct { int holdingsSize; int matchPause; char * pieceToCharTable; + char * pieceNickNames; + char * colorNickNames; Boolean allWhite; Boolean upsideDown; Boolean alphaRank; @@ -606,13 +618,10 @@ typedef struct { char *serverMovesName; Boolean suppressLoadMoves; int serverPause; - int firstTimeOdds; - int secondTimeOdds; + int timeOdds[ENGINES]; int timeOddsMode; - int firstAccumulateTC; - int secondAccumulateTC; - int firstNPS; - int secondNPS; + int accumulateTC[ENGINES]; + int NPS[ENGINES]; Boolean autoKibitz; int engineComments; char *userName; @@ -621,14 +630,12 @@ typedef struct { int smpCores; /* [HGM] SMP */ char *egtFormats; int niceEngines; /* [HGM] nice */ - char *firstLogo; /* [HGM] logo */ - char *secondLogo; + char *logo[ENGINES];/* [HGM] logo */ + char *pairingEngine;/* [HGM] pairing */ Boolean autoLogo; Boolean noGUI; /* [HGM] fast: suppress all display updates */ - char *firstOptions; /* [HGM] options */ - char *secondOptions; - char *fenOverride1; - char *fenOverride2; + char *engOptions[ENGINES]; /* [HGM] options */ + char *fenOverride[ENGINES]; Boolean keepAlive; /* [HGM] alive */ Boolean forceIllegal;/*[HGM] illegal */ Boolean noJoin; /* [HGM] join */ @@ -636,9 +643,27 @@ typedef struct { Boolean useInternalWrap; /* use internal wrapping -- noJoin usurps this if set */ Boolean pasteSelection; /* paste X selection instead of clipboard */ int nrVariations; /* [HGM] multivar */ + Boolean dropMenu; /* [HGM] pv */ + Boolean markers; /* [HGM] markers */ + Boolean pieceMenu; + Boolean sweepSelect; + Boolean whitePOV; + Boolean pvSAN[ENGINES]; + + char *tourneyFile; + char *defName; + char *processes; + char *results; + char *participants; + int tourneyType; + int tourneyCycles; + Boolean roundSync; + Boolean cycleSync; } AppData, *AppDataPtr; -/* [AS] PGN tags (for showing in the game list) */ +/* PGN tags (for showing in the game list) */ +#define LPUSERGLT_SIZE 64 + #define GLT_EVENT 'e' #define GLT_SITE 's' #define GLT_DATE 'd' @@ -709,10 +734,49 @@ extern WindowPlacement wpGameList; extern WindowPlacement wpTags; // [HGM] chat -#define MAX_CHAT 3 +#define MAX_CHAT 5 extern int chatCount; extern char chatPartner[MAX_CHAT][MSG_SIZ]; +// [HGM] generally useful macros; there are way too many memory leaks... +#define FREE(x) if(x) free(x) +#define ASSIGN(x, y) if(x) free(x); x = strdup(y) + +// [HGM] for now we use the kludge to redefine all the unstructured options by their array counterpart +// in due time we would have to make the actual substitutions all through the source + +#define firstInitString engInitString[0] +#define secondInitString engInitString[1] +#define firstComputerString computerString[0] +#define secondComputerString computerString[1] +#define firstChessProgram chessProgram[0] +#define secondChessProgram chessProgram[1] +#define firstDirectory directory[0] +#define secondDirectory directory[1] +#define firstProtocolVersion protocolVersion[0] +#define secondProtocolVersion protocolVersion[1] +#define firstScoreIsAbsolute scoreIsAbsolute[0] +#define secondScoreIsAbsolute scoreIsAbsolute[1] +#define firstHasOwnBookUCI hasOwnBookUCI[0] +#define secondHasOwnBookUCI hasOwnBookUCI[1] +#define firstTimeOdds timeOdds[0] +#define secondTimeOdds timeOdds[1] +#define firstAccumulateTC accumulateTC[0] +#define secondAccumulateTC accumulateTC[1] +#define firstHost host[0] +#define secondHost host[1] +#define reuseFirst reuse[0] +#define reuseSecond reuse[1] +#define firstIsUCI isUCI[0] +#define secondIsUCI isUCI[1] +#define firstNPS NPS[0] +#define secondNPS NPS[1] +#define firstLogo logo[0] +#define secondLogo logo[1] +#define fenOverride1 fenOverride[0] +#define fenOverride2 fenOverride[1] +#define firstOptions engOptions[0] +#define secondOptions engOptions[1] #endif