X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=backend.c;h=c3178c41f6702ad7fe20ad30a686ba57491f9e72;hb=392b4a35b616b19a6cfb2c79fa4521792a164577;hp=acb912319a7999355e64aef352d33f4f2247e499;hpb=8f1c9fee822580af366e6e3624ba7354e1126ce8;p=xboard.git

diff --git a/backend.c b/backend.c
index acb9123..c3178c4 100755
--- a/backend.c
+++ b/backend.c
@@ -607,7 +607,7 @@ InitBackEnd1()
     ShowThinkingEvent(); // [HGM] thinking: make sure post/nopost state is set according to options
 
     GetTimeMark(&programStartTime);
-    srandom(programStartTime.ms); // [HGM] book: makes sure random is unpredictabe to msec level
+    srandom((programStartTime.ms + 1000*programStartTime.sec)*0x1001001); // [HGM] book: makes sure random is unpredictabe to msec level
 
     ClearProgramStats();
     programStats.ok_to_send = 1;
@@ -3232,16 +3232,14 @@ read_from_ics(isr, closure, data, count, error)
 		      if (currentMove == 0 &&
 			  gameMode == IcsPlayingWhite &&
 			  appData.premoveWhite) {
-			sprintf(str, "%s%s\n", ics_prefix,
-				appData.premoveWhiteText);
+			sprintf(str, "%s\n", appData.premoveWhiteText);
 			if (appData.debugMode)
 			  fprintf(debugFP, "Sending premove:\n");
 			SendToICS(str);
 		      } else if (currentMove == 1 &&
 				 gameMode == IcsPlayingBlack &&
 				 appData.premoveBlack) {
-			sprintf(str, "%s%s\n", ics_prefix,
-				appData.premoveBlackText);
+			sprintf(str, "%s\n", appData.premoveBlackText);
 			if (appData.debugMode)
 			  fprintf(debugFP, "Sending premove:\n");
 			SendToICS(str);
@@ -3720,15 +3718,6 @@ ParseBoard12(string)
     /* Update currentMove and known move number limits */
     newMove = newGame || moveNum > forwardMostMove;
 
-    /* [DM] If we found takebacks during icsEngineAnalyze try send to engine */
-    if (!newGame && appData.icsEngineAnalyze && moveNum < forwardMostMove) {
-        takeback = forwardMostMove - moveNum;
-        for (i = 0; i < takeback; i++) {
-             if (appData.debugMode) fprintf(debugFP, "take back move\n");
-             SendToProgram("undo\n", &first);
-        }
-    }
-
     if (newGame) {
 	forwardMostMove = backwardMostMove = currentMove = moveNum;
 	if (gameMode == IcsExamining && moveNum == 0) {
@@ -3741,6 +3730,20 @@ ParseBoard12(string)
 	}
     } else if (moveNum == forwardMostMove + 1 || moveNum == forwardMostMove
 	       || (moveNum < forwardMostMove && moveNum >= backwardMostMove)) {
+#if ZIPPY
+	/* [DM] If we found takebacks during icsEngineAnalyze try send to engine */
+	/* [HGM] applied this also to an engine that is silently watching        */
+	if (appData.zippyPlay && moveNum < forwardMostMove && first.initDone &&
+	    (gameMode == IcsObserving || gameMode == IcsExamining) &&
+	    gameInfo.variant == currentlyInitializedVariant) {
+	  takeback = forwardMostMove - moveNum;
+	  for (i = 0; i < takeback; i++) {
+	    if (appData.debugMode) fprintf(debugFP, "take back move\n");
+	    SendToProgram("undo\n", &first);
+	  }
+	}
+#endif
+
 	forwardMostMove = moveNum;
 	if (!pausing || currentMove > forwardMostMove)
 	  currentMove = forwardMostMove;
@@ -3751,12 +3754,20 @@ ParseBoard12(string)
 	    forwardMostMove = pauseExamForwardMostMove;
 	    return;
 	}
-	forwardMostMove = backwardMostMove = currentMove = moveNum;
 	if (gameMode == IcsExamining && moveNum > 0 && appData.getMoveList) {
+#if ZIPPY
+	    if(appData.zippyPlay && forwardMostMove > 0 && first.initDone) {
+		// [HGM] when we will receive the move list we now request, it will be
+		// fed to the engine from the first move on. So if the engine is not
+		// in the initial position now, bring it there.
+		InitChessProgram(&first, 0);
+	    }
+#endif
 	    ics_getting_history = H_REQUESTED;
 	    sprintf(str, "%smoves %d\n", ics_prefix, gamenum);
 	    SendToICS(str);
 	}
+	forwardMostMove = backwardMostMove = currentMove = moveNum;
     }
     
     /* Update the clocks */
@@ -5258,6 +5269,7 @@ UserMoveTest(fromX, fromY, toX, toY, promoChar, captureOwn)
         return ImpossibleMove;
     }
 
+    if(toX < 0 || toY < 0) return ImpossibleMove;
     pdown = boards[currentMove][fromY][fromX];
     pup = boards[currentMove][toY][toX];
 
@@ -5602,16 +5614,11 @@ void LeftClick(ClickType clickType, int xPix, int yPix)
 	    }
 	    return;
 	}
-	// ignore to-clicks in holdings
+	// ignore clicks on holdings
 	if(x < BOARD_LEFT || x >= BOARD_RGHT) return;
     }
 
-    if (clickType == Release && (x == fromX && y == fromY ||
-	x < BOARD_LEFT || x >= BOARD_RGHT)) {
-
-	// treat drags into holding as click on start square
-	x = fromX; y = fromY;
-
+    if (clickType == Release && x == fromX && y == fromY) {
 	DragPieceEnd(xPix, yPix);
 	if (appData.animateDragging) {
 	    /* Undo animation damage if any */
@@ -5631,7 +5638,7 @@ void LeftClick(ClickType clickType, int xPix, int yPix)
 	return;
     }
 
-    /* we now have a different from- and to-square */
+    /* we now have a different from- and (possibly off-board) to-square */
     /* Completed move */
     toX = x;
     toY = y;
@@ -5654,6 +5661,17 @@ void LeftClick(ClickType clickType, int xPix, int yPix)
 	/* Don't animate move and drag both */
 	appData.animate = FALSE;
     }
+
+    // moves into holding are invalid for now (later perhaps allow in EditPosition)
+    if(x >= 0 && x < BOARD_LEFT || x >= BOARD_RGHT) {
+	ClearHighlights();
+	fromX = fromY = -1;
+	return;
+    }
+
+    // off-board moves should not be highlighted
+    if(x < 0 || x < 0) ClearHighlights();
+
     if (HasPromotionChoice(fromX, fromY, toX, toY, &promoChoice)) {
 	SetHighlights(fromX, fromY, toX, toY);
 	if(gameInfo.variant == VariantSuper || gameInfo.variant == VariantGreat) {