X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=backend.c;h=d782fb0078132a20a0ad1baedb0661d4f0088f63;hb=6cab23ba23301b578d4995f3c889e574ea4b9e99;hp=6810648edeb4e508dd7eb0059058b70ccd73e379;hpb=dcc35623d911ee504e573f9c5d2148d102059312;p=xboard.git

diff --git a/backend.c b/backend.c
index 6810648..d782fb0 100644
--- a/backend.c
+++ b/backend.c
@@ -1,11 +1,13 @@
 /*
  * backend.c -- Common back end for X and Windows NT versions of
- * XBoard $Id: backend.c,v 2.6 2003/11/28 09:37:36 mann Exp $
  *
  * Copyright 1991 by Digital Equipment Corporation, Maynard,
- * Massachusetts.  Enhancements Copyright
- * 1992-2001,2002,2003,2004,2005,2006,2007,2008,2009 Free Software
- * Foundation, Inc.
+ * Massachusetts.
+ *
+ * Enhancements Copyright 1992-2001, 2002, 2003, 2004, 2005, 2006,
+ * 2007, 2008, 2009 Free Software Foundation, Inc.
+ *
+ * Enhancements Copyright 2005 Alessandro Scotti
  *
  * The following terms apply to Digital Equipment Corporation's copyright
  * interest in XBoard:
@@ -822,9 +824,8 @@ InitBackEnd1()
 #endif
     
     if (appData.noChessProgram) {
-	programVersion = (char*) malloc(5 + strlen(PRODUCT) + strlen(VERSION)
-					+ strlen(PATCHLEVEL));
-	sprintf(programVersion, "%s %s.%s", PRODUCT, VERSION, PATCHLEVEL);
+	programVersion = (char*) malloc(5 + strlen(PACKAGE_STRING));
+	sprintf(programVersion, "%s", PACKAGE_STRING);
     } else {
 #if 0
 	char *p, *q;
@@ -832,15 +833,13 @@ InitBackEnd1()
 	while (*q != ' ' && *q != NULLCHAR) q++;
 	p = q;
 	while (p > first.program && *(p-1) != '/' && *(p-1) != '\\') p--; /* [HGM] backslash added */
-	programVersion = (char*) malloc(8 + strlen(PRODUCT) + strlen(VERSION)
-					+ strlen(PATCHLEVEL) + (q - p));
-	sprintf(programVersion, "%s %s.%s + ", PRODUCT, VERSION, PATCHLEVEL);
+	programVersion = (char*) malloc(8 + strlen(PACKAGE_STRING + (q - p));
+	sprintf(programVersion, "%s + ", PACKAGE_STRING);
 	strncat(programVersion, p, q - p);
 #else
 	/* [HGM] tidy: use tidy name, in stead of full pathname (which was probably a bug due to / vs \ ) */
-	programVersion = (char*) malloc(8 + strlen(PRODUCT) + strlen(VERSION)
-					+ strlen(PATCHLEVEL) + strlen(first.tidy));
-	sprintf(programVersion, "%s %s.%s + %s", PRODUCT, VERSION, PATCHLEVEL, first.tidy);
+	programVersion = (char*) malloc(8 + strlen(PACKAGE_STRING) + strlen(first.tidy));
+	sprintf(programVersion, "%s + %s", PACKAGE_STRING, first.tidy);
 #endif
     }
 
@@ -2953,22 +2952,23 @@ read_from_ics(isr, closure, data, count, error)
 	    }    
 	    
 	    /* Error messages */
-	    if (ics_user_moved) {
+//	    if (ics_user_moved) {
+	    if (1) { // [HGM] old way ignored error after move type in; ics_user_moved is not set then!
 		if (looking_at(buf, &i, "Illegal move") ||
 		    looking_at(buf, &i, "Not a legal move") ||
 		    looking_at(buf, &i, "Your king is in check") ||
 		    looking_at(buf, &i, "It isn't your turn") ||
 		    looking_at(buf, &i, "It is not your move")) {
 		    /* Illegal move */
-		    ics_user_moved = 0;
-		    if (forwardMostMove > backwardMostMove) {
+		    if (ics_user_moved && forwardMostMove > backwardMostMove) { // only backup if we already moved
 			currentMove = --forwardMostMove;
 			DisplayMove(currentMove - 1); /* before DMError */
-			DisplayMoveError(_("Illegal move (rejected by ICS)"));
 			DrawPosition(FALSE, boards[currentMove]);
 			SwitchClocks();
 			DisplayBothClocks();
 		    }
+		    DisplayMoveError(_("Illegal move (rejected by ICS)")); // [HGM] but always relay error msg
+		    ics_user_moved = 0;
 		    continue;
 		}
 	    }
@@ -3892,8 +3892,11 @@ ParseBoard12(string)
 
       DrawPosition(FALSE, boards[currentMove]);
       DisplayMove(moveNum - 1);
-      if (appData.ringBellAfterMoves && !ics_user_moved)
-	RingBell();
+      if (appData.ringBellAfterMoves && /*!ics_user_moved*/ // [HGM] use absolute method to recognize own move
+	    !((gameMode == IcsPlayingWhite) && (!WhiteOnMove(moveNum)) ||
+	      (gameMode == IcsPlayingBlack) &&  (WhiteOnMove(moveNum))   ) ) {
+	if(newMove) RingBell(); else PlayIcsUnfinishedSound();
+      }
     }
 
     HistorySet(parseList, backwardMostMove, forwardMostMove, currentMove-1);
@@ -5203,7 +5206,13 @@ if(appData.debugMode) fprintf(debugFP, "moveType 1 = %d, promochar = %x\n", move
     /* [HGM] convert drag-and-drop piece drops to standard form */
     if( fromX == BOARD_LEFT-2 || fromX == BOARD_RGHT+1) {
          moveType = WhiteOnMove(currentMove) ? WhiteDrop : BlackDrop;
-         fromX = boards[currentMove][fromY][fromX];
+	   if(appData.debugMode) fprintf(debugFP, "Drop move %d, curr=%d, x=%d,y=%d, p=%d\n", 
+		moveType, currentMove, fromX, fromY, boards[currentMove][fromY][fromX]);
+//         fromX = boards[currentMove][fromY][fromX];
+	   // holdings might not be sent yet in ICS play; we have to figure out which piece belongs here
+	   if(fromX == 0) fromY = BOARD_HEIGHT-1 - fromY; // black holdings upside-down
+	   fromX = fromX ? WhitePawn : BlackPawn; // first piece type in selected holdings
+	   while(PieceToChar(fromX) == '.' || PieceToNumber(fromX) != fromY && fromX != (int) EmptySquare) fromX++; 
          fromY = DROP_RANK;
     }