X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=args.h;h=b3776eeb30360e9655a5c8e27cffaf2c11f1dac9;hb=66916d7ccbb16e97ce1222c692bb24bf5cfb2210;hp=69c1b12bd80945cc8041334ad7d5a4aa0c3345d2;hpb=00d7f7869e045cbed5037d39e1e56224692eb766;p=xboard.git

diff --git a/args.h b/args.h
index 69c1b12..b3776ee 100644
--- a/args.h
+++ b/args.h
@@ -316,8 +316,8 @@ ArgDescriptor argDescriptors[] = {
   { "popUpErrors", ArgBoolean, (void *) &appData.popupMoveErrors,
     FALSE, INVALID }, /* only so that old WinBoard.ini files from betas can be read */
   { "clockFont", ArgFont, (void *) CLOCK_FONT, TRUE, INVALID },
-  { "messageFont", ArgFont, (void *) MESSAGE_FONT, !XBOARD, INVALID },
-  { "font", ArgFont, (void *) MESSAGE_FONT, XBOARD, INVALID },
+  { "messageFont", ArgFont, (void *) MESSAGE_FONT, TRUE, INVALID },
+  { "font", ArgFont, (void *) MESSAGE_FONT, FALSE, INVALID }, /* only so that old .xboardrc files will parse. -font does not work from the command line because it is captured by the X libraries. */
   { "coordFont", ArgFont, (void *) COORD_FONT, TRUE, INVALID },
   { "tagsFont", ArgFont, (void *) EDITTAGS_FONT, TRUE, INVALID },
   { "commentFont", ArgFont, (void *) COMMENT_FONT, TRUE, INVALID },
@@ -622,6 +622,7 @@ ArgDescriptor argDescriptors[] = {
   { "sn", ArgString, (void *) &appData.pgnName[1], FALSE, INVALID },
   { "absoluteAnalysisScores", ArgBoolean, (void *) &appData.whitePOV, TRUE, FALSE },
   { "pairingEngine", ArgFilename, (void *) &appData.pairingEngine, TRUE, "" },
+  { "defaultTourneyName", ArgFilename, (void *) &appData.defName, TRUE, "" },
 
 #if ZIPPY
   { "zippyTalk", ArgBoolean, (void *) &appData.zippyTalk, FALSE, (ArgIniType) ZIPPY_TALK },
@@ -1066,6 +1067,7 @@ ParseArgs(GetFunc get, void *cl)
     case ArgNone:
       ExitArgError("Unrecognized argument", argValue);
       break;
+    case ArgTwo:
     case ArgTrue:
     case ArgFalse: ;
     }
@@ -1162,6 +1164,7 @@ SetDefaultsFromList()
     if(argDescriptors[i].defaultValue != INVALID)
       switch(argDescriptors[i].argType) {
         case ArgBoolean:
+        case ArgTwo:
         case ArgTrue:
         case ArgFalse:
           *(Boolean *) argDescriptors[i].argLoc = (int)(intptr_t)argDescriptors[i].defaultValue;
@@ -1427,6 +1430,7 @@ SaveSettings(char* name)
       break;
     case ArgCommSettings:
       PrintCommPortSettings(f, ad->argName);
+    case ArgTwo:
     case ArgNone:
     case ArgSettingsFilename: ;
     }