X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=backend.c;h=f6e75c49f0e69aa380491ecdccc2ddb9739b3116;hb=e79a7d4e07632ae3a428f4363effffbbb52c7a1d;hp=7b5d2fc0a6d38dce474276a96d949e166d764cc3;hpb=b9641a5478e4828554c5a82cb11681281491db4c;p=xboard.git

diff --git a/backend.c b/backend.c
index 7b5d2fc..f6e75c4 100644
--- a/backend.c
+++ b/backend.c
@@ -57,6 +57,9 @@
 
 #define DoSleep( n ) if( (n) != 0 ) Sleep( (n) );
 
+int flock(int f, int code);
+#define LOCK_EX 2
+
 #else
 
 #define DoSleep( n ) if( (n) >= 0) sleep(n)
@@ -325,7 +328,7 @@ safeStrCpy( char *dst, const char *src, size_t count )
     {
       dst[ count-1 ] = '\0'; // make sure incomplete copy still null-terminated
       if(appData.debugMode)
-      fprintf(debugFP, "safeStrCpy: copying %s into %s didn't work, not enough space %d\n",src,dst,count);
+      fprintf(debugFP, "safeStrCpy: copying %s into %s didn't work, not enough space %d\n",src,dst, (int)count);
     }
 
   return dst;
@@ -841,6 +844,7 @@ ReplaceEngine(ChessProgramState *cps, int n)
     appData.noChessProgram = False;
     appData.clockMode = True;
     InitEngine(cps, n);
+    if(n) return; // only startup first engine immediately; second can wait
     savCps = cps; // parameter to LoadEngine passed as globals, to allow scheduled calling :-(
     LoadEngine();
 }
@@ -1320,6 +1324,12 @@ InitBackEnd3 P((void))
     DisplayMessage("", "");
     if (StrCaseCmp(appData.initialMode, "") == 0) {
       initialMode = BeginningOfGame;
+      if(!appData.icsActive && appData.noChessProgram) { // [HGM] could be fall-back
+        gameMode = MachinePlaysBlack; // "Machine Black" might have been implicitly highlighted
+        ModeHighlight(); // make sure XBoard knows it is highlighted, so it will un-highlight it
+        gameMode = BeginningOfGame; // in case BeginningOfGame now means "Edit Position"
+        ModeHighlight();
+      }
     } else if (StrCaseCmp(appData.initialMode, "TwoMachines") == 0) {
       initialMode = TwoMachinesPlay;
     } else if (StrCaseCmp(appData.initialMode, "AnalyzeFile") == 0) {
@@ -2977,9 +2987,9 @@ read_from_ics(isr, closure, data, count, error)
 		}
 	    } // [HGM] chat: end of patch
 
+          backup = i;
 	    if (appData.zippyTalk || appData.zippyPlay) {
                 /* [DM] Backup address for color zippy lines */
-                backup = i;
 #if ZIPPY
                if (loggedOn == TRUE)
                        if (ZippyControl(buf, &backup) || ZippyConverse(buf, &backup) ||
@@ -3144,6 +3154,8 @@ read_from_ics(isr, closure, data, count, error)
 		    continue;
 	    }
 
+          if(i < backup) { i = backup; continue; } // [HGM] for if ZippyControl matches, but the colorie code doesn't
+
 	    if (looking_at(buf, &i, "\\   ")) {
 		if (prevColor != ColorNormal) {
 		    if (oldi > next_out) {
@@ -7927,7 +7939,10 @@ if(appData.debugMode) fprintf(debugFP, "nodes = %d, %lld\n", (int) programStats.
 	snprintf(buf1, sizeof(buf1), _("Failed to start %s chess program %s on %s: %s\n"),
 		_(cps->which), cps->program, cps->host, message);
 	RemoveInputSource(cps->isr);
-	DisplayFatalError(buf1, 0, 1);
+	if(appData.icsActive) DisplayFatalError(buf1, 0, 1); else {
+	    if(cps == &first) appData.noChessProgram = TRUE;
+	    DisplayError(buf1, 0);
+	}
 	return;
     }
 
@@ -13786,6 +13801,7 @@ SendToProgram(message, cps)
     outCount = OutputToProcess(cps->pr, message, count, &error);
     if (outCount < count && !exiting
                          && !endingGame) { /* [HGM] crash: to not hang GameEnds() writing to deceased engines */
+      if(!cps->initDone) return; // [HGM] should not generate fatal error during engine load
       snprintf(buf, MSG_SIZ, _("Error writing to %s chess program"), _(cps->which));
         if(gameInfo.resultDetails==NULL) { /* [HGM] crash: if game in progress, give reason for abort */
             if((signed char)boards[forwardMostMove][EP_STATUS] <= EP_DRAWS) {