X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=backend.c;h=1de9cb765e7b282f6bfe61cdda06f338581287c3;hb=37c976246d65ccb8ed013af03dac284b4a431cff;hp=de835aeb7043d23027f1a28f2f6e9e6386865f67;hpb=c260fe245921dcbd737faaf4638e4fb3354717f0;p=xboard.git

diff --git a/backend.c b/backend.c
index de835ae..1de9cb7 100644
--- a/backend.c
+++ b/backend.c
@@ -5595,7 +5595,8 @@ SendBoard(cps, moveNum)
       /* Kludge to set black to move, avoiding the troublesome and now
        * deprecated "black" command.
        */
-      if (!WhiteOnMove(moveNum)) SendToProgram("a2a3\n", cps);
+      if (!WhiteOnMove(moveNum)) // [HGM] but better a deprecated command than an illegal move...
+        SendToProgram(boards[0][1][BOARD_LEFT] == WhitePawn ? "a2a3\n" : "black\n", cps);
 
       SendToProgram("edit\n", cps);
       SendToProgram("#\n", cps);
@@ -7456,6 +7457,15 @@ if(appData.debugMode) fprintf(debugFP, "nodes = %d, %lld\n", (int) programStats.
       return; // [HGM] This return was missing, causing option features to be recognized as non-compliant commands!
     }
 
+    if (!appData.testLegality && !strncmp(message, "setup ", 6)) { // [HGM] allow first engine to define opening position
+      int dummy, s=6; char buf[MSG_SIZ];
+      if(appData.icsActive || forwardMostMove != 0 || cps != &first || startedFromSetupPosition) return;
+      if(sscanf(message, "setup (%s", buf) == 1) s = 8 + strlen(buf), buf[s-9] = NULLCHAR, SetCharTable(pieceToChar, buf);
+      ParseFEN(boards[0], &dummy, message+s);
+      DrawPosition(TRUE, boards[0]);
+      startedFromSetupPosition = TRUE;
+      return;
+    }
     /* [HGM] Allow engine to set up a position. Don't ask me why one would
      * want this, I was asked to put it in, and obliged.
      */
@@ -8212,7 +8222,7 @@ ParseGameHistory(game)
     yynewstr(game);
     for (;;) {
 	yyboardindex = boardIndex;
-	moveType = (ChessMove) yylex();
+	moveType = (ChessMove) Myylex();
 	switch (moveType) {
 	  case IllegalMove:		/* maybe suicide chess, etc. */
   if (appData.debugMode) {
@@ -9661,7 +9671,7 @@ LoadGameOneMove(readAhead)
     } else {
       if (gameFileFP == NULL)
 	  return FALSE;
-      moveType = (ChessMove) yylex();
+      moveType = (ChessMove) Myylex();
     }
 
     done = FALSE;
@@ -10156,7 +10166,7 @@ LoadGame(f, gameNumber, title, useList)
     cm = lastLoadGameStart = EndOfFile;
     while (gn > 0) {
 	yyboardindex = forwardMostMove;
-	cm = (ChessMove) yylex();
+	cm = (ChessMove) Myylex();
 	switch (cm) {
 	  case EndOfFile:
 	    if (cmailMsgLoaded) {
@@ -10209,7 +10219,7 @@ LoadGame(f, gameNumber, title, useList)
 	    if (gn > 0) {
 		do {
 		    yyboardindex = forwardMostMove;
-		    cm = (ChessMove) yylex();
+		    cm = (ChessMove) Myylex();
 		} while (cm == PGNTag || cm == Comment);
 	    }
 	    break;
@@ -10248,7 +10258,7 @@ LoadGame(f, gameNumber, title, useList)
 	/* Skip any header junk before position diagram and/or move 1 */
 	for (;;) {
 	    yyboardindex = forwardMostMove;
-	    cm = (ChessMove) yylex();
+	    cm = (ChessMove) Myylex();
 
 	    if (cm == EndOfFile ||
 		cm == GNUChessGame || cm == XBoardGame) {
@@ -10321,7 +10331,7 @@ LoadGame(f, gameNumber, title, useList)
 	}
 
 	yyboardindex = forwardMostMove;
-	cm = (ChessMove) yylex();
+	cm = (ChessMove) Myylex();
 
 	/* Handle comments interspersed among the tags */
 	while (cm == Comment) {
@@ -10331,7 +10341,7 @@ LoadGame(f, gameNumber, title, useList)
 	    p = yy_text;
 	    AppendComment(currentMove, p, FALSE);
 	    yyboardindex = forwardMostMove;
-	    cm = (ChessMove) yylex();
+	    cm = (ChessMove) Myylex();
 	}
     }
 
@@ -10408,7 +10418,7 @@ LoadGame(f, gameNumber, title, useList)
 	    }
 	}
 	yyboardindex = forwardMostMove;
-	cm = (ChessMove) yylex();
+	cm = (ChessMove) Myylex();
     }
 
     if (first.pr == NoProc) {
@@ -10434,7 +10444,7 @@ LoadGame(f, gameNumber, title, useList)
 	p = yy_text;
 	AppendComment(currentMove, p, FALSE);
 	yyboardindex = forwardMostMove;
-	cm = (ChessMove) yylex();
+	cm = (ChessMove) Myylex();
     }
 
     if ((cm == EndOfFile && lastLoadGameStart != EndOfFile ) ||
@@ -11843,6 +11853,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;
@@ -11884,21 +11925,14 @@ 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);
+    if(first.lastPing != first.lastPong) { // [HGM] wait till we are sure first engine has set up position
+      ScheduleDelayedEvent(TwoMachinesEvent, 10);
+      return;
+    }
     if (startedFromSetupPosition) {
 	SendBoard(&second, backwardMostMove);
     if (appData.debugMode) {
@@ -13830,6 +13864,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);