X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=args.h;h=f52404fac90878c5588c342a46c6fbcdd700215b;hb=51af0717099806507c09bab2416cfbc67c30224e;hp=dec7a5c75821c44afec84b4d79c8d2e5fb41a214;hpb=36a3483dd6f8361b0ccb7c5648e83922883bb9a6;p=xboard.git

diff --git a/args.h b/args.h
index dec7a5c..f52404f 100644
--- a/args.h
+++ b/args.h
@@ -512,7 +512,7 @@ ArgDescriptor argDescriptors[] = {
     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) "" },
   { "initialMode", ArgString, (void *) &appData.initialMode, FALSE, (ArgIniType) "" },
@@ -771,6 +771,7 @@ ArgDescriptor argDescriptors[] = {
   { "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 },
@@ -912,11 +913,16 @@ ParseSettingsFile(char *name, char **addr)
   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) {
@@ -1394,6 +1400,8 @@ InitAppData(char *lpCmdLine)
      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