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

diff --git a/backend.c b/backend.c
index b041f98..1de9cb7 100644
--- a/backend.c
+++ b/backend.c
@@ -8222,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) {
@@ -9671,7 +9671,7 @@ LoadGameOneMove(readAhead)
     } else {
       if (gameFileFP == NULL)
 	  return FALSE;
-      moveType = (ChessMove) yylex();
+      moveType = (ChessMove) Myylex();
     }
 
     done = FALSE;
@@ -10166,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) {
@@ -10219,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;
@@ -10258,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) {
@@ -10331,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) {
@@ -10341,7 +10341,7 @@ LoadGame(f, gameNumber, title, useList)
 	    p = yy_text;
 	    AppendComment(currentMove, p, FALSE);
 	    yyboardindex = forwardMostMove;
-	    cm = (ChessMove) yylex();
+	    cm = (ChessMove) Myylex();
 	}
     }
 
@@ -10418,7 +10418,7 @@ LoadGame(f, gameNumber, title, useList)
 	    }
 	}
 	yyboardindex = forwardMostMove;
-	cm = (ChessMove) yylex();
+	cm = (ChessMove) Myylex();
     }
 
     if (first.pr == NoProc) {
@@ -10444,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 ) ||
@@ -11853,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;
@@ -11894,18 +11925,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);
@@ -13844,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);