X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=common.h;h=5f8f5f1bc954acfc8ada87e8bd6b4a59a2633e33;hb=c69beebf3decbe67eb92beab56bbc34c41c39831;hp=d0850c7e04369755579966f39985b6faaa467c81;hpb=e3e3615246633473d0ea262f6d3974d6a49cfd01;p=xboard.git diff --git a/common.h b/common.h index d0850c7..5f8f5f1 100644 --- a/common.h +++ b/common.h @@ -5,7 +5,7 @@ * Massachusetts. * * Enhancements Copyright 1992-2001, 2002, 2003, 2004, 2005, 2006, - * 2007, 2008, 2009, 2010 Free Software Foundation, Inc. + * 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. * * Enhancements Copyright 2005 Alessandro Scotti * @@ -180,7 +180,8 @@ int pclose(FILE *); #define COMMENT_FONT 4 #define EDITTAGS_FONT 5 #define MOVEHISTORY_FONT 6 -#define NUM_FONTS 7 +#define GAMELIST_FONT 7 +#define NUM_FONTS 8 /* Default to no flashing (the "usual" XBoard behavior) */ #define FLASH_COUNT 0 /* Number of times to flash */ @@ -320,6 +321,7 @@ typedef enum { VariantTwilight, VariantMakruk, VariantSChess, + VariantGrand, VariantSpartan, VariantUnknown /* Catchall for other unknown variants */ } VariantClass; @@ -365,10 +367,13 @@ typedef enum { "twilight",\ "makruk",\ "seirawan",\ + "grand",\ "spartan",\ "unknown" \ } +#define ENGINES 2 + typedef struct { char *language; #if !defined(_amigados) @@ -390,19 +395,16 @@ typedef struct { #endif int movesPerSession; float timeIncrement; - char *initString; - char *secondInitString; - char *firstComputerString; - char *secondComputerString; - char *firstChessProgram; - char *secondChessProgram; - char *firstDirectory; - char *secondDirectory; + 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; @@ -500,8 +502,7 @@ typedef struct { char *soundIcsDraw; char *soundIcsUnfinished; Boolean disguise; /* [HGM] Promoted Pawns look like pieces in bughouse */ - Boolean reuseFirst; - Boolean reuseSecond; + 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 */ @@ -523,17 +524,17 @@ typedef struct { char *initialMode; char *variant; char *chatBoxes; - int firstProtocolVersion; - int secondProtocolVersion; + 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 */ + Boolean useBitmaps; + Boolean useFont; char * liteBackTextureFile; /* Name of texture bitmap for lite squares */ char * darkBackTextureFile; /* Name of texture bitmap for dark squares */ int liteBackTextureMode; @@ -565,11 +566,10 @@ typedef struct { 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; @@ -623,29 +623,28 @@ 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; + int eloThreshold1; /* [HGM] select */ + int eloThreshold2; + int dateThreshold; + int searchMode; char *userName; int rewindIndex; /* [HGM] autoinc */ int sameColorGames; /* [HGM] alternate */ 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 */ @@ -653,8 +652,25 @@ typedef struct { Boolean useInternalWrap; /* use internal wrapping -- noJoin usurps this if set */ Boolean pasteSelection; /* paste X selection instead of clipboard */ int nrVariations; /* [HGM] multivar */ + int zoom; /* [HGM] evalGraph */ + int evalThreshold; /* [HGM] evalGraph */ Boolean dropMenu; /* [HGM] pv */ Boolean markers; /* [HGM] markers */ + Boolean pieceMenu; + Boolean sweepSelect; + Boolean whitePOV; + Boolean scoreWhite; + Boolean pvSAN[ENGINES]; + + char *tourneyFile; + char *defName; + char *processes; + char *results; + char *participants; + int tourneyType; + int tourneyCycles; + Boolean roundSync; + Boolean cycleSync; } AppData, *AppDataPtr; /* PGN tags (for showing in the game list) */ @@ -734,6 +750,45 @@ extern WindowPlacement wpTags; 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