X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=backend.c;h=0026207b752bd3b74c727b860c88da1656de28d7;hb=4a538e46ba98f9cca1d9c156347e5bfc3952b160;hp=01d447e17a65ec317e29e10088c28f8be4f9e506;hpb=7d010a9891c42f6e60eb18cbf5b75be9878a8336;p=xboard.git

diff --git a/backend.c b/backend.c
index 01d447e..0026207 100644
--- a/backend.c
+++ b/backend.c
@@ -311,23 +311,19 @@ char marker[BOARD_RANKS][BOARD_FILES]; /* [HGM] marks for target squares */
 
 char*
 safeStrCpy( char *dst, const char *src, size_t count )
-{
-  /* see for example: https://buildsecurityin.us-cert.gov/bsi-rules/home/g1/854-BSI.html
-   *
-   * usage:   safeStrCpy( stringA, stringB, sizeof(stringA)/sizeof(stringA[0]);
-   */
-
+{ // [HGM] made safe
+  int i;
   assert( dst != NULL );
   assert( src != NULL );
   assert( count > 0 );
 
-  strncpy( dst, src, count );
-  if(  dst[ count-1 ] != '\0' )
+  for(i=0; i<count; i++) if((dst[i] = src[i]) == NULLCHAR) break;
+  if(  i == count-1 && dst[i] != NULLCHAR)
     {
+      dst[ count-1 ] = '\0'; // make sure incomplete copy still null-terminated
       if(appData.debugMode)
       printf("safeStrCpy: copying %s into %s didn't work, not enough space %d\n",src,dst,count);
     }
-  dst[ count-1 ] = '\0';
 
   return dst;
 }
@@ -6443,8 +6439,9 @@ void LeftClick(ClickType clickType, int xPix, int yPix)
 		MarkTargetSquares(0);
 		DragPieceBegin(xPix, yPix);
 	    }
-	    return;
 	   }
+	   if(x == fromX && y == fromY) return; // if OnlyMove altered (x,y) we go on
+	   second = FALSE; 
 	}
 	// ignore clicks on holdings
 	if(x < BOARD_LEFT || x >= BOARD_RGHT) return;
@@ -6522,7 +6519,7 @@ void LeftClick(ClickType clickType, int xPix, int yPix)
     }
 
     // off-board moves should not be highlighted
-    if(x < 0 || x < 0) ClearHighlights();
+    if(x < 0 || y < 0) ClearHighlights();
 
     if (HasPromotionChoice(fromX, fromY, toX, toY, &promoChoice)) {
 	SetHighlights(fromX, fromY, toX, toY);
@@ -7492,13 +7489,15 @@ if(appData.debugMode) fprintf(debugFP, "nodes = %d, %lld\n", (int) programStats.
      * Look for communication commands
      */
     if (!strncmp(message, "telluser ", 9)) {
-	EscapeExpand(message+9, message+9); // [HGM] esc: allow escape sequences in popup box
+	if(message[9] == '\\' && message[10] == '\\')
+	    EscapeExpand(message+9, message+11); // [HGM] esc: allow escape sequences in popup box
 	DisplayNote(message + 9);
 	return;
     }
     if (!strncmp(message, "tellusererror ", 14)) {
 	cps->userError = 1;
-	EscapeExpand(message+14, message+14); // [HGM] esc: allow escape sequences in popup box
+	if(message[14] == '\\' && message[15] == '\\')
+	    EscapeExpand(message+14, message+16); // [HGM] esc: allow escape sequences in popup box
 	DisplayError(message + 14, 0);
 	return;
     }
@@ -11853,6 +11852,37 @@ DisplayTwoMachinesTitle()
 }
 
 void
+SettingsMenuIfReady()
+{
+  if (second.lastPing != second.lastPong) {
+    DisplayMessage("", _("Waiting for second chess program"));
+    ScheduleDelayedEvent(SettingsMenuIfReady, 10); // [HGM] fast: lowered from 1000
+    return;
+  }
+  ThawUI();
+  DisplayMessage("", "");
+  SettingsPopUp(&second);
+}
+
+int
+WaitForSecond(DelayedEventCallback retry)
+{
+    if (second.pr == NULL) {
+	StartChessProgram(&second);
+	if (second.protocolVersion == 1) {
+	  retry();
+	} else {
+	  /* kludge: allow timeout for initial "feature" command */
+	  FreezeUI();
+	  DisplayMessage("", _("Starting second chess program"));
+	  ScheduleDelayedEvent(retry, FEATURE_TIMEOUT);
+	}
+	return 1;
+    }
+    return 0;
+}
+
+void
 TwoMachinesEvent P((void))
 {
     int i;
@@ -11894,18 +11924,7 @@ TwoMachinesEvent P((void))
     TruncateGame(); // [HGM] vari: MachineWhite and MachineBlack do this...
     ResurrectChessProgram();	/* in case first program isn't running */
 
-    if (second.pr == NULL) {
-	StartChessProgram(&second);
-	if (second.protocolVersion == 1) {
-	  TwoMachinesEventIfReady();
-	} else {
-	  /* kludge: allow timeout for initial "feature" command */
-	  FreezeUI();
-	  DisplayMessage("", _("Starting second chess program"));
-	  ScheduleDelayedEvent(TwoMachinesEventIfReady, FEATURE_TIMEOUT);
-	}
-	return;
-    }
+    if(WaitForSecond(TwoMachinesEventIfReady)) return;
     DisplayMessage("", "");
     InitChessProgram(&second, FALSE);
     SendToProgram("force\n", &second);
@@ -13542,6 +13561,8 @@ ReceiveFromProgram(isr, closure, message, count, error)
 		   sscanf(message, "error %c", &c)!=1 && sscanf(message, "illegal %c", &c)!=1 &&
 		   sscanf(message, "tell%c", &c)!=1   && sscanf(message, "0-1 %c", &c)!=1 &&
 		   sscanf(message, "1-0 %c", &c)!=1   && sscanf(message, "1/2-1/2 %c", &c)!=1 &&
+		   sscanf(message, "setboard %c", &c)!=1   && sscanf(message, "setup %c", &c)!=1 &&
+		   sscanf(message, "hint: %c", &c)!=1 && 
 		   sscanf(message, "pong %c", &c)!=1   && start != '#')	{
 		    quote = appData.engineComments == 2 ? "# " : "### NON-COMPLIANT! ### ";
 		    print = (appData.engineComments >= 2);
@@ -13844,6 +13865,7 @@ FeatureDone(cps, val)
 {
   DelayedEventCallback cb = GetDelayedEvent();
   if ((cb == InitBackEnd3 && cps == &first) ||
+      (cb == SettingsMenuIfReady && cps == &second) ||
       (cb == TwoMachinesEventIfReady && cps == &second)) {
     CancelDelayedEvent();
     ScheduleDelayedEvent(cb, val ? 1 : 3600000);