X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=backend.c;h=17e77ae8b067d4a18f963f47fbbba5451f9525c2;hb=37171a1530eef8fbc24f3b656397d91164c43d61;hp=938e27fc04263b892318c18109cad571052f1d12;hpb=ecc378d8413d426248d1ea681e2666ec5c13d3e4;p=xboard.git

diff --git a/backend.c b/backend.c
index 938e27f..17e77ae 100644
--- a/backend.c
+++ b/backend.c
@@ -5,7 +5,7 @@
  * Massachusetts.
  *
  * Enhancements Copyright 1992-2001, 2002, 2003, 2004, 2005, 2006,
- * 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+ * 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
  *
  * Enhancements Copyright 2005 Alessandro Scotti
  *
@@ -6812,7 +6812,6 @@ Adjudicate(ChessProgramState *cps)
 		     if(canAdjudicate && appData.checkMates) {
 			 if(engineOpponent)
 			   SendMoveToProgram(forwardMostMove-1, engineOpponent); // make sure opponent gets move
-                         ShowMove(fromX, fromY, toX, toY); /*updates currentMove*/
                          GameEnds( WhiteOnMove(forwardMostMove) ? BlackWins : WhiteWins,
 							"Xboard adjudication: King destroyed", GE_XBOARD );
                          return 1;
@@ -6826,7 +6825,6 @@ Adjudicate(ChessProgramState *cps)
 		     if(canAdjudicate && appData.checkMates) {
 			 if(engineOpponent)
 			   SendMoveToProgram(forwardMostMove-1, engineOpponent); // make sure opponent gets to see move
-                         ShowMove(fromX, fromY, toX, toY); /*updates currentMove*/
                          GameEnds( WhiteOnMove(forwardMostMove) ? WhiteWins : BlackWins,
 							"Xboard adjudication: Bare king", GE_XBOARD );
                          return 1;
@@ -6839,7 +6837,6 @@ Adjudicate(ChessProgramState *cps)
 			    /* but only adjudicate if adjudication enabled */
 			    if(engineOpponent)
 			      SendMoveToProgram(forwardMostMove-1, engineOpponent); // make sure opponent gets move
-			    ShowMove(fromX, fromY, toX, toY); /*updates currentMove*/
 			    GameEnds( nrW > 1 ? WhiteWins : nrB > 1 ? BlackWins : GameIsDrawn,
 							"Xboard adjudication: Bare king", GE_XBOARD );
 			    return 1;
@@ -6900,7 +6897,6 @@ Adjudicate(ChessProgramState *cps)
                 if(canAdjudicate && appData.checkMates && result) { // [HGM] mates: adjudicate finished games if requested
 		    if(engineOpponent)
 		      SendMoveToProgram(forwardMostMove-1, engineOpponent); /* make sure opponent gets to see move */
-		    ShowMove(fromX, fromY, toX, toY); /*updates currentMove*/
 		    GameEnds( result, reason, GE_XBOARD );
 		    return 1;
 		}
@@ -6919,7 +6915,6 @@ Adjudicate(ChessProgramState *cps)
 			   SendToProgram("force\n", engineOpponent); // suppress reply
 			   SendMoveToProgram(forwardMostMove-1, engineOpponent); /* make sure opponent gets to see last move */
 			 }
-                         ShowMove(fromX, fromY, toX, toY); /*updates currentMove*/
                          GameEnds( GameIsDrawn, "Xboard adjudication: Insufficient mating material", GE_XBOARD );
                          return 1;
                      }
@@ -6940,7 +6935,6 @@ Adjudicate(ChessProgramState *cps)
 			    SendToProgram("force\n", engineOpponent); // suppress reply
 			    SendMoveToProgram(forwardMostMove-1, engineOpponent); /* make sure opponent gets to see move */
 			  }
-                          ShowMove(fromX, fromY, toX, toY); /*updates currentMove*/
                           GameEnds( GameIsDrawn, "Xboard adjudication: Trivial draw", GE_XBOARD );
                           return 1;
                      }
@@ -7023,7 +7017,6 @@ Adjudicate(ChessProgramState *cps)
 			       SendToProgram("force\n", engineOpponent); // suppress reply
 			       SendMoveToProgram(forwardMostMove-1, engineOpponent); /* make sure opponent gets to see move */
 			     }
-                             ShowMove(fromX, fromY, toX, toY); /*updates currentMove*/
                              GameEnds( result, details, GE_XBOARD );
                              return 1;
                         }
@@ -7060,7 +7053,6 @@ Adjudicate(ChessProgramState *cps)
 			   SendToProgram("force\n", engineOpponent); // suppress reply
 			   SendMoveToProgram(forwardMostMove-1, engineOpponent); /* make sure opponent gets to see move */
 			 }
-                         ShowMove(fromX, fromY, toX, toY); /*updates currentMove*/
                          GameEnds( GameIsDrawn, "Xboard adjudication: 50-move rule", GE_XBOARD );
                          return 1;
                 }
@@ -7083,7 +7075,6 @@ Adjudicate(ChessProgramState *cps)
 			       SendToProgram("force\n", engineOpponent); // suppress reply
 			       SendMoveToProgram(forwardMostMove-1, engineOpponent); /* make sure opponent gets to see move */
 			     }
-                             ShowMove(fromX, fromY, toX, toY); /*updates currentMove*/
                              GameEnds( GameIsDrawn, p, GE_XBOARD );
                              return 1;
                          }
@@ -7094,7 +7085,6 @@ Adjudicate(ChessProgramState *cps)
 		      SendToProgram("force\n", engineOpponent); // suppress reply
 		      SendMoveToProgram(forwardMostMove-1, engineOpponent); /* make sure opponent gets to see move */
 		    }
-		    ShowMove(fromX, fromY, toX, toY); /*updates currentMove*/
 	            GameEnds( GameIsDrawn, "Xboard adjudication: long game", GE_XBOARD );
 	            return 1;
         	}
@@ -7330,11 +7320,6 @@ FakeBookMove: // [HGM] book: we jump here to simulate machine moves after book h
 	if (cps->sendTime == 2) cps->sendTime = 1;
 	if (cps->offeredDraw) cps->offeredDraw--;
 
-	/* currentMoveString is set as a side-effect of ParseOneMove */
-	safeStrCpy(machineMove, currentMoveString, sizeof(machineMove)/sizeof(machineMove[0]));
-	strcat(machineMove, "\n");
-	safeStrCpy(moveList[forwardMostMove], machineMove, sizeof(moveList[forwardMostMove])/sizeof(moveList[forwardMostMove][0]));
-
         /* [AS] Save move info*/
         pvInfoList[ forwardMostMove ].score = programStats.score;
         pvInfoList[ forwardMostMove ].depth = programStats.depth;
@@ -7372,7 +7357,6 @@ FakeBookMove: // [HGM] book: we jump here to simulate machine moves after book h
         }
 
 	if(Adjudicate(cps)) {
-	    DrawPosition(FALSE, boards[currentMove = forwardMostMove-1]);
 	    ShowMove(fromX, fromY, toX, toY); /*updates currentMove*/
 	    return; // [HGM] adjudicate: for all automatic game ends
 	}
@@ -9930,8 +9914,6 @@ LoadGameOneMove(readAhead)
 	return FALSE;
     } else {
 	/* currentMoveString is set as a side-effect of yylex */
-	strcat(currentMoveString, "\n");
-	safeStrCpy(moveList[forwardMostMove], currentMoveString, sizeof(moveList[forwardMostMove])/sizeof(moveList[forwardMostMove][0]));
 
 	thinkOutput[0] = NULLCHAR;
 	MakeMove(fromX, fromY, toX, toY, promoChar);
@@ -12623,6 +12605,30 @@ CallFlagEvent()
 }
 
 void
+ClockClick(int which)
+{	// [HGM] code moved to back-end from winboard.c
+	if(which) { // black clock
+	  if (gameMode == EditPosition || gameMode == IcsExamining) {
+	    SetBlackToPlayEvent();
+	  } else if (gameMode == EditGame || shiftKey) {
+	    AdjustClock(which, -1);
+	  } else if (gameMode == IcsPlayingWhite ||
+	             gameMode == MachinePlaysBlack) {
+	    CallFlagEvent();
+	  }
+	} else { // white clock
+	  if (gameMode == EditPosition || gameMode == IcsExamining) {
+	    SetWhiteToPlayEvent();
+	  } else if (gameMode == EditGame || shiftKey) {
+	    AdjustClock(which, -1);
+	  } else if (gameMode == IcsPlayingBlack ||
+	           gameMode == MachinePlaysWhite) {
+	    CallFlagEvent();
+	  }
+	}
+}
+
+void
 DrawEvent()
 {
     /* Offer draw or accept pending draw offer from opponent */