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

diff --git a/xboard.c b/xboard.c
index 7b1fe43..e8b561d 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
@@ -7637,19 +7641,34 @@ void Iconify(w, event, prms, nprms)
 void DisplayMessage(message, extMessage)
      char *message, *extMessage;
 {
-    char buf[MSG_SIZ];
-    Arg arg;
-
-    if (extMessage) {
-	if (*message) {
-	    snprintf(buf, sizeof(buf), "%s  %s", message, extMessage);
-	    message = buf;
-	} else {
-	    message = extMessage;
-	}
-    }
-    XtSetArg(arg, XtNlabel, message);
-    XtSetValues(messageWidget, &arg, 1);
+  /* display a message in the message widget */
+  
+  char buf[MSG_SIZ];
+  Arg arg;
+  
+  if (extMessage) 
+    {
+      if (*message) 
+	{
+	  snprintf(buf, sizeof(buf), "%s  %s", message, extMessage);
+	  message = buf;
+	} 
+      else 
+	{
+	  message = extMessage;
+	};
+    };
+  
+  /* need to test if messageWidget already exists, since this function
+     can also be called during the startup, if for example a Xresource
+     is not set up correctly */
+  if(messageWidget)
+    {
+      XtSetArg(arg, XtNlabel, message);
+      XtSetValues(messageWidget, &arg, 1);
+    };
+  
+  return;
 }
 
 void DisplayTitle(text)
@@ -8140,6 +8159,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 +9505,4 @@ SetProgramStats( FrontEndProgramStats * stats )
   // [HR] TODO
   // [HGM] done, but perhaps backend should call this directly?
     EngineOutputUpdate( stats );
-}
\ No newline at end of file
+}