X-Git-Url: http://winboard.nl/cgi-bin?p=xboard.git;a=blobdiff_plain;f=xboard.c;h=0e8b132d0e9d7b9c9f4f07632fd5af69c1379f6f;hp=7b1fe434ecd09146e4d2d7f51a1e5b9294ad91a3;hb=d016fb202fe45795e630e22ba516e754cf694ea6;hpb=495294ea0ecf08fae79348f0599b33047936dfc0

diff --git a/xboard.c b/xboard.c
index 7b1fe43..0e8b132 100644
--- a/xboard.c
+++ b/xboard.c
@@ -1347,7 +1347,7 @@ XtResource clientResources[] = {
 	XtRImmediate, (XtPointer) "xboard.debug"},
     { "engineDebugOutput", "engineDebugOutput", XtRInt,
 	sizeof(int), XtOffset(AppDataPtr, engineComments),
-	XtRImmediate, (XtPointer) 0},
+	XtRImmediate, (XtPointer) 1},
     { "noGUI", "noGUI", XtRBoolean,
 	sizeof(Boolean), XtOffset(AppDataPtr, noGUI),
 	XtRImmediate, (XtPointer) 0},
@@ -1401,6 +1401,9 @@ XtResource clientResources[] = {
     { "delayAfterQuit", "delayAfterQuit", XtRInt,
 	sizeof(int), XtOffset(AppDataPtr, delayAfterQuit),
 	XtRImmediate, (XtPointer) 0},
+    { "keepAlive", "keepAlive", XtRInt,
+	sizeof(int), XtOffset(AppDataPtr, keepAlive),
+	XtRImmediate, (XtPointer) 0},
 };
 
 XrmOptionDescRec shellOptions[] = {
@@ -1768,6 +1771,7 @@ XrmOptionDescRec shellOptions[] = {
     { "-secondOptions", "secondOptions", XrmoptionSepArg, NULL },
     { "-firstNeedsNoncompliantFEN", "firstNeedsNoncompliantFEN", XrmoptionSepArg, NULL },
     { "-secondNeedsNoncompliantFEN", "secondNeedsNoncompliantFEN", XrmoptionSepArg, NULL },
+    { "-keepAlive", "keepAlive", XrmoptionSepArg, NULL },
 };
 
 
@@ -2290,7 +2294,7 @@ void InitDrawingSizes(BoardSize boardSize, int flags)
 	}
 #ifdef GOTHIC
 	if(gameInfo.variant == VariantGothic) {
-           ximMaskPm[(int)WhiteMarshall] = ximMaskPm2[i][(int)WhiteSilver];
+           ximMaskPm[(int)WhiteMarshall] = ximMaskPm2[(int)WhiteSilver];
 	}
 #endif
 #endif
@@ -2419,7 +2423,7 @@ main(argc, argv)
 	    j = fprintf(stderr, "  %s%s", shellOptions[i].option,
 		        (shellOptions[i].argKind == XrmoptionSepArg
 			 ? " ARG" : ""));
-	    if (i++ < XtNumber(shellOptions)) {
+	    if (i++ < XtNumber(shellOptions)) {		
 		fprintf(stderr, "%*c%s%s\n", 40 - j, ' ',
 			shellOptions[i].option,
 			(shellOptions[i].argKind == XrmoptionSepArg
@@ -8140,6 +8144,9 @@ void
 ScheduleDelayedEvent(cb, millisec)
      DelayedEventCallback cb; long millisec;
 {
+    if(delayedEventTimerXID && delayedEventCallback == cb)
+	// [HGM] alive: replace, rather than add or flush identical event
+	XtRemoveTimeOut(delayedEventTimerXID);
     delayedEventCallback = cb;
     delayedEventTimerXID =
       XtAppAddTimeOut(appContext, millisec,
@@ -9483,4 +9490,4 @@ SetProgramStats( FrontEndProgramStats * stats )
   // [HR] TODO
   // [HGM] done, but perhaps backend should call this directly?
     EngineOutputUpdate( stats );
-}
\ No newline at end of file
+}