X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=backend.c;h=ecf338c23e7c646d1eaf9463a6a0b75552e5a513;hb=6bd78a44338ad11ff03a2ac554e6fd5bd5ed8418;hp=4dab30724ab01a4d88ca83ff327bb96eae3ab4c3;hpb=941d11f411a4d4c0f6edcc1a25010b8a60dad052;p=xboard.git

diff --git a/backend.c b/backend.c
index 4dab307..ecf338c 100644
--- a/backend.c
+++ b/backend.c
@@ -5,7 +5,7 @@
  * Massachusetts.
  *
  * Enhancements Copyright 1992-2001, 2002, 2003, 2004, 2005, 2006,
- * 2007, 2008, 2009 Free Software Foundation, Inc.
+ * 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
  *
  * Enhancements Copyright 2005 Alessandro Scotti
  *
@@ -187,8 +187,9 @@ void DisplayMove P((int moveNumber));
 
 void ParseGameHistory P((char *game));
 void ParseBoard12 P((char *string));
+void KeepAlive P((void));
 void StartClocks P((void));
-void SwitchClocks P((void));
+void SwitchClocks P((int nr));
 void StopClocks P((void));
 void ResetClocks P((void));
 char *PGNDate P((void));
@@ -242,6 +243,7 @@ char endingGame = 0;    /* [HGM] crash: flag to prevent recursion of GameEnds()
 int whiteNPS, blackNPS; /* [HGM] nps: for easily making clocks aware of NPS     */
 VariantClass currentlyInitializedVariant; /* [HGM] variantswitch */
 int lastIndex = 0;      /* [HGM] autoinc: last game/position used in match mode */
+Boolean connectionAlive;/* [HGM] alive: ICS connection status from probing      */
 int opponentKibitzes;
 int lastSavedGame; /* [HGM] save: ID of game */
 char chatPartner[MAX_CHAT][MSG_SIZ]; /* [HGM] chat: list of chatting partners */
@@ -743,7 +745,7 @@ InitBackEnd1()
     /* [HGM] time odds: set factor for each machine */
     first.timeOdds  = appData.firstTimeOdds;
     second.timeOdds = appData.secondTimeOdds;
