Fix promotionPopDown on new move entry

[xboard.git] / backend.c

diff --git a/backend.c b/backend.c
index a2ff648..265a55c 100644 (file)
--- a/backend.c
+++ b/backend.c
@@ -5173,6 +5173,12 @@ Sweep (int step)
     } while(PieceToChar(promoSweep) == '.' || PieceToChar(promoSweep) == '~' || promoSweep == pawn ||
            appData.testLegality && (promoSweep == king ||
            gameInfo.variant == VariantShogi && promoSweep != PROMOTED last && last != PROMOTED promoSweep && last != promoSweep));
+    if(toX >= 0) {
+       int victim = boards[currentMove][toY][toX];
+       boards[currentMove][toY][toX] = promoSweep;
+       DrawPosition(FALSE, boards[currentMove]);
+       boards[currentMove][toY][toX] = victim;
+    } else
     ChangeDragPiece(promoSweep);
 }
 
@@ -6932,7 +6938,7 @@ MarkTargetSquares (int clear)
       for(x=0; x<BOARD_WIDTH; x++) for(y=0; y<BOARD_HEIGHT; y++) if(marker[y][x] == 1) marker[y][x] = 0;
     }
   }
-  DrawPosition(TRUE, NULL);
+  DrawPosition(FALSE, NULL);
 }
 
 int
@@ -6971,7 +6977,7 @@ LeftClick (ClickType clickType, int xPix, int yPix)
 {
     int x, y;
     Boolean saveAnimate;
-    static int second = 0, promotionChoice = 0, clearFlag = 0;
+    static int second = 0, promotionChoice = 0, clearFlag = 0, sweepSelecting = 0;
     char promoChoice = NULLCHAR;
     ChessSquare piece;
     static TimeMark lastClickTime, prevClickTime;
@@ -6995,7 +7001,7 @@ LeftClick (ClickType clickType, int xPix, int yPix)
        defaultPromoChoice = promoSweep;
        promoSweep = EmptySquare;   // terminate sweep
        promoDefaultAltered = TRUE;
-       if(!selectFlag && (x != toX || y != toY)) x = fromX, y = fromY; // and fake up-click on same square if we were still selecting
+       if(!selectFlag && !sweepSelecting && (x != toX || y != toY)) x = fromX, y = fromY; // and fake up-click on same square if we were still selecting
     }
 
     if(promotionChoice) { // we are waiting for a click to indicate promotion piece
@@ -7073,6 +7079,8 @@ LeftClick (ClickType clickType, int xPix, int yPix)
                }
                if (appData.highlightDragging) {
                    SetHighlights(fromX, fromY, -1, -1);
+               } else {
+                   ClearHighlights();
                }
            } else fromX = fromY = -1;
            return;
@@ -7152,9 +7160,10 @@ LeftClick (ClickType clickType, int xPix, int yPix)
            /* Undo animation damage if any */
            DrawPosition(FALSE, NULL);
        }
-       if (second) {
+       if (second || sweepSelecting) {
            /* Second up/down in same square; just abort move */
-           second = 0;
+           if(sweepSelecting) DrawPosition(FALSE, boards[currentMove]);
+           second = sweepSelecting = 0;
            fromX = fromY = -1;
            gatingPiece = EmptySquare;
            ClearHighlights();
@@ -7171,9 +7180,12 @@ LeftClick (ClickType clickType, int xPix, int yPix)
 
     /* we now have a different from- and (possibly off-board) to-square */
     /* Completed move */
-    toX = x;
-    toY = y;
-    saveAnimate = appData.animate;
+    if(!sweepSelecting) {
+       toX = x;
+       toY = y;
+       saveAnimate = appData.animate;
+    } else sweepSelecting = 0; // this must be the up-click corresponding to the down-click that started the sweep
+
     if (clickType == Press) {
        if(gameMode == EditPosition && boards[currentMove][fromY][fromX] == EmptySquare) {
            // must be Edit Position mode with empty-square selected
@@ -7181,28 +7193,25 @@ LeftClick (ClickType clickType, int xPix, int yPix)
            if(x >= BOARD_LEFT && x < BOARD_RGHT) clearFlag = 1; // and defer click-click move of empty-square to up-click
            return;
        }
-       /* Finish clickclick move */
-       if (appData.animate || appData.highlightLastMove) {
-           SetHighlights(fromX, fromY, toX, toY);
-       } else {
-           ClearHighlights();
-       }
        if(HasPromotionChoice(fromX, fromY, toX, toY, &promoChoice, FALSE)) {
          if(appData.sweepSelect) {
            ChessSquare piece = boards[currentMove][fromY][fromX];
-           ChessSquare victim = boards[currentMove][toY][toX];
-           boards[currentMove][toY][toX] = piece; // kludge: make sure there is something to grab for drag
-           DragPieceBegin(xPix, yPix, TRUE); dragging = 1;
-           boards[currentMove][toY][toX] = victim;
            promoSweep = defaultPromoChoice;
            if(PieceToChar(PROMOTED piece) == '+') promoSweep = PROMOTED piece;
            selectFlag = 0; lastX = xPix; lastY = yPix;
            Sweep(0); // Pawn that is going to promote: preview promotion piece
+           sweepSelecting = 1;
            DisplayMessage("", _("Pull pawn backwards to under-promote"));
-           DrawPosition(FALSE, boards[currentMove]);
+           MarkTargetSquares(1);
          }
          return; // promo popup appears on up-click
        }
+       /* Finish clickclick move */
+       if (appData.animate || appData.highlightLastMove) {
+           SetHighlights(fromX, fromY, toX, toY);
+       } else {
+           ClearHighlights();
+       }
     } else {
        /* Finish drag move */
        if (appData.highlightLastMove) {