X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=backend.c;h=0a512828d10f89b7afff67575e9896c94ab78f00;hb=b4785979256d342c544eaca1a6644a70eb96b2e0;hp=a8a44cba5e64e100f4fabf832e80141d5bfecc89;hpb=19c346df37adc6e9ac46315de74f1d6bb33fdc07;p=xboard.git

diff --git a/backend.c b/backend.c
index a8a44cb..0a51282 100755
--- a/backend.c
+++ b/backend.c
@@ -794,7 +794,8 @@ InitBackEnd1()
 
     if (appData.icsActive) {
         appData.clockMode = TRUE;  /* changes dynamically in ICS mode */
-    } else if (*appData.searchTime != NULLCHAR || appData.noChessProgram) {
+//    } else if (*appData.searchTime != NULLCHAR || appData.noChessProgram) {
+    } else if (appData.noChessProgram) { // [HGM] st: searchTime mode now also is clockMode
 	appData.clockMode = FALSE;
 	first.sendTime = second.sendTime = 0;
     }
@@ -2016,8 +2017,7 @@ VariantSwitch(Board board, VariantClass newVariant)
    } else gameInfo.variant = newVariant;
    CopyBoard(oldBoard, board);   // remember correctly formatted board
      InitPosition(FALSE);          /* this sets up board[0], but also other stuff        */
-   if(currentMove == 0) CopyBoard(board, oldBoard); // preserve start position
-   DrawPosition(TRUE, boards[currentMove]);
+   DrawPosition(TRUE, currentMove ? boards[currentMove] : oldBoard);
 }
 
 static int loggedOn = FALSE;
@@ -3261,6 +3261,7 @@ read_from_ics(isr, closure, data, count, error)
 
 		    /* Usually suppress following prompt */
 		    if (!(forwardMostMove == 0 && gameMode == IcsExamining)) {
+			while(looking_at(buf, &i, "\n")); // [HGM] skip empty lines
 			if (looking_at(buf, &i, "*% ")) {
 			    savingComment = FALSE;
 			}
@@ -3579,7 +3580,7 @@ ParseBoard12(string)
 	timeIncrement = increment * 1000;
 	movesPerSession = 0;
 	gameInfo.timeControl = TimeControlTagValue();
-        VariantSwitch(board, StringToVariant(gameInfo.event) );
+        VariantSwitch(boards[currentMove], StringToVariant(gameInfo.event) );
   if (appData.debugMode) {
     fprintf(debugFP, "ParseBoard says variant = '%s'\n", gameInfo.event);
     fprintf(debugFP, "recognized as %s\n", VariantName(gameInfo.variant));
@@ -5674,6 +5675,7 @@ void LeftClick(ClickType clickType, int xPix, int yPix)
     if(x >= 0 && x < BOARD_LEFT || x >= BOARD_RGHT) {
 	ClearHighlights();
 	fromX = fromY = -1;
+	DrawPosition(TRUE, NULL);
 	return;
     }
 
@@ -13023,26 +13025,23 @@ DisplayComment(moveNumber, text)
     char title[MSG_SIZ];
     char buf[8000]; // comment can be long!
     int score, depth;
-
-    if( appData.autoDisplayComment ) {
-        if (moveNumber < 0 || parseList[moveNumber][0] == NULLCHAR) {
-	    strcpy(title, "Comment");
-        } else {
-	    sprintf(title, "Comment on %d.%s%s", moveNumber / 2 + 1,
-		    WhiteOnMove(moveNumber) ? " " : ".. ",
-		    parseList[moveNumber]);
-        }
-	// [HGM] PV info: display PV info together with (or as) comment
-	if(moveNumber >= 0 && (depth = pvInfoList[moveNumber].depth) > 0) {
-	    if(text == NULL) text = "";                                           
-	    score = pvInfoList[moveNumber].score;
-	    sprintf(buf, "%s%.2f/%d %d\n%s", score>0 ? "+" : "", score/100.,
-                              depth, (pvInfoList[moveNumber].time+50)/100, text);
-	    text = buf;
-	}
-    } else title[0] = 0;
-
-    if (text != NULL)
+    
+    if (moveNumber < 0 || parseList[moveNumber][0] == NULLCHAR) {
+      strcpy(title, "Comment");
+    } else {
+      sprintf(title, "Comment on %d.%s%s", moveNumber / 2 + 1,
+	      WhiteOnMove(moveNumber) ? " " : ".. ",
+	      parseList[moveNumber]);
+    }
+    // [HGM] PV info: display PV info together with (or as) comment
+    if(moveNumber >= 0 && (depth = pvInfoList[moveNumber].depth) > 0) {
+      if(text == NULL) text = "";                                           
+      score = pvInfoList[moveNumber].score;
+      sprintf(buf, "%s%.2f/%d %d\n%s", score>0 ? "+" : "", score/100.,
+	      depth, (pvInfoList[moveNumber].time+50)/100, text);
+      text = buf;
+    }
+    if (text != NULL && (appData.autoDisplayComment || commentUp))
         CommentPopUp(title, text);
 }
 
@@ -13133,7 +13132,7 @@ CheckFlags()
 void
 CheckTimeControl()
 {
-    if (!appData.clockMode || appData.icsActive ||
+    if (!appData.clockMode || appData.icsActive || searchTime || // [HGM] st: no inc in st mode
 	gameMode == PlayFromGameFile || forwardMostMove == 0) return;
 
     /*
@@ -13259,6 +13258,9 @@ ResetClocks()
     (void) StopClockTimer();
     if (appData.icsActive) {
 	whiteTimeRemaining = blackTimeRemaining = 0;
+    } else if (searchTime) {
+	whiteTimeRemaining = 1000*searchTime / WhitePlayer()->timeOdds;
+	blackTimeRemaining = 1000*searchTime / WhitePlayer()->other->timeOdds;
     } else { /* [HGM] correct new time quote for time odds */
         whiteTimeRemaining = GetTimeQuota(-1) / WhitePlayer()->timeOdds;
         blackTimeRemaining = GetTimeQuota(-1) / WhitePlayer()->other->timeOdds;
@@ -13388,6 +13390,12 @@ SwitchClocks()
 	break;
     }
 
+    if (searchTime) { // [HGM] st: set clock of player that has to move to max time
+	if(WhiteOnMove(forwardMostMove))
+	     whiteTimeRemaining = 1000*searchTime / WhitePlayer()->timeOdds;
+	else blackTimeRemaining = 1000*searchTime / WhitePlayer()->other->timeOdds;
+    }
+
     tickStartTM = now;
     intendedTickLength = NextTickLength(WhiteOnMove(forwardMostMove) ?
       whiteTimeRemaining : blackTimeRemaining);