X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=backend.c;h=a2ff648f21dfd098bf2dfbe16e99e201332015f6;hb=8f331d8de1bad648f7a7069b8d0da3697f723e3d;hp=5e9e90bd17602f34a6f1a0c2b4df5a95af20d962;hpb=7bdcfb0091ce3a03d9fd533f3b2915feb5db6ac9;p=xboard.git

diff --git a/backend.c b/backend.c
index 5e9e90b..a2ff648 100644
--- a/backend.c
+++ b/backend.c
@@ -455,10 +455,10 @@ int shiftKey, controlKey; // [HGM] set by mouse handler
 int have_sent_ICS_logon = 0;
 int movesPerSession;
 int suddenDeath, whiteStartMove, blackStartMove; /* [HGM] for implementation of 'any per time' sessions, as in first part of byoyomi TC */
-long whiteTimeRemaining, blackTimeRemaining, timeControl, timeIncrement, lastWhite, lastBlack;
+long whiteTimeRemaining, blackTimeRemaining, timeControl, timeIncrement, lastWhite, lastBlack, activePartnerTime;
 Boolean adjustedClock;
 long timeControl_2; /* [AS] Allow separate time controls */
-char *fullTimeControlString = NULL, *nextSession, *whiteTC, *blackTC; /* [HGM] secondary TC: merge of MPS, TC and inc */
+char *fullTimeControlString = NULL, *nextSession, *whiteTC, *blackTC, activePartner; /* [HGM] secondary TC: merge of MPS, TC and inc */
 long timeRemaining[2][MAX_MOVES];
 int matchGame = 0, nextGame = 0, roundNr = 0;
 Boolean waitingForGame = FALSE;
@@ -4244,6 +4244,7 @@ ParseBoard12 (char *string)
     if((gameMode == IcsPlayingWhite || gameMode == IcsPlayingBlack)
 	 && newGameMode == IcsObserving && gamenum != ics_gamenum && appData.bgObserve) {
       // [HGM] bughouse: don't act on alien boards while we play. Just parse the board and save it */
+      int fac = strchr(elapsed_time, '.') ? 1 : 1000;
       char *toSqr;
       for (k = 0; k < ranks; k++) {
         for (j = 0; j < files; j++)
@@ -4266,11 +4267,13 @@ ParseBoard12 (char *string)
       if(twoBoards) { partnerUp = 1; flipView = !flipView; } // [HGM] dual
       if(partnerUp) DrawPosition(FALSE, partnerBoard);
       if(twoBoards) {
-	  DisplayWhiteClock(white_time, to_play == 'W');
-	  DisplayBlackClock(black_time, to_play != 'W');
+	  DisplayWhiteClock(white_time*fac, to_play == 'W');
+	  DisplayBlackClock(black_time*fac, to_play != 'W');
+	  activePartner = to_play;
+	  activePartnerTime = to_play == 'W' ? white_time*fac : black_time*fac;
 	              partnerUp = 0; flipView = !flipView; } // [HGM] dual
-      snprintf(partnerStatus, MSG_SIZ,"W: %d:%02d B: %d:%02d (%d-%d) %c", white_time/60000, (white_time%60000)/1000,
-		 (black_time/60000), (black_time%60000)/1000, white_stren, black_stren, to_play);
+      snprintf(partnerStatus, MSG_SIZ,"W: %d:%02d B: %d:%02d (%d-%d) %c", white_time*fac/60000, (white_time*fac%60000)/1000,
+		 (black_time*fac/60000), (black_time*fac%60000)/1000, white_stren, black_stren, to_play);
       DisplayMessage(partnerStatus, "");
 	partnerBoardValid = TRUE;
       return;
@@ -6916,11 +6919,11 @@ void
 MarkTargetSquares (int clear)
 {
   int x, y;
+  if(clear) // no reason to ever suppress clearing
+    for(x=0; x<BOARD_WIDTH; x++) for(y=0; y<BOARD_HEIGHT; y++) marker[y][x] = 0;
   if(!appData.markers || !appData.highlightDragging || appData.icsActive && gameInfo.variant < VariantShogi ||
      !appData.testLegality || gameMode == EditPosition) return;
-  if(clear) {
-    for(x=0; x<BOARD_WIDTH; x++) for(y=0; y<BOARD_HEIGHT; y++) marker[y][x] = 0;
-  } else {
+  if(!clear) {
     int capt = 0;
     GenLegal(boards[currentMove], PosFlags(currentMove), Mark, (void*) marker, EmptySquare);
     if(PosFlags(0) & F_MANDATORY_CAPTURE) {
@@ -7171,7 +7174,6 @@ LeftClick (ClickType clickType, int xPix, int yPix)
     toX = x;
     toY = y;
     saveAnimate = appData.animate;
-    MarkTargetSquares(1);
     if (clickType == Press) {
 	if(gameMode == EditPosition && boards[currentMove][fromY][fromX] == EmptySquare) {
 	    // must be Edit Position mode with empty-square selected
@@ -7179,22 +7181,27 @@ 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;
 	}
-	if(appData.sweepSelect && HasPromotionChoice(fromX, fromY, toX, toY, &promoChoice, FALSE)) {
+	/* 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
 	    DisplayMessage("", _("Pull pawn backwards to under-promote"));
 	    DrawPosition(FALSE, boards[currentMove]);
-	    return;
-	}
-	/* Finish clickclick move */
-	if (appData.animate || appData.highlightLastMove) {
-	    SetHighlights(fromX, fromY, toX, toY);
-	} else {
-	    ClearHighlights();
+	  }
+	  return; // promo popup appears on up-click
 	}
     } else {
 	/* Finish drag move */
@@ -7207,6 +7214,7 @@ LeftClick (ClickType clickType, int xPix, int yPix)
 	/* Don't animate move and drag both */
 	appData.animate = FALSE;
     }
+    MarkTargetSquares(1);
 
     // moves into holding are invalid for now (except in EditPosition, adapting to-square)
     if(x >= 0 && x < BOARD_LEFT || x >= BOARD_RGHT) {
@@ -16213,6 +16221,16 @@ DecrementClocks ()
     }
     if (CheckFlags()) return;
 
+    if(twoBoards) { // count down secondary board's clocks as well
+	activePartnerTime -= lastTickLength;
+	partnerUp = 1;
+	if(activePartner == 'W')
+	    DisplayWhiteClock(activePartnerTime, TRUE); // the counting clock is always the highlighted one!
+	else
+	    DisplayBlackClock(activePartnerTime, TRUE);
+	partnerUp = 0;
+    }
+
     tickStartTM = now;
     intendedTickLength = NextTickLength(timeRemaining - fudge) + fudge;
     StartClockTimer(intendedTickLength);