-    { int norm = 1;
+    { float norm = 1;
         if(appData.timeOddsMode) {
             norm = first.timeOdds;
             if(norm > second.timeOdds) norm = second.timeOdds;
@@ -1097,6 +1099,8 @@ InitBackEnd3 P((void))
 	  AddInputSource(icsPR, FALSE, read_from_ics, &telnetISR);
 	fromUserISR =
 	  AddInputSource(NoProc, FALSE, read_from_player, &fromUserISR);
+	if(appData.keepAlive) // [HGM] alive: schedule sending of dummy 'date' command
+	    ScheduleDelayedEvent(KeepAlive, appData.keepAlive*60*1000);
     } else if (appData.noChessProgram) {
 	SetNCPMode();
     } else {
@@ -1417,6 +1421,8 @@ read_from_player(isr, closure, message, count, error)
 void
 KeepAlive()
 {   // [HGM] alive: periodically send dummy (date) command to ICS to prevent time-out
+    if(!connectionAlive) DisplayFatalError("No response from ICS", 0, 1);
+    connectionAlive = FALSE; // only sticks if no response to 'date' command.
     SendToICS("date\n");
     if(appData.keepAlive) ScheduleDelayedEvent(KeepAlive, appData.keepAlive*60*1000);
 }
@@ -2071,6 +2077,8 @@ read_from_ics(isr, closure, data, count, error)
     char talker[MSG_SIZ]; // [HGM] chat
     int channel;
 
+    connectionAlive = TRUE; // [HGM] alive: I think, therefore I am...
+
     if (appData.debugMode) {
       if (!error) {
 	fprintf(debugFP, "<ICS: ");
@@ -2153,7 +2161,8 @@ read_from_ics(isr, closure, data, count, error)
     }
 
 	buf[buf_len] = NULLCHAR;
-	next_out = leftover_len;
+//	next_out = leftover_len; // [HGM] should we set this to 0, and not print it in advance?
+	next_out = 0;
 	leftover_start = 0;
 	
 	i = 0;
@@ -2308,16 +2317,16 @@ read_from_ics(isr, closure, data, count, error)
 		    if(!suppressKibitz) // [HGM] kibitz
 			AppendComment(forwardMostMove, StripHighlight(parse));
 		    else { // [HGM kibitz: divert memorized engine kibitz to engine-output window
-			int nrDigit = 0, nrAlph = 0, i;
+			int nrDigit = 0, nrAlph = 0, j;
 			if(parse_pos > MSG_SIZ - 30) // defuse unreasonably long input
 			{ parse_pos = MSG_SIZ-30; parse[parse_pos - 1] = '\n'; }
 			parse[parse_pos] = NULLCHAR;
 			// try to be smart: if it does not look like search info, it should go to
 			// ICS interaction window after all, not to engine-output window.
-			for(i=0; i<parse_pos; i++) { // count letters and digits
-			    nrDigit += (parse[i] >= '0' && parse[i] <= '9');
-			    nrAlph  += (parse[i] >= 'a' && parse[i] <= 'z');
-			    nrAlph  += (parse[i] >= 'A' && parse[i] <= 'Z');
+			for(j=0; j<parse_pos; j++) { // count letters and digits
+			    nrDigit += (parse[j] >= '0' && parse[j] <= '9');
+			    nrAlph  += (parse[j] >= 'a' && parse[j] <= 'z');
+			    nrAlph  += (parse[j] >= 'A' && parse[j] <= 'Z');
 			}
 			if(nrAlph < 9*nrDigit) { // if more than 10% digit we assume search info
 			    int depth=0; float score;
@@ -2327,6 +2336,7 @@ read_from_ics(isr, closure, data, count, error)
 				pvInfoList[forwardMostMove-1].score = 100*score;
 			    }
 			    OutputKibitz(suppressKibitz, parse);
+			    next_out = i+1; // [HGM] suppress printing in ICS window
 			} else {
 			    char tmp[MSG_SIZ];
 			    sprintf(tmp, _("your opponent kibitzes: %s"), parse);
@@ -2335,7 +2345,7 @@ read_from_ics(isr, closure, data, count, error)
 		    }
 		    started = STARTED_NONE;
 		} else {
-		    /* Don't match patterns against characters in chatter */
+		    /* Don't match patterns against characters in comment */
 		    i++;
 		    continue;
 		}
@@ -2435,9 +2445,13 @@ read_from_ics(isr, closure, data, count, error)
 			} 
 			continue;
 		} else
-		if(looking_at(buf, &i, "kibitzed to")) { // suppress the acknowledgements of our own autoKibitz
-		    started = STARTED_CHATTER;
-		    suppressKibitz = TRUE;
+		if(looking_at(buf, &i, "kibitzed to *\n") && atoi(star_match[0])) {
+		    // suppress the acknowledgements of our own autoKibitz
+		    char *p;
+		    if(p = strchr(star_match[0], ' ')) p[1] = NULLCHAR; // clip off "players)" on FICS
+		    SendToPlayer(star_match[0], strlen(star_match[0]));
+		    looking_at(buf, &i, "*% "); // eat prompt
+		    next_out = i;
 		}
 	    } // [HGM] kibitz: end of patch
 
@@ -2456,14 +2470,14 @@ read_from_ics(isr, closure, data, count, error)
 		if(channel >= 0) // channel broadcast; look if there is a chatbox for this channel
 		for(p=0; p<MAX_CHAT; p++) {
 		    if(channel == atoi(chatPartner[p])) {
-		    talker[0] = '['; strcat(talker, "]");
+		    talker[0] = '['; strcat(talker, "] ");
 		    chattingPartner = p; break;
 		    }
 		} else
 		if(buf[i-3] == 'r') // whisper; look if there is a WHISPER chatbox
 		for(p=0; p<MAX_CHAT; p++) {
 		    if(!strcmp("WHISPER", chatPartner[p])) {
-			talker[0] = '['; strcat(talker, "]");
+			talker[0] = '['; strcat(talker, "] ");
 			chattingPartner = p; break;
 		    }
 		}
@@ -2475,7 +2489,7 @@ read_from_ics(isr, closure, data, count, error)
 		if(chattingPartner<0) i = oldi; else {
 		    started = STARTED_COMMENT;
 		    parse_pos = 0; parse[0] = NULLCHAR;
-		    savingComment = TRUE;
+		    savingComment = 3 + chattingPartner; // counts as TRUE
 		    suppressKibitz = TRUE;
 		}
 	    } // [HGM] chat: end of patch
@@ -2670,6 +2684,8 @@ read_from_ics(isr, closure, data, count, error)
 		    memcpy(parse, &buf[oldi], parse_pos);
 		    parse[parse_pos] = NULLCHAR;
 		    started = STARTED_COMMENT;
+		    if(savingComment >= 3) // [HGM] chat: continuation of line for chat box
+		        chattingPartner = savingComment - 3; // kludge to remember the box
 		} else {
 		    started = STARTED_CHATTER;
 		}
