X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=backend.c;h=726b2d3d4826e9ed1702d1ea4fe2be660af69ff3;hb=4664f1be975afb2add547ef8bf344e153f210400;hp=7188448cc99b90173d02d7752ab0bdfd4cd56ff6;hpb=910f840f6aee2b8c71ba529b6e06fcf70780615e;p=xboard.git

diff --git a/backend.c b/backend.c
index 7188448..726b2d3 100644
--- a/backend.c
+++ b/backend.c
@@ -392,7 +392,7 @@ PosFlags (index)
   return flags;
 }
 
-FILE *gameFileFP, *debugFP;
+FILE *gameFileFP, *debugFP, *serverFP;
 char *currentDebugFile; // [HGM] debug split: to remember name
 
 /*
@@ -735,10 +735,10 @@ ClearOptions (ChessProgramState *cps)
 
 char *engineNames[] = {
   /* TRANSLATORS: "first" is the first of possible two chess engines. It is inserted into strings
-     such as "% engine" / "%s chess program" / "%s machine" - all mening the same thing */
+     such as "%s engine" / "%s chess program" / "%s machine" - all meaning the same thing */
 N_("first"),
   /* TRANSLATORS: "second" is the second of possible two chess engines. It is inserted into strings
-     such as "% engine" / "%s chess program" / "%s machine" - all mening the same thing */
+     such as "%s engine" / "%s chess program" / "%s machine" - all meaning the same thing */
 N_("second")
 };
 
@@ -748,7 +748,7 @@ InitEngine (ChessProgramState *cps, int n)
 
     ClearOptions(cps);
 
-    cps->which = _(engineNames[n]);
+    cps->which = engineNames[n];
     cps->maybeThinking = FALSE;
     cps->pr = NoProc;
     cps->isr = NULL;
@@ -920,6 +920,7 @@ Load (ChessProgramState *cps, int i)
 	p[-1] = 0;
 	appData.directory[i] = strdup(engineName);
 	p[-1] = SLASH;
+	if(SLASH == '/' && p - engineName > 1) *(p -= 2) = '.'; // for XBoard use ./exeName as command after split!
     } else appData.directory[i] = ".";
     if(params[0]) {
 	if(strchr(p, ' ') && !strchr(p, '"')) snprintf(buf2, MSG_SIZ, "\"%s\"", p), p = buf2; // quote if it contains spaces
@@ -1485,6 +1486,8 @@ MatchEvent (int mode)
 	NextMatchGame();
 }
 
+char *comboLine = NULL; // [HGM] recent: WinBoard's first-engine combobox line
+
 void
 InitBackEnd3 P((void))
 {
@@ -1498,7 +1501,7 @@ InitBackEnd3 P((void))
 	free(programVersion);
 	programVersion = (char*) malloc(8 + strlen(PACKAGE_STRING) + strlen(first.tidy));
 	sprintf(programVersion, "%s + %s", PACKAGE_STRING, first.tidy);
-	FloatToFront(&appData.recentEngineList, appData.firstChessProgram);
+	FloatToFront(&appData.recentEngineList, comboLine ? comboLine : appData.firstChessProgram);
     }
 
     if (appData.icsActive) {
@@ -2614,6 +2617,13 @@ SeekGraphClick (ClickType click, int x, int y, int moving)
 {
     static int lastDown = 0, displayed = 0, lastSecond;
     if(y < 0) return FALSE;
+    if(!(appData.seekGraph && appData.icsActive && loggedOn &&
+	(gameMode == BeginningOfGame || gameMode == IcsIdle))) {
+	if(!seekGraphUp) return FALSE;
+	seekGraphUp = FALSE; // seek graph is up when it shouldn't be: take it down
+	DrawPosition(TRUE, NULL);
+	return TRUE;
+    }
     if(!seekGraphUp) { // initiate cration of seek graph by requesting seek-ad list
 	if(click == Release || moving) return FALSE;
 	nrOfSeekAds = 0;
@@ -3560,7 +3570,7 @@ read_from_ics (InputSourceRef isr, VOIDSTAR closure, char *data, int count, int
 	    if (looking_at(buf, &i, "% ") ||
 		((started == STARTED_MOVES || started == STARTED_MOVES_NOHIDE)
 		 && looking_at(buf, &i, "}*"))) { char *bookHit = NULL; // [HGM] book
-		if(soughtPending) { // [HGM] seekgraph: on ICC sought-list has no termination line
+		if(soughtPending && nrOfSeekAds) { // [HGM] seekgraph: on ICC sought-list has no termination line
 		    soughtPending = FALSE;
 		    seekGraphUp = TRUE;
 		    DrawSeekGraph();
@@ -4208,6 +4218,7 @@ ParseBoard12 (char *string)
 	newGameMode =
 	  ((relation == RELATION_PLAYING_MYMOVE) == (to_play == 'W')) ?
 	    IcsPlayingWhite : IcsPlayingBlack;
+	soughtPending =FALSE; // [HGM] seekgraph: solve race condition
 	break;
       case RELATION_EXAMINING:
 	newGameMode = IcsExamining;
@@ -4507,7 +4518,10 @@ ParseBoard12 (char *string)
         r = boards[moveNum][CASTLING][5] = initialRights[5];
     }
     /* [HGM] e.p. rights. Assume that ICS sends file number here? */
-    boards[moveNum][EP_STATUS] = double_push == -1 ? EP_NONE : double_push + BOARD_LEFT;
+    boards[moveNum][EP_STATUS] = EP_NONE;
+    if(str[0] == 'P') boards[moveNum][EP_STATUS] = EP_PAWN_MOVE;
+    if(strchr(move_str, 'x')) boards[moveNum][EP_STATUS] = EP_CAPTURE;
+    if(double_push !=  -1) boards[moveNum][EP_STATUS] = double_push + BOARD_LEFT;
 
 
     if (ics_getting_history == H_GOT_REQ_HEADER ||
@@ -5451,6 +5465,7 @@ UnLoadPV ()
 {
   int oldFMM = forwardMostMove; // N.B.: this was currentMove before PV was loaded!
   if(endPV < 0) return;
+  if(appData.autoCopyPV) CopyFENToClipboard();
   endPV = -1;
   if(gameMode == AnalyzeMode && currentMove > forwardMostMove) {
 	Boolean saveAnimate = appData.animate;
@@ -6823,11 +6838,7 @@ LeftClick (ClickType clickType, int xPix, int yPix)
     char promoChoice = NULLCHAR;
     ChessSquare piece;
 
-    if(appData.seekGraph && appData.icsActive && loggedOn &&
-	(gameMode == BeginningOfGame || gameMode == IcsIdle)) {
-	SeekGraphClick(clickType, xPix, yPix, 0);
-	return;
-    }
+    if(SeekGraphClick(clickType, xPix, yPix, 0)) return;
 
     if (clickType == Press) ErrorPopDown();
 
@@ -6876,6 +6887,12 @@ LeftClick (ClickType clickType, int xPix, int yPix)
               || x == BOARD_RGHT+1 && y >= gameInfo.holdingsSize) )
 	return;
 
+    if(gotPremove && x == premoveFromX && y == premoveFromY && clickType == Release) {
+	// could be static click on premove from-square: abort premove
+	gotPremove = 0;
+	ClearPremoveHighlights();
+    }
+
     if(clickType == Press && fromX == x && fromY == y && promoDefaultAltered)
 	fromX = fromY = -1; // second click on piece after altering default promo piece treated as first click
 
@@ -8347,7 +8364,7 @@ if(appData.debugMode) fprintf(debugFP, "nodes = %d, %lld\n", (int) programStats.
 
     /*
      * If chess program startup fails, exit with an error message.
-     * Attempts to recover here are futile.
+     * Attempts to recover here are futile. [HGM] Well, we try anyway
      */
     if ((StrStr(message, "unknown host") != NULL)
 	|| (StrStr(message, "No remote directory") != NULL)
@@ -8361,7 +8378,17 @@ if(appData.debugMode) fprintf(debugFP, "nodes = %d, %lld\n", (int) programStats.
 		_(cps->which), cps->program, cps->host, message);
 	RemoveInputSource(cps->isr);
 	if(appData.icsActive) DisplayFatalError(buf1, 0, 1); else {
-	    if(cps == &first) appData.noChessProgram = TRUE;
+	    cps->isr = NULL;
+	    DestroyChildProcess(cps->pr, 9 ); // just to be sure
+	    cps->pr = NoProc; 
+	    if(cps == &first) {
+		appData.noChessProgram = TRUE;
+		gameMode = MachinePlaysBlack; ModeHighlight(); // kludge to unmark Machine Black menu
+		gameMode = BeginningOfGame; ModeHighlight();
+		SetNCPMode();
+	    }
+	    if(GetDelayedEvent()) CancelDelayedEvent(), ThawUI(); // [HGM] cancel remaining loading effort scheduled after feature timeout
+	    DisplayMessage("", ""); // erase waiting message
 	    DisplayError(buf1, 0);
 	}
 	return;
@@ -10072,6 +10099,24 @@ NextMatchGame ()
 {   // performs game initialization that does not invoke engines, and then tries to start the game
     int res, firstWhite, swapColors = 0;
     if(!NextTourneyGame(nextGame, &swapColors)) return; // this sets matchGame, -fcp / -scp and other options for next game, if needed
+    if(matchMode && appData.debugMode) { // [HGM] debug split: game is part of a match; we might have to create a debug file just for this game
+	char buf[MSG_SIZ];
+	snprintf(buf, MSG_SIZ, appData.nameOfDebugFile, nextGame+1); // expand name of debug file with %d in it
+	if(strcmp(buf, currentDebugFile)) { // name has changed
+	    FILE *f = fopen(buf, "w");
+	    if(f) { // if opening the new file failed, just keep using the old one
+		ASSIGN(currentDebugFile, buf);
+		fclose(debugFP);
+		debugFP = f;
+	    }
+	    if(appData.serverFileName) {
+		if(serverFP) fclose(serverFP);
+		serverFP = fopen(appData.serverFileName, "w");
+		if(serverFP && first.pr != NoProc) fprintf(serverFP, "StartChildProcess (dir=\".\") .\\%s\n", first.tidy);
+		if(serverFP && second.pr != NoProc) fprintf(serverFP, "StartChildProcess (dir=\".\") .\\%s\n", second.tidy);
+	    }
+	}
+    }
     firstWhite = appData.firstPlaysBlack ^ (matchGame & 1 | appData.sameColorGames > 1); // non-incremental default
     firstWhite ^= swapColors; // reverses if NextTourneyGame says we are in an odd round
     first.twoMachinesColor =  firstWhite ? "white\n" : "black\n";   // perform actual color assignement
@@ -13335,7 +13380,7 @@ WaitForEngine (ChessProgramState *cps, DelayedEventCallback retry)
 	} else {
 	  /* kludge: allow timeout for initial "feature" command */
 	  FreezeUI();
-	  snprintf(buf, MSG_SIZ, _("Starting %s chess program"), cps->which);
+	  snprintf(buf, MSG_SIZ, _("Starting %s chess program"), _(cps->which));
 	  DisplayMessage("", buf);
 	  ScheduleDelayedEvent(retry, FEATURE_TIMEOUT);
 	}
@@ -13385,17 +13430,6 @@ TwoMachinesEvent P((void))
 	break;
     }
 
-    if(matchMode && appData.debugMode) { // [HGM] debug split: game is part of a match; we might have to create a debug file just for this game
-	snprintf(buf, MSG_SIZ, appData.nameOfDebugFile, nextGame+1); // expand name of debug file with %d in it
-	if(strcmp(buf, currentDebugFile)) { // name has changed
-	    FILE *f = fopen(buf, "w");
-	    if(f) { // if opening the new file failed, just keep using the old one
-		ASSIGN(currentDebugFile, buf);
-		fclose(debugFP);
-		debugFP = f;
-	    }
-	}
-    }
 //    forwardMostMove = currentMove;
     TruncateGame(); // [HGM] vari: MachineWhite and MachineBlack do this...
 
@@ -13663,6 +13697,7 @@ EditPositionEvent ()
     currentMove = forwardMostMove = backwardMostMove = 0;
     HistorySet(parseList, backwardMostMove, forwardMostMove, currentMove-1);
     DisplayMove(-1);
+    if(!appData.pieceMenu) DisplayMessage("Click clock to clear board", "");
 }
 
 void
@@ -13909,6 +13944,8 @@ EditPositionMenuEvent (ChessSquare selection, int x, int y)
             } else
 	    boards[0][y][x] = selection;
 	    DrawPosition(TRUE, boards[0]);
+	    ClearHighlights();
+	    fromX = fromY = -1;
 	}
 	break;
     }
@@ -15019,6 +15056,10 @@ SendToProgram (char *message, ChessProgramState *cps)
 	fprintf(debugFP, "%ld >%-6s: %s",
 		SubtractTimeMarks(&now, &programStartTime),
 		cps->which, message);
+	if(serverFP)
+	    fprintf(serverFP, "%ld >%-6s: %s",
+		SubtractTimeMarks(&now, &programStartTime),
+		cps->which, message), fflush(serverFP);
     }
 
     count = strlen(message);
@@ -15120,6 +15161,11 @@ ReceiveFromProgram (InputSourceRef isr, VOIDSTAR closure, char *message, int cou
 			SubtractTimeMarks(&now, &programStartTime), cps->which,
 			quote,
 			message);
+		if(serverFP)
+		    fprintf(serverFP, "%ld <%-6s: %s%s\n",
+			SubtractTimeMarks(&now, &programStartTime), cps->which,
+			quote,
+			message), fflush(serverFP);
 	}
     }