X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=backend.c;h=c487dd164339c5cef47b856db121a8ab52842a8a;hb=f856eb7ac5fbeec648f7fd27013905f0a5a26616;hp=36131f683c4a3e4c810f8995ece67b248f984f4e;hpb=24eec7ef0db2c98df79453e377a72cefe12b7569;p=xboard.git

diff --git a/backend.c b/backend.c
index 36131f6..c487dd1 100644
--- a/backend.c
+++ b/backend.c
@@ -5,7 +5,8 @@
  * Massachusetts.
  *
  * Enhancements Copyright 1992-2001, 2002, 2003, 2004, 2005, 2006,
- * 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Free Software Foundation, Inc.
+ * 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Free
+ * Software Foundation, Inc.
  *
  * Enhancements Copyright 2005 Alessandro Scotti
  *
@@ -4162,6 +4163,7 @@ read_from_ics (InputSourceRef isr, VOIDSTAR closure, char *data, int count, int
 			  fprintf(debugFP, "Sending premove:\n");
 			SendToICS(str);
 		      } else if (gotPremove) {
+			int oldFMM = forwardMostMove;
 			gotPremove = 0;
 			ClearPremoveHighlights();
 			if (appData.debugMode)
@@ -4169,6 +4171,13 @@ read_from_ics (InputSourceRef isr, VOIDSTAR closure, char *data, int count, int
                           UserMoveEvent(premoveFromX, premoveFromY,
 				        premoveToX, premoveToY,
                                         premovePromoChar);
+			if(forwardMostMove == oldFMM) { // premove was rejected, highlight last opponent move
+			  if(moveList[oldFMM-1][1] != '@')
+			    SetHighlights(moveList[oldFMM-1][0]-AAA, moveList[oldFMM-1][1]-ONE,
+					  moveList[oldFMM-1][2]-AAA, moveList[oldFMM-1][3]-ONE);
+			  else // (drop)
+			    SetHighlights(-1, -1, moveList[oldFMM-1][2]-AAA, moveList[oldFMM-1][3]-ONE);
+			}
 		      }
 		    }
 
@@ -6841,6 +6850,7 @@ OKToStartUserMove (int x, int y)
       case PlayFromGameFile:
 	    if(!shiftKey || !appData.variations) return FALSE; // [HGM] allow starting variation in this mode
       case EditGame:
+      case AnalyzeMode:
 	if (!white_piece && WhiteOnMove(currentMove)) {
 	    DisplayMoveError(_("It is White's turn"));
 	    return FALSE;
@@ -6959,7 +6969,7 @@ int doubleClick;
 Boolean addToBookFlag;
 
 void
-UserMoveEvent(int fromX, int fromY, int toX, int toY, int promoChar)
+UserMoveEvent (int fromX, int fromY, int toX, int toY, int promoChar)
 {
     ChessMove moveType;
     ChessSquare pup;
@@ -7043,6 +7053,7 @@ UserMoveEvent(int fromX, int fromY, int toX, int toY, int promoChar)
 			    "fromY %d, toX %d, toY %d\n",
 			    fromX, fromY, toX, toY);
 	    }
+            DrawPosition(TRUE, boards[currentMove]); // [HGM] repair animation damage done by premove (in particular emptying from-square)
             return;
 	}
 	break;
@@ -7064,6 +7075,7 @@ UserMoveEvent(int fromX, int fromY, int toX, int toY, int promoChar)
 			    "fromY %d, toX %d, toY %d\n",
 			    fromX, fromY, toX, toY);
 	    }
+            DrawPosition(TRUE, boards[currentMove]);
             return;
 	}
 	break;
@@ -9756,6 +9768,7 @@ FakeBookMove: // [HGM] book: we jump here to simulate machine moves after book h
                     [AS] Protect the thinkOutput buffer from overflow... this
                     is only useful if buf1 hasn't overflowed first!
                 */
+		if((gameMode == AnalyzeMode && appData.whitePOV || appData.scoreWhite) && !WhiteOnMove(forwardMostMove)) curscore *= -1;
 		if(curscore >= MATE_SCORE) 
 		    snprintf(score_buf, MSG_SIZ, "#%d", curscore - MATE_SCORE);
 		else if(curscore <= -MATE_SCORE)