@@ -2837,7 +2853,9 @@ read_from_ics(isr, closure, data, count, error)
 	    if (looking_at(buf, &i, "% ") ||
 		((started == STARTED_MOVES || started == STARTED_MOVES_NOHIDE)
 		 && looking_at(buf, &i, "}*"))) { char *bookHit = NULL; // [HGM] book
+		if(suppressKibitz) next_out = i;
 		savingComment = FALSE;
+		suppressKibitz = 0;
 		switch (started) {
 		  case STARTED_MOVES:
 		  case STARTED_MOVES_NOHIDE:
@@ -3030,10 +3048,10 @@ read_from_ics(isr, closure, data, count, error)
 		    looking_at(buf, &i, "It is not your move")) {
 		    /* Illegal move */
 		    if (ics_user_moved && forwardMostMove > backwardMostMove) { // only backup if we already moved
-			currentMove = --forwardMostMove;
+			currentMove = forwardMostMove-1;
 			DisplayMove(currentMove - 1); /* before DMError */
 			DrawPosition(FALSE, boards[currentMove]);
-			SwitchClocks();
+			SwitchClocks(forwardMostMove-1); // [HGM] race
 			DisplayBothClocks();
 		    }
 		    DisplayMoveError(_("Illegal move (rejected by ICS)")); // [HGM] but always relay error msg
@@ -3264,6 +3282,7 @@ read_from_ics(isr, closure, data, count, error)
 			while(looking_at(buf, &i, "\n")); // [HGM] skip empty lines
 			if (looking_at(buf, &i, "*% ")) {
 			    savingComment = FALSE;
+			    suppressKibitz = 0;
 			}
 		    }
 		    next_out = i;
@@ -3333,6 +3352,7 @@ read_from_ics(isr, closure, data, count, error)
 		    if (looking_at(buf, &i, "*% ")) {
 			if(strchr(star_match[0], 7)) SendToPlayer("\007", 1); // Bell(); // FICS fuses bell for next board with prompt in zh captures
 			savingComment = FALSE;
+			suppressKibitz = 0;
 		    }
 		    next_out = i;
 		}
@@ -3342,12 +3362,13 @@ read_from_ics(isr, closure, data, count, error)
 	    i++;		/* skip unparsed character and loop back */
 	}
 	
-	if (started != STARTED_MOVES && started != STARTED_BOARD && !suppressKibitz && // [HGM] kibitz suppress printing in ICS interaction window
-	    started != STARTED_HOLDINGS && i > next_out) {
-	    SendToPlayer(&buf[next_out], i - next_out);
+	if (started != STARTED_MOVES && started != STARTED_BOARD && !suppressKibitz && // [HGM] kibitz
+//	    started != STARTED_HOLDINGS && i > next_out) { // [HGM] should we compare to leftover_start in stead of i?
+//	    SendToPlayer(&buf[next_out], i - next_out);
+	    started != STARTED_HOLDINGS && leftover_start > next_out) {
+	    SendToPlayer(&buf[next_out], leftover_start - next_out);
 	    next_out = i;
 	}
-	suppressKibitz = FALSE; // [HGM] kibitz: has done its duty in if-statement above
 	
 	leftover_len = buf_len - leftover_start;
 	/* if buffer ends with something we couldn't parse,
@@ -3700,6 +3721,11 @@ ParseBoard12(string)
         for(k=BOARD_LEFT; k<BOARD_RGHT; k++)
             if(board[BOARD_HEIGHT-1][k] == bKing)
                 initialRights[5] = castlingRights[moveNum][5] = k;
+        if(gameInfo.variant == VariantTwoKings) {
+            // In TwoKings looking for a King does not work, so always give castling rights to a King on e1/e8
+            if(board[0][4] == wKing) initialRights[2] = castlingRights[moveNum][2] = 4;
+            if(board[BOARD_HEIGHT-1][4] == bKing) initialRights[5] = castlingRights[moveNum][5] = 4;
+        }
     } else { int r;
         r = castlingRights[moveNum][0] = initialRights[0];
         if(board[0][r] != WhiteRook) castlingRights[moveNum][0] = -1;
@@ -4713,7 +4739,7 @@ InitPosition(redraw)
       break;
     case VariantFairy:
       pieces = fairyArray;
-      SetCharTable(pieceToChar, "PNBRQFEACWMOHIJGDVSLUKpnbrqfeacwmohijgdvsluk"); 
+      SetCharTable(pieceToChar, "PNBRQFEACWMOHIJGDVLSUKpnbrqfeacwmohijgdvlsuk"); 
       break;
     case VariantGreat:
       pieces = GreatArray;
@@ -6631,9 +6657,9 @@ if(appData.debugMode) fprintf(debugFP, "nodes = %d, %lld\n", (int) programStats.
 	    gameMode = EditGame;
 	    ModeHighlight();
 	}
-	currentMove = --forwardMostMove;
+	currentMove = forwardMostMove-1;
 	DisplayMove(currentMove-1); /* before DisplayMoveError */
-	SwitchClocks();
+	SwitchClocks(forwardMostMove-1); // [HGM] race
 	DisplayBothClocks();
 	sprintf(buf1, _("Illegal move \"%s\" (rejected by %s chess program)"),
 		parseList[currentMove], cps->which);
@@ -7711,8 +7737,8 @@ MakeMove(fromX, fromY, toX, toY, promoChar)
     {int i; for(i=0; i<BOARD_SIZE; i++) castlingRights[forwardMostMove+1][i] = castlingRights[forwardMostMove][i];}
     ApplyMove(fromX, fromY, toX, toY, promoChar, boards[forwardMostMove+1], 
 				castlingRights[forwardMostMove+1], &epStatus[forwardMostMove+1]);
-    forwardMostMove++; // [HGM] bare: moved to after ApplyMove, to make sure clock interrupt finds complete board
-    SwitchClocks(); // uses forwardMostMove, so must be done after incrementing it !
+    // forwardMostMove++; // [HGM] bare: moved to after ApplyMove, to make sure clock interrupt finds complete board
+    SwitchClocks(forwardMostMove+1); // [HGM] race: incrementing move nr inside
     timeRemaining[0][forwardMostMove] = whiteTimeRemaining;
     timeRemaining[1][forwardMostMove] = blackTimeRemaining;
     gameInfo.result = GameUnfinished;
@@ -12602,7 +12628,7 @@ SendTimeRemaining(cps, machineWhite)
     /* [HGM] translate opponent's time by time-odds factor */
     otime = (otime * cps->other->timeOdds) / cps->timeOdds;
     if (appData.debugMode) {
-        fprintf(debugFP, "time odds: %d %d \n", cps->timeOdds, cps->other->timeOdds);
+        fprintf(debugFP, "time odds: %f %f \n", cps->timeOdds, cps->other->timeOdds);
     }
 
     if (time <= 0) time = 1;
@@ -13337,7 +13363,7 @@ DecrementClocks()
    from the color that is *not* on move now.
 */
 void
-SwitchClocks()
+SwitchClocks(int newMoveNr)
 {
     long lastTickLength;
     TimeMark now;
@@ -13347,7 +13373,7 @@ SwitchClocks()
 
     if (StopClockTimer() && appData.clockMode) {
 	lastTickLength = SubtractTimeMarks(&now, &tickStartTM);
-	if (WhiteOnMove(forwardMostMove)) {
+	if (!WhiteOnMove(forwardMostMove)) {
 	    if(blackNPS >= 0) lastTickLength = 0;
 	    blackTimeRemaining -= lastTickLength;
            /* [HGM] PGNtime: save time for PGN file if engine did not give it */
@@ -13364,6 +13390,7 @@ SwitchClocks()
 	}
 	flagged = CheckFlags();
     }
+    forwardMostMove = newMoveNr; // [HGM] race: change stm when no timer interrupt scheduled
     CheckTimeControl();
 
     if (flagged || !appData.clockMode) return;
@@ -13895,10 +13922,12 @@ ParseFEN(board, blackPlaysFirst, fen)
     }   /* assume possible unless obviously impossible */
     if(initialRights[0]>=0 && board[castlingRank[0]][initialRights[0]] != WhiteRook) FENcastlingRights[0] = -1;
     if(initialRights[1]>=0 && board[castlingRank[1]][initialRights[1]] != WhiteRook) FENcastlingRights[1] = -1;
-    if(initialRights[2]>=0 && board[castlingRank[2]][initialRights[2]] != WhiteKing) FENcastlingRights[2] = -1;
+    if(initialRights[2]>=0 && board[castlingRank[2]][initialRights[2]] != WhiteUnicorn
+			   && board[castlingRank[2]][initialRights[2]] != WhiteKing) FENcastlingRights[2] = -1;
     if(initialRights[3]>=0 && board[castlingRank[3]][initialRights[3]] != BlackRook) FENcastlingRights[3] = -1;
     if(initialRights[4]>=0 && board[castlingRank[4]][initialRights[4]] != BlackRook) FENcastlingRights[4] = -1;
-    if(initialRights[5]>=0 && board[castlingRank[5]][initialRights[5]] != BlackKing) FENcastlingRights[5] = -1;
+    if(initialRights[5]>=0 && board[castlingRank[5]][initialRights[5]] != BlackUnicorn
+			   && board[castlingRank[5]][initialRights[5]] != BlackKing) FENcastlingRights[5] = -1;
     FENrulePlies = 0;
 
     while(*p==' ') p++;
@@ -13919,9 +13948,15 @@ ParseFEN(board, blackPlaysFirst, fen)
             if(board[BOARD_HEIGHT-1][i] == BlackKing) blackKingFile = i;
             if(board[0             ][i] == WhiteKing) whiteKingFile = i;
         }
+        if(gameInfo.variant == VariantTwoKings || gameInfo.variant == VariantKnightmate)
+            whiteKingFile = blackKingFile = BOARD_WIDTH >> 1; // scanning fails in these variants
+        if(whiteKingFile<0 || board[0][whiteKingFile]!=WhiteUnicorn
+                           && board[0][whiteKingFile]!=WhiteKing) whiteKingFile = -1;
+        if(blackKingFile<0 || board[BOARD_HEIGHT-1][blackKingFile]!=BlackUnicorn
+                           && board[BOARD_HEIGHT-1][blackKingFile]!=BlackKing) blackKingFile = -1;
         switch(c) {
           case'K':
-              for(i=BOARD_RGHT-1; board[0][i]!=WhiteRook && i>whiteKingFile; i--);
+              for(i=BOARD_RGHT-1; i>whiteKingFile && board[0][i]!=WhiteRook; i--);
               FENcastlingRights[0] = i != whiteKingFile ? i : -1;
               FENcastlingRights[2] = whiteKingFile;
               break;
@@ -13931,7 +13966,7 @@ ParseFEN(board, blackPlaysFirst, fen)
               FENcastlingRights[2] = whiteKingFile;
               break;
           case'k':
-              for(i=BOARD_RGHT-1; board[BOARD_HEIGHT-1][i]!=BlackRook && i>blackKingFile; i--);
+              for(i=BOARD_RGHT-1; i>blackKingFile && board[BOARD_HEIGHT-1][i]!=BlackRook; i--);
               FENcastlingRights[3] = i != blackKingFile ? i : -1;
               FENcastlingRights[5] = blackKingFile;
               break;
@@ -13968,6 +14003,8 @@ ParseFEN(board, blackPlaysFirst, fen)
               }
         }
       }
+      for(i=0; i<nrCastlingRights; i++)
+        if(FENcastlingRights[i] >= 0) initialRights[i] = FENcastlingRights[i];
     if (appData.debugMode) {
         fprintf(debugFP, "FEN castling rights:");
         for(i=0; i<nrCastlingRights; i++)