X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=xboard.c;h=9bfdc9463402835127f61ef45ab0294cf64edd69;hb=91d8e5853ca580769cc130aa6ea004869118d171;hp=1f17046185bfb2b38b50365983015d54f308c3b6;hpb=ea750683ac62717dd7346de17b5ae072622ff92a;p=xboard.git

diff --git a/xboard.c b/xboard.c
index 1f17046..9bfdc94 100644
--- a/xboard.c
+++ b/xboard.c
@@ -2,8 +2,10 @@
  * xboard.c -- X front end for XBoard
  * $Id: xboard.c,v 2.2 2003/11/06 07:22:14 mann Exp $
  *
- * Copyright 1991 by Digital Equipment Corporation, Maynard, Massachusetts.
- * Enhancements Copyright 1992-2001 Free Software Foundation, Inc.
+ * Copyright 1991 by Digital Equipment Corporation, Maynard,
+ * Massachusetts.  Enhancements Copyright
+ * 1992-2001,2002,2003,2004,2005,2006,2007,2008,2009 Free Software
+ * Foundation, Inc.
  *
  * The following terms apply to Digital Equipment Corporation's copyright
  * interest in XBoard:
@@ -27,26 +29,25 @@
  * SOFTWARE.
  * ------------------------------------------------------------------------
  *
- * The following terms apply to the enhanced version of XBoard distributed
- * by the Free Software Foundation:
+ * The following terms apply to the enhanced version of XBoard
+ * distributed by the Free Software Foundation:
  * ------------------------------------------------------------------------
- * This program is free software; you can redistribute it and/or modify
+ *
+ * GNU XBoard is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * GNU XBoard is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- * ------------------------------------------------------------------------
+ * along with this program. If not, see http://www.gnu.org/licenses/.  *
  *
- * See the file ChangeLog for a revision history.
- */
+ *------------------------------------------------------------------------
+ ** See the file ChangeLog for a revision history.  */
 
 #include "config.h"
 
@@ -1309,6 +1310,18 @@ XtResource clientResources[] = {
     { "niceEngines", "niceEngines", XtRInt,
 	sizeof(int), XtOffset(AppDataPtr, niceEngines),
 	XtRImmediate, (XtPointer) 0},
+    { "nameOfDebugFile", "nameOfDebugFile", XtRString,
+	sizeof(String), XtOffset(AppDataPtr, nameOfDebugFile),
+	XtRImmediate, (XtPointer) "xboard.debug"},
+    { "noGUI", "noGUI", XtRBoolean,
+	sizeof(Boolean), XtOffset(AppDataPtr, noGUI),
+	XtRImmediate, (XtPointer) 0},
+    { "firstOptions", "firstOptions", XtRString,
+        sizeof(String), XtOffset(AppDataPtr, firstOptions),
+	XtRImmediate, (XtPointer) "" },
+    { "secondOptions", "secondOptions", XtRString,
+        sizeof(String), XtOffset(AppDataPtr, secondOptions),
+	XtRImmediate, (XtPointer) "" },
 
     // [HGM] Winboard_x UCI options
     { "firstIsUCI", "firstIsUCI", XtRBoolean,
@@ -1347,12 +1360,6 @@ XtResource clientResources[] = {
     { "delayAfterQuit", "delayAfterQuit", XtRInt,
 	sizeof(int), XtOffset(AppDataPtr, delayAfterQuit),
 	XtRImmediate, (XtPointer) 0},
-    { "nameOfDebugFile", "nameOfDebugFile", XtRString,
-	sizeof(String), XtOffset(AppDataPtr, nameOfDebugFile),
-	XtRImmediate, (XtPointer) "xboard.debug"},
-    { "noGUI", "noGUI", XtRBoolean,
-	sizeof(Boolean), XtOffset(AppDataPtr, noGUI),
-	XtRImmediate, (XtPointer) 0},
 };
 
 XrmOptionDescRec shellOptions[] = {
@@ -1658,6 +1665,8 @@ XrmOptionDescRec shellOptions[] = {
     { "-secondHasOwnBookUCI", "secondHasOwnBookUCI", XrmoptionSepArg, NULL },
     { "-fNoOwnBookUCI", "firstHasOwnBookUCI", XrmoptionNoArg, "False" },
     { "-sNoOwnBookUCI", "secondHasOwnBookUCI", XrmoptionNoArg, "False" },
+    { "-firstXBook", "firstHasOwnBookUCI", XrmoptionNoArg, "False" },
+    { "-secondXBook", "secondHasOwnBookUCI", XrmoptionNoArg, "False" },
     { "-polyglotDir", "polyglotDir", XrmoptionSepArg, NULL },
     { "-usePolyglotBook", "usePolyglotBook", XrmoptionSepArg, NULL },
     { "-polyglotBook", "polyglotBook", XrmoptionSepArg, NULL },
@@ -1707,6 +1716,8 @@ XrmOptionDescRec shellOptions[] = {
     { "-delayAfterQuit", "delayAfterQuit", XrmoptionSepArg, NULL }, 
     { "-nameOfDebugFile", "nameOfDebugFile", XrmoptionSepArg, NULL }, 
     { "-noGUI", "noGUI", XrmoptionNoArg, "True" }, 
+    { "-firstOptions", "firstOptions", XrmoptionSepArg, NULL }, 
+    { "-secondOptions", "secondOptions", XrmoptionSepArg, NULL }, 
 };
 
 
@@ -2268,7 +2279,6 @@ main(argc, argv)
 #ifdef ENABLE_NLS
     XtSetLanguageProc(NULL, NULL, NULL);
     bindtextdomain(PRODUCT, LOCALEDIR);
-    bind_textdomain_codeset(PRODUCT, "UTF-8");
     textdomain(PRODUCT);
 #endif