IcsTextMenuEntry icsTextMenuEntry[ICS_TEXT_MENU_SIZE];
int junk;
-unsigned int saveDate;
-unsigned int dateStamp;
+int saveDate;
+int dateStamp;
Boolean singleList;
Boolean autoClose;
char *homeDir;
{ "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 },
{ "ub", ArgBoolean, (void *) &appData.useBorder, FALSE, INVALID },
{ "border", ArgFilename, (void *) &appData.border, TRUE, (ArgIniType) "" },
{ "finger", ArgFilename, (void *) &appData.finger, FALSE, (ArgIniType) "" },
+ { "inscriptions", ArgString, (void *) &appData.inscriptions, XBOARD, (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) "" },
{ "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, "" },
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
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
+
/* [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
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: