X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=backend.c;h=aea15b58bda448bee0a5cfbdf826beef25be693f;hb=90cc6b8204d671bde9f59382c94729271c3d5e23;hp=ab84abe4e119f41dba0d0bb5c59388d0a45a6a2a;hpb=5deaf4dafd42e67ed6c9037d40b9c7d777870e33;p=xboard.git

diff --git a/backend.c b/backend.c
index ab84abe..aea15b5 100644
--- a/backend.c
+++ b/backend.c
@@ -12609,6 +12609,15 @@ LoadGame (FILE *f, int gameNumber, char *title, int useList)
       AnalyzeFileEvent();
     }
 
+    if(gameInfo.result == GameUnfinished && gameInfo.resultDetails && appData.clockMode) {
+	long int w, b; // [HGM] adjourn: restore saved clock times
+	char *p = strstr(gameInfo.resultDetails, "(Clocks:");
+	if(p && sscanf(p+8, "%ld,%ld", &w, &b) == 2) {
+	    timeRemaining[0][forwardMostMove] = whiteTimeRemaining = 1000*w + 500;
+	    timeRemaining[1][forwardMostMove] = blackTimeRemaining = 1000*b + 500;
+	}
+    }
+
     if(creatingBook) return TRUE;
     if (!matchMode && pos > 0) {
 	ToNrEvent(pos); // [HGM] no autoplay if selected on position
@@ -13110,8 +13119,11 @@ SaveGamePGN (FILE *f)
     /* Print result */
     if (gameInfo.resultDetails != NULL &&
 	gameInfo.resultDetails[0] != NULLCHAR) {
-	fprintf(f, "{%s} %s\n\n", gameInfo.resultDetails,
-		PGNResult(gameInfo.result));
+	char buf[MSG_SIZ], *p = gameInfo.resultDetails;
+	if(gameInfo.result == GameUnfinished && appData.clockMode &&
+	   (gameMode == MachinePlaysWhite || gameMode == MachinePlaysBlack || gameMode == TwoMachinesPlay)) // [HGM] adjourn: save clock settings
+	    snprintf(buf, MSG_SIZ, "%s (Clocks: %ld, %ld)", p, whiteTimeRemaining/1000, blackTimeRemaining/1000), p = buf;
+	fprintf(f, "{%s} %s\n\n", p, PGNResult(gameInfo.result));
     } else {
 	fprintf(f, "%s\n\n", PGNResult(gameInfo.result));
     }
@@ -14144,7 +14156,7 @@ TwoMachinesEvent P((void))
       case MachinePlaysWhite:
       case MachinePlaysBlack:
 	if (WhiteOnMove(forwardMostMove) == (gameMode == MachinePlaysWhite)) {
-	    DisplayError(_("Wait until your turn,\nor select Move Now"), 0);
+	    DisplayError(_("Wait until your turn,\nor select 'Move Now'."), 0);
 	    return;
 	}
 	/* fall through */
@@ -14581,11 +14593,14 @@ EditPositionMenuEvent (ChessSquare selection, int x, int y)
 {
     char buf[MSG_SIZ];
     ChessSquare piece = boards[0][y][x];
+    static Board erasedBoard, currentBoard, menuBoard;
 
     if (gameMode != EditPosition && gameMode != IcsExamining) return;
 
     switch (selection) {
       case ClearBoard:
+	CopyBoard(currentBoard, boards[0]);
+	CopyBoard(menuBoard, initialPosition);
 	if (gameMode == IcsExamining && ics_type == ICS_FICS) {
 	    SendToICS(ics_prefix);
 	    SendToICS("bsetup clear\n");
@@ -14593,6 +14608,7 @@ EditPositionMenuEvent (ChessSquare selection, int x, int y)
 	    SendToICS(ics_prefix);
 	    SendToICS("clearboard\n");
 	} else {
+            int nonEmpty = 0;
             for (x = 0; x < BOARD_WIDTH; x++) { ChessSquare p = EmptySquare;
 		if(x == BOARD_LEFT-1 || x == BOARD_RGHT) p = (ChessSquare) 0; /* [HGM] holdings */
                 for (y = 0; y < BOARD_HEIGHT; y++) {
@@ -14603,9 +14619,30 @@ EditPositionMenuEvent (ChessSquare selection, int x, int y)
 			    SendToICS(buf);
 			}
 		    } else {
+			if(boards[0][y][x] != p) nonEmpty++;
 			boards[0][y][x] = p;
 		    }
 		}
+		menuBoard[1][x] = menuBoard[BOARD_HEIGHT-2][x] = p;
+	    }
+	    if(gameMode != IcsExamining) { // [HGM] editpos: cycle trough boards
+		for(x = BOARD_LEFT; x < BOARD_RGHT; x++) { // create 'menu board' by removing duplicates 
+		    ChessSquare p = menuBoard[0][x];
+		    for(y = x + 1; y < BOARD_RGHT; y++) if(menuBoard[0][y] == p) menuBoard[0][y] = EmptySquare;
+		    p = menuBoard[BOARD_HEIGHT-1][x];
+		    for(y = x + 1; y < BOARD_RGHT; y++) if(menuBoard[BOARD_HEIGHT-1][y] == p) menuBoard[BOARD_HEIGHT-1][y] = EmptySquare;
+		}
+		if(!nonEmpty) { // asked to clear an empty board
+		    CopyBoard(boards[0], menuBoard);
+		} else
+		if(CompareBoards(currentBoard, menuBoard)) { // asked to clear an empty board
+		    CopyBoard(boards[0], initialPosition);
+		} else
+		if(CompareBoards(currentBoard, initialPosition) && !CompareBoards(currentBoard, erasedBoard)) {
+		    CopyBoard(boards[0], erasedBoard);
+		} else
+		    CopyBoard(erasedBoard, currentBoard);
+
 	    }
 	}
 	if (gameMode == EditPosition) {
@@ -15259,7 +15296,7 @@ RetractMoveEvent ()
       case MachinePlaysWhite:
       case MachinePlaysBlack:
 	if (WhiteOnMove(forwardMostMove) == (gameMode == MachinePlaysWhite)) {
-	    DisplayError(_("Wait until your turn,\nor select Move Now"), 0);
+	    DisplayError(_("Wait until your turn,\nor select 'Move Now'."), 0);
 	    return;
 	}
 	if (forwardMostMove < 2) return;
@@ -15357,14 +15394,14 @@ HintEvent ()
     switch (gameMode) {
       case MachinePlaysWhite:
 	if (WhiteOnMove(forwardMostMove)) {
-	    DisplayError(_("Wait until your turn"), 0);
+	    DisplayError(_("Wait until your turn."), 0);
 	    return;
 	}
 	break;
       case BeginningOfGame:
       case MachinePlaysBlack:
 	if (!WhiteOnMove(forwardMostMove)) {
-	    DisplayError(_("Wait until your turn"), 0);
+	    DisplayError(_("Wait until your turn."), 0);
 	    return;
 	}
 	break;
@@ -15417,14 +15454,14 @@ BookEvent ()
     switch (gameMode) {
       case MachinePlaysWhite:
 	if (WhiteOnMove(forwardMostMove)) {
-	    DisplayError(_("Wait until your turn"), 0);
+	    DisplayError(_("Wait until your turn."), 0);
 	    return;
 	}
 	break;
       case BeginningOfGame:
       case MachinePlaysBlack:
 	if (!WhiteOnMove(forwardMostMove)) {
-	    DisplayError(_("Wait until your turn"), 0);
+	    DisplayError(_("Wait until your turn."), 0);
 	    return;
 	}
 	break;