* Massachusetts.
*
* Enhancements Copyright 1992-2001, 2002, 2003, 2004, 2005, 2006,
- * 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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;
int saveDate;
{ "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" },
{ "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 },
{ "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 },
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);
+ snprintf(buf, MSG_SIZ, "%s/themes/conf", dataDir);
MySearchPath(buf, name, fullname); // also look in standard place
f = fopen(fullname, "r");
}
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) { ASSIGN(appData.secondChessProgram, appData.firstChessProgram); } // [HGM] scp defaults to fcp
+ 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
} 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) ||
{ 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));
+ 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);