X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=backend.c;h=7243ee73b0fb26fb80ea881833415ec0c986eac8;hb=0c319b0184e2b431cbf381096e1849f23053cad6;hp=bc6ec28a39d2d768520375c265970327cf6792a2;hpb=2ee09cd4d5abd21ff6f1072bfba123c1498bef23;p=xboard.git

diff --git a/backend.c b/backend.c
index bc6ec28..7243ee7 100644
--- a/backend.c
+++ b/backend.c
@@ -4162,6 +4162,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 +4170,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);
+			}
 		      }
 		    }
 
@@ -6742,7 +6750,7 @@ HasPromotionChoice (int fromX, int fromY, int toX, int toY, char *promoChoice, i
 	    *promoChoice = PieceToChar(p++);
 	    if(*promoChoice != '.') break;
 	}
-	return FALSE;
+	if(!*engineVariant) return FALSE; // if used as parent variant there might be promotion choice
     }
     // no sense asking what we must promote to if it is going to explode...
     if(gameInfo.variant == VariantAtomic && boards[currentMove][toY][toX] != EmptySquare) {
@@ -6959,7 +6967,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 +7051,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 +7073,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;
@@ -7449,8 +7459,8 @@ CanPromote (ChessSquare piece, int y)
 	// some variants have fixed promotion piece, no promotion at all, or another selection mechanism
 	if(IS_SHOGI(gameInfo.variant)          || gameInfo.variant == VariantXiangqi ||
 	   gameInfo.variant == VariantSuper    || gameInfo.variant == VariantGreat   ||
-	   gameInfo.variant == VariantShatranj || gameInfo.variant == VariantCourier ||
-         gameInfo.variant == VariantMakruk) return FALSE;
+	  (gameInfo.variant == VariantShatranj || gameInfo.variant == VariantCourier ||
+           gameInfo.variant == VariantMakruk) && !*engineVariant) return FALSE;
 	return (piece == BlackPawn && y <= zone ||
 		piece == WhitePawn && y >= BOARD_HEIGHT-1-zone ||
 		piece == BlackLance && y <= zone ||
@@ -7981,6 +7991,23 @@ RightClick (ClickType action, int x, int y, int *fromX, int *fromY)
 }
 
 void
+Wheel (int dir, int x, int y)
+{
+    if(gameMode == EditPosition) {
+	int xSqr = EventToSquare(x, BOARD_WIDTH);
+	int ySqr = EventToSquare(y, BOARD_HEIGHT);
+	if(ySqr < 0 || xSqr < BOARD_LEFT || xSqr >= BOARD_RGHT) return;
+	if(flipView) xSqr = BOARD_WIDTH - 1 - xSqr; else ySqr = BOARD_HEIGHT - 1 - ySqr;
+	do {
+	    boards[currentMove][ySqr][xSqr] += dir;
+	    if((int) boards[currentMove][ySqr][xSqr] < WhitePawn) boards[currentMove][ySqr][xSqr] = BlackKing;
+	    if((int) boards[currentMove][ySqr][xSqr] > BlackKing) boards[currentMove][ySqr][xSqr] = WhitePawn;
+	} while(PieceToChar(boards[currentMove][ySqr][xSqr]) == '.');
+	DrawPosition(FALSE, boards[currentMove]);
+    } else if(dir > 0) ForwardEvent(); else BackwardEvent();
+}
+
+void
 SendProgramStatsToFrontend (ChessProgramState * cps, ChessProgramStats * cpstats)
 {
 //    char * hint = lastHint;