* Massachusetts.
*
* Enhancements Copyright 1992-2001, 2002, 2003, 2004, 2005, 2006,
- * 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
+ * 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Free Software Foundation, Inc.
*
* Enhancements Copyright 2005 Alessandro Scotti
*
} IcsTextMenuEntry;
IcsTextMenuEntry icsTextMenuEntry[ICS_TEXT_MENU_SIZE];
+char dataDir[MSG_SIZ] = DATADIR;
int junk;
-unsigned int saveDate;
-unsigned int dateStamp;
+int saveDate;
+int dateStamp;
Boolean singleList;
Boolean autoClose;
char *homeDir;
{ "pieceImageDirectory", ArgFilename, (void *) &appData.pieceDirectory, TRUE, (ArgIniType) "" },
{ "pid", ArgFilename, (void *) &appData.pieceDirectory, FALSE, INVALID },
{ "trueColors", ArgBoolean, (void *) &appData.trueColors, TRUE, (ArgIniType) FALSE },
+ { "jewelled", ArgInt, (void *) &appData.jewelled, FALSE, (ArgIniType) -1 },
{ "soundDirectory", ArgFilename, (void *) &appData.soundDirectory, XBOARD, (ArgIniType) "" },
{ "msLoginDelay", ArgInt, (void *) &appData.msLoginDelay, XBOARD, (ArgIniType) MS_LOGIN_DELAY },
{ "pasteSelection", ArgBoolean, (void *) &appData.pasteSelection, XBOARD, (ArgIniType) FALSE },
{ "dropMenu", ArgBoolean, (void *) &appData.dropMenu, TRUE, (ArgIniType) FALSE },
{ "pieceMenu", ArgBoolean, (void *) &appData.pieceMenu, TRUE, (ArgIniType) TRUE },
{ "sweepPromotions", ArgBoolean, (void *) &appData.sweepSelect, TRUE, (ArgIniType) FALSE },
+ { "monoMouse", ArgBoolean, (void *) &appData.monoMouse, XBOARD, (ArgIniType) FALSE },
{ "remoteShell", ArgFilename, (void *) &appData.remoteShell, FALSE, (ArgIniType) REMOTE_SHELL },
{ "rsh", ArgFilename, (void *) &appData.remoteShell, FALSE, INVALID },
{ "remoteUser", ArgString, (void *) &appData.remoteUser, FALSE, (ArgIniType) "" },
{ "lpf", ArgFilename, (void *) &appData.loadPositionFile, FALSE, INVALID },
{ "loadPositionIndex", ArgInt, (void *) &appData.loadPositionIndex, FALSE, (ArgIniType) 1 },
{ "lpi", ArgInt, (void *) &appData.loadPositionIndex, FALSE, INVALID },
+ { "positionDir", ArgFilename, (void *) &appData.positionDir, FALSE, (ArgIniType) "" },
{ "savePositionFile", ArgFilename, (void *) &appData.savePositionFile, FALSE, (ArgIniType) "" },
{ "spf", ArgFilename, (void *) &appData.savePositionFile, FALSE, INVALID },
{ "matchMode", ArgBoolean, (void *) &appData.matchMode, FALSE, (ArgIniType) FALSE },
TRUE, (ArgIniType) FCP_NAMES },
{ "secondChessProgramNames", ArgString, (void *) &secondChessProgramNames,
!XBOARD, (ArgIniType) SCP_NAMES },
- { "themeNames", ArgString, (void *) &appData.themeNames, !XBOARD, (ArgIniType) "native -upf false -ub false -ubt false -pid \"\"\n" },
+ { "themeNames", ArgString, (void *) &appData.themeNames, TRUE, (ArgIniType) "native -upf false -ub false -ubt false -pid \"\"\n" },
{ "addMasterOption", ArgMaster, NULL, FALSE, INVALID },
{ "installEngine", ArgInstall, (void *) &firstChessProgramNames, FALSE, (ArgIniType) "" },
+ { "installTheme", ArgInstall, (void *) &appData.themeNames, FALSE, (ArgIniType) "" },
{ "initialMode", ArgString, (void *) &appData.initialMode, FALSE, (ArgIniType) "" },
{ "mode", ArgString, (void *) &appData.initialMode, FALSE, INVALID },
{ "variant", ArgString, (void *) &appData.variant, FALSE, (ArgIniType) "normal" },
{ "pgnEventHeader", ArgString, (void *) &appData.pgnEventHeader, TRUE, (ArgIniType) "Computer Chess Game" },
{ "defaultFrcPosition", ArgInt, (void *) &appData.defaultFrcPosition, TRUE, (ArgIniType) -1 },
{ "shuffleOpenings", ArgTrue, (void *) &shuffleOpenings, FALSE, INVALID },
+ { "fischerCastling", ArgTrue, (void *) &appData.fischerCastling, FALSE, INVALID },
{ "gameListTags", ArgString, (void *) &appData.gameListTags, TRUE, (ArgIniType) GLT_DEFAULT_TAGS },
{ "saveOutOfBookInfo", ArgBoolean, (void *) &appData.saveOutOfBookInfo, TRUE, (ArgIniType) TRUE },
{ "showEvalInMoveHistory", ArgBoolean, (void *) &appData.showEvalInMoveHistory, TRUE, (ArgIniType) TRUE },
{ "ub", ArgBoolean, (void *) &appData.useBorder, FALSE, INVALID },
{ "border", ArgFilename, (void *) &appData.border, TRUE, (ArgIniType) "" },
{ "finger", ArgFilename, (void *) &appData.finger, FALSE, (ArgIniType) "" },
+ { "epd", ArgTrue, (void *) &appData.epd, FALSE, INVALID },
+ { "inscriptions", ArgString, (void *) &appData.inscriptions, FALSE, (ArgIniType) "" },
+ { "autoInstall", ArgString, (void *) &appData.autoInstall, XBOARD, (ArgIniType) "" },
+ { "fixedSize", ArgBoolean, (void *) &appData.fixedSize, TRUE, (ArgIniType) FALSE },
// [HGM] tournament options
{ "tourneyFile", ArgFilename, (void *) &appData.tourneyFile, FALSE, (ArgIniType) "" },
{ "oneClickMove", ArgBoolean, (void *) &appData.oneClick, TRUE, (ArgIniType) FALSE },
{ "boardWidth", ArgInt, (void *) &appData.NrFiles, FALSE, (ArgIniType) -1 },
{ "boardHeight", ArgInt, (void *) &appData.NrRanks, FALSE, (ArgIniType) -1 },
+ { "rankOffset", ArgInt, (void *) &appData.rankOffset, FALSE, (ArgIniType) 0 },
{ "holdingsSize", ArgInt, (void *) &appData.holdingsSize, FALSE, (ArgIniType) -1 },
{ "defaultMatchGames", ArgInt, (void *) &appData.defaultMatchGames, TRUE, (ArgIniType) 10 },
{ "matchPause", ArgInt, (void *) &appData.matchPause, TRUE, (ArgIniType) 10000 },
{ "scoreWhite", ArgBoolean, (void *) &appData.scoreWhite, TRUE, FALSE },
{ "evalZoom", ArgInt, (void *) &appData.zoom, TRUE, (ArgIniType) 1 },
{ "evalThreshold", ArgInt, (void *) &appData.evalThreshold, TRUE, (ArgIniType) 25 },
+ { "firstPseudo", ArgTrue, (void *) &appData.pseudo[0], FALSE, FALSE },
+ { "secondPseudo", ArgTrue, (void *) &appData.pseudo[1], FALSE, FALSE },
{ "fSAN", ArgTrue, (void *) &appData.pvSAN[0], FALSE, FALSE },
{ "sSAN", ArgTrue, (void *) &appData.pvSAN[1], FALSE, FALSE },
{ "pairingEngine", ArgFilename, (void *) &appData.pairingEngine, TRUE, "" },
{ "firstDrawDepth", ArgInt, (void *) &appData.drawDepth[0], FALSE, (ArgIniType) 0 },
{ "secondDrawDepth", ArgInt, (void *) &appData.drawDepth[1], FALSE, (ArgIniType) 0 },
{ "memoHeaders", ArgBoolean, (void *) &appData.headers, TRUE, (ArgIniType) FALSE },
+ { "startupMessage", ArgString, (void *) &appData.message, FALSE, (ArgIniType) "" },
+ { "messageSuppress", ArgString, (void *) &appData.suppress, XBOARD, (ArgIniType) "" },
+ { "fen", ArgString, (void *) &appData.fen, FALSE, (ArgIniType) "" },
+ { "men", ArgString, (void *) &appData.men, FALSE, (ArgIniType) "" },
+ { "analysisBell", ArgInt, (void *) &appData.analysisBell, TRUE, (ArgIniType) 0 },
#if ZIPPY
{ "zippyTalk", ArgBoolean, (void *) &appData.zippyTalk, FALSE, (ArgIniType) ZIPPY_TALK },
{ "winHeight", ArgInt, (void *) &wpMain.height, TRUE, INVALID }, // for attaching auxiliary windows to them
{ "x", ArgInt, (void *) &wpMain.x, TRUE, (ArgIniType) CW_USEDEFAULT },
{ "y", ArgInt, (void *) &wpMain.y, TRUE, (ArgIniType) CW_USEDEFAULT },
+ { "icsUp", ArgBoolean, (void *) &wpConsole.visible, XBOARD, (ArgIniType) FALSE },
{ "icsX", ArgX, (void *) &wpConsole.x, TRUE, (ArgIniType) CW_USEDEFAULT },
{ "icsY", ArgY, (void *) &wpConsole.y, TRUE, (ArgIniType) CW_USEDEFAULT },
{ "icsW", ArgInt, (void *) &wpConsole.width, TRUE, (ArgIniType) CW_USEDEFAULT },
if (ok) {
f = fopen(fullname, "r");
#ifdef DATADIR
- if(f == NULL && *fullname != '/') { // when a relative name did not work
+ if(f == NULL && *fullname != '/' && !addr) { // when a relative name did not work
char buf[MSG_SIZ];
- snprintf(buf, MSG_SIZ, "%s/themes/conf", DATADIR);
- MySearchPath(buf, name, fullname); // also look in standard place
+ snprintf(buf, MSG_SIZ, "~/.xboard/themes/conf/%s", name);
+ MySearchPath(installDir, buf, fullname); // first look in user's own files
f = fopen(fullname, "r");
+ if(f == NULL) {
+ snprintf(buf, MSG_SIZ, "%s/themes/conf", dataDir);
+ MySearchPath(buf, name, fullname); // also look in standard place
+ f = fopen(fullname, "r");
+ }
}
#endif
if (f != NULL) {
if(posflag) { // positional argument: the argName was implied, and per default set as -lgf
int len = strlen(argValue) - 4; // start of filename extension
if(len < 0) len = 0;
- if(!strcasecmp(argValue + len, ".trn")) {
+ if(!StrCaseCmp(argValue + len, ".trn")) {
ad = &argDescriptors[2]; // correct implied type to -tf
appData.tourney = TRUE; // let it parse -tourneyOptions later
- } else if(!strcasecmp(argValue + len, ".fen") || !strcasecmp(argValue + len, ".epd")) {
+ } else if(!StrCaseCmp(argValue + len, ".fen") || !StrCaseCmp(argValue + len, ".epd")) {
ad = &argDescriptors[1]; // correct implied type to -lpf
appData.viewer = TRUE;
- } else if(!strcasecmp(argValue + len, ".ini") || !strcasecmp(argValue + len, ".xop")) {
+ } else if(!StrCaseCmp(argValue + len, ".ini") || !StrCaseCmp(argValue + len, ".xop")) {
ad = &argDescriptors[0]; // correct implied type to -opt
} else if(GetEngineLine(argValue, 11)) {
ad = &argDescriptors[3]; // correct implied type to -is
case ArgFilename:
if(argValue[0] == '~' && argValue[1] == '~') {
char buf[4*MSG_SIZ]; // expand ~~
- snprintf(buf, 4*MSG_SIZ, "%s%s", DATADIR, argValue+2);
+ snprintf(buf, 4*MSG_SIZ, "%s%s", dataDir, argValue+2);
ASSIGN(*(char **) ad->argLoc, buf);
break;
}
appData.NrRanks > BOARD_RANKS )
DisplayFatalError("Recompile with BOARD_RANKS or BOARD_FILES, to support this size", 0, 2);
+ if(!*appData.secondChessProgram) { // [HGM] scp defaults to fcp
+ ASSIGN(appData.secondChessProgram, appData.firstChessProgram);
+ ASSIGN(appData.secondDirectory, appData.firstDirectory);
+ appData.secondIsUCI = appData.firstIsUCI; // copy type too!
+ }
+
/* [HGM] After parsing the options from the .ini file, and overruling them
* with options from the command line, we now make an even higher priority
* overrule by WB options attached to the engine command line. This so that
} else appData.timeIncrement = -1;
}
if(appData.movesPerSession <= 0) appData.movesPerSession = MOVES_PER_SESSION; // mps <= 0 is invalid in any case
+ if(*appData.defaultPathEGTB) { // append value of deprecated -defaultPathEGTB to -egtFormats
+ snprintf(buf, MAX_ARG_LEN, "%s%snalimov:%s", appData.egtFormats, (*appData.egtFormats ?"," : ""), appData.defaultPathEGTB);
+ ASSIGN(appData.egtFormats, buf);
+ ASSIGN(appData.defaultPathEGTB, "");
+ }
/* Open startup dialog if needed */
if ((!appData.noChessProgram && !chessProgram && !appData.icsActive) ||
ArgDescriptor *ad;
char dir[MSG_SIZ], buf[MSG_SIZ];
int mps = appData.movesPerSession;
- TimeMark now;
if (!MainWindowUp() && !autoClose) return;
- GetTimeMark(&now); saveDate = now.sec;
+ saveDate = programStartTime.sec;
GetCurrentDirectory(MSG_SIZ, dir);
if(MySearchPath(installDir, name, buf)) {
break;
case ArgFilename:
if(*(char**)ad->argLoc == NULL) break; // just in case
- if (strchr(*(char **)ad->argLoc, '\"')) {
- fprintf(f, OPTCHAR "%s" SEPCHAR "'%s'\n", ad->argName, *(char **)ad->argLoc);
- } else {
- fprintf(f, OPTCHAR "%s" SEPCHAR "\"%s\"\n", ad->argName, *(char **)ad->argLoc);
+ { char buf[MSG_SIZ];
+ snprintf(buf, MSG_SIZ, "%s", *(char**)ad->argLoc);
+#ifdef OSXAPP
+ if(strstr(buf, dataDir) == buf)
+ snprintf(buf, MSG_SIZ, "~~%s", *(char**)ad->argLoc + strlen(dataDir));
+#endif
+ if (strchr(buf, '\"')) {
+ fprintf(f, OPTCHAR "%s" SEPCHAR "'%s'\n", ad->argName, buf);
+ } else {
+ fprintf(f, OPTCHAR "%s" SEPCHAR "\"%s\"\n", ad->argName, buf);
+ }
}
break;
case ArgBoardSize:
projects / xboard.git / blobdiff