X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=backend.c;h=7672207afe4c942a156151048f99e6c5065c79ac;hb=c612331f05b9a1ddddb6f25c598b4258f9e094b1;hp=56049a820def223b7c4e415a45bf74f207d81060;hpb=3d302e05c86661307b37bf69476542c7064a7bf1;p=xboard.git

diff --git a/backend.c b/backend.c
index 56049a8..7672207 100644
--- a/backend.c
+++ b/backend.c
@@ -243,6 +243,8 @@ static int exiting = 0; /* [HGM] moved to top */
 static int setboardSpoiledMachineBlack = 0 /*, errorExitFlag = 0*/;
 int startedFromPositionFile = FALSE; Board filePosition;       /* [HGM] loadPos */
 Board partnerBoard;     /* [HGM] bughouse: for peeking at partner game          */
+int partnerHighlight[2];
+Boolean partnerBoardValid = 0;
 char partnerStatus[MSG_SIZ];
 Boolean partnerUp;
 Boolean originalFlip;
@@ -1106,6 +1108,11 @@ InitBackEnd3 P((void))
 
     InitChessProgram(&first, startedFromSetupPosition);
 
+    if(!appData.noChessProgram) {  /* [HGM] tidy: redo program version to use name from myname feature */
+	free(programVersion);
+	programVersion = (char*) malloc(8 + strlen(PACKAGE_STRING) + strlen(first.tidy));
+	sprintf(programVersion, "%s + %s", PACKAGE_STRING, first.tidy);
+    }
 
     if (appData.icsActive) {
 #ifdef WIN32
@@ -1976,7 +1983,7 @@ void
 VariantSwitch(Board board, VariantClass newVariant)
 {
    int newHoldingsWidth, newWidth = 8, newHeight = 8, i, j;
-   Board oldBoard;
+   static Board oldBoard;
 
    startedFromPositionFile = FALSE;
    if(gameInfo.variant == newVariant) return;
@@ -2704,7 +2711,7 @@ read_from_ics(isr, closure, data, count, error)
 	    if (appData.autoKibitz && started == STARTED_NONE && 
                 !appData.icsEngineAnalyze &&                     // [HGM] [DM] ICS analyze
 		(gameMode == IcsPlayingWhite || gameMode == IcsPlayingBlack || gameMode == IcsObserving)) {
-		if(looking_at(buf, &i, "* kibitzes: ") &&
+		if((looking_at(buf, &i, "* kibitzes: ") || looking_at(buf, &i, "* whispers: ")) &&
 		   (StrStr(star_match[0], gameInfo.white) == star_match[0] || 
 		    StrStr(star_match[0], gameInfo.black) == star_match[0]   )) { // kibitz of self or opponent
 		    	suppressKibitz = TRUE;
@@ -2743,6 +2750,7 @@ read_from_ics(isr, closure, data, count, error)
 	    channel = -1;
 	    if(started == STARTED_NONE && (looking_at(buf, &i, "* tells you:") || looking_at(buf, &i, "* says:") || 
 					   looking_at(buf, &i, "* whispers:") ||
+					   looking_at(buf, &i, "* kibitzes:") ||
 					   looking_at(buf, &i, "* shouts:") ||
 					   looking_at(buf, &i, "* c-shouts:") ||
 					   looking_at(buf, &i, "--> * ") ||
@@ -2762,6 +2770,13 @@ read_from_ics(isr, closure, data, count, error)
 		    chattingPartner = p; break;
 		    }
 		} else
+		if(buf[i-3] == 'e') // kibitz; look if there is a KIBITZ chatbox
+		for(p=0; p<MAX_CHAT; p++) {
+		    if(!strcmp("kibitzes", chatPartner[p])) {
+			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("whispers", chatPartner[p])) {
@@ -2769,14 +2784,23 @@ read_from_ics(isr, closure, data, count, error)
 			chattingPartner = p; break;
 		    }
 		} else
-		if(buf[i-3] == 't' || buf[oldi+2] == '>') // shout, c-shout or it; look if there is a 'shouts' chatbox
-		for(p=0; p<MAX_CHAT; p++) {
+		if(buf[i-3] == 't' || buf[oldi+2] == '>') {// shout, c-shout or it; look if there is a 'shouts' chatbox
+		  if(buf[i-8] == '-' && buf[i-3] == 't')
+		  for(p=0; p<MAX_CHAT; p++) { // c-shout; check if dedicatesd c-shout box exists
+		    if(!strcmp("c-shouts", chatPartner[p])) {
+			talker[0] = '('; strcat(talker, ") "); Colorize(ColorSShout, FALSE);
+			chattingPartner = p; break;
+		    }
+		  }
+		  if(chattingPartner < 0)
+		  for(p=0; p<MAX_CHAT; p++) {
 		    if(!strcmp("shouts", chatPartner[p])) {
 			if(buf[oldi+2] == '>') { talker[0] = '<'; strcat(talker, "> "); Colorize(ColorShout, FALSE); }
 			else if(buf[i-8] == '-') { talker[0] = '('; strcat(talker, ") "); Colorize(ColorSShout, FALSE); }
 			else { talker[0] = '['; strcat(talker, "] "); Colorize(ColorShout, FALSE); }
 			chattingPartner = p; break;
 		    }
+		  }
 		}
 		if(chattingPartner<0) // if not, look if there is a chatbox for this indivdual
 		for(p=0; p<MAX_CHAT; p++) if(!StrCaseCmp(talker+1, chatPartner[p])) {
@@ -3464,6 +3488,7 @@ read_from_ics(isr, closure, data, count, error)
 			ZippyGameStart(whitename, blackname);
 		    }
 #endif /*ZIPPY*/
+		    partnerBoardValid = FALSE; // [HGM] bughouse
 		    continue;
 		}
 
@@ -3504,6 +3529,7 @@ read_from_ics(isr, closure, data, count, error)
 		    Reset(TRUE, TRUE);
 		}
 #endif /*ZIPPY*/
+		if(appData.bgObserve && partnerBoardValid) DrawPosition(TRUE, partnerBoard);
 		continue;
 	    }
 
@@ -3664,7 +3690,7 @@ read_from_ics(isr, closure, data, count, error)
                         CopyHoldings(partnerBoard, black_holding, BlackPawn);
                         if(twoBoards) { partnerUp = 1; flipView = !flipView; } // [HGM] dual: always draw
                         if(partnerUp) DrawPosition(FALSE, partnerBoard);
-                        if(twoBoards) { partnerUp = 0; flipView = !flipView; DrawPosition(TRUE, boards[currentMove]); } // [HGM] dual: redraw own
+                        if(twoBoards) { partnerUp = 0; flipView = !flipView; }
 		      }
 		    }
 		    /* Suppress following prompt */
@@ -3816,8 +3842,9 @@ ParseBoard12(string)
     }
     
     if((gameMode == IcsPlayingWhite || gameMode == IcsPlayingBlack)
-	 && newGameMode == IcsObserving && appData.bgObserve) {
+	 && 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 */
+      char *toSqr;
       for (k = 0; k < ranks; k++) {
         for (j = 0; j < files; j++)
           board[k][j+gameInfo.holdingsWidth] = CharToPiece(board_chars[(ranks-1-k)*(files+1) + j]);
@@ -3826,13 +3853,23 @@ ParseBoard12(string)
              board[k][1] = board[k][BOARD_WIDTH-2] = (ChessSquare) 0;;
         }
       }
-      if(appData.dualBoard) { twoBoards = partnerUp = 1; flipView = !flipView; InitDrawingSizes(-2,0); } // [HGM] dual
       CopyBoard(partnerBoard, board);
+      if(toSqr = strchr(str, '/')) { // extract highlights from long move
+        partnerBoard[EP_STATUS-3] = toSqr[1] - AAA; // kludge: hide highlighting info in board
+        partnerBoard[EP_STATUS-4] = toSqr[2] - ONE;
+      } else partnerBoard[EP_STATUS-4] = partnerBoard[EP_STATUS-3] = -1;
+      if(toSqr = strchr(str, '-')) {
+        partnerBoard[EP_STATUS-1] = toSqr[1] - AAA;
+        partnerBoard[EP_STATUS-2] = toSqr[2] - ONE;
+      } else partnerBoard[EP_STATUS-1] = partnerBoard[EP_STATUS-2] = -1;
+      if(appData.dualBoard && !twoBoards) { twoBoards = 1; InitDrawingSizes(-2,0); }
+      if(twoBoards) { partnerUp = 1; flipView = !flipView; } // [HGM] dual
       if(partnerUp) DrawPosition(FALSE, partnerBoard);
-      if(twoBoards) { partnerUp = 0; flipView = !flipView; DrawPosition(TRUE, boards[currentMove]); } // [HGM] dual: redraw own game!
-      sprintf(partnerStatus, "W: %d:%d B: %d:%d (%d-%d) %c", white_time/60000, (white_time%60000)/1000,
+      if(twoBoards) { partnerUp = 0; flipView = !flipView; } // [HGM] dual
+      sprintf(partnerStatus, "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);
       DisplayMessage(partnerStatus, "");
+	partnerBoardValid = TRUE;
       return;
     }
 
@@ -6443,6 +6480,8 @@ int RightClick(ClickType action, int x, int y, int *fromX, int *fromY)
 
     if((gameMode == IcsPlayingWhite || gameMode == IcsPlayingBlack)
 	 && !appData.zippyPlay && appData.bgObserve) { // [HGM] bughouse: show background game
+	if(!partnerBoardValid) return -2; // suppress display of uninitialized boards
+	if( appData.dualBoard) return -2; // [HGM] dual: is already displayed
 	if(action == Press)   {
 	    originalFlip = flipView;
 	    flipView = !flipView; // temporarily flip board to see game from partners perspective
@@ -6733,7 +6772,7 @@ Adjudicate(ChessProgramState *cps)
                    || NrWN==2 || NrBN==2     /* KNNK */
                    || NrWN+NrWB == 1 && NrBN+NrBB == 1 /* KBKN, KBKB, KNKN */
                   ) ) {
-                     if(canAdjudicate && --moveCount < 0 && appData.trivialDraws)
+                     if(--moveCount < 0 && appData.trivialDraws && canAdjudicate)
                      {    /* if the first 3 moves do not show a tactical win, declare draw */
 			  if(engineOpponent) {
 			    SendToProgram("force\n", engineOpponent); // suppress reply
@@ -6784,7 +6823,7 @@ Adjudicate(ChessProgramState *cps)
                                 boards[forwardMostMove][CASTLING][4] != boards[k][CASTLING][4] )
                                    rights++;
                         }
-                        if( canAdjudicate && rights == 0 && ++count > appData.drawRepeats-2
+                        if( rights == 0 && ++count > appData.drawRepeats-2 && canAdjudicate
                             && appData.drawRepeats > 1) {
                              /* adjudicate after user-specified nr of repeats */
 			     if(engineOpponent) {
@@ -7753,6 +7792,7 @@ if(appData.debugMode) fprintf(debugFP, "nodes = %d, %lld\n", (int) programStats.
 	}
 
 	if (!ignore) {
+	    ChessProgramStats tempStats = programStats; // [HGM] info: filter out info lines
 	    buf1[0] = NULLCHAR;
 	    if (sscanf(message, "%d%c %d %d " u64Display " %[^\n]\n",
 		       &plylev, &plyext, &curscore, &time, &nodes, buf1) >= 5) {
@@ -7774,11 +7814,11 @@ if(appData.debugMode) fprintf(debugFP, "nodes = %d, %lld\n", (int) programStats.
                 }
 
 
-		programStats.depth = plylev;
-		programStats.nodes = nodes;
-		programStats.time = time;
-		programStats.score = curscore;
-		programStats.got_only_move = 0;
+		tempStats.depth = plylev;
+		tempStats.nodes = nodes;
+		tempStats.time = time;
+		tempStats.score = curscore;
+		tempStats.got_only_move = 0;
 
 		if(cps->nps >= 0) { /* [HGM] nps: use engine nodes or time to decrement clock */
 			int ticklen;
@@ -7795,31 +7835,34 @@ if(appData.debugMode) fprintf(debugFP, "nodes = %d, %lld\n", (int) programStats.
 
 		/* Buffer overflow protection */
 		if (buf1[0] != NULLCHAR) {
-		    if (strlen(buf1) >= sizeof(programStats.movelist)
+		    if (strlen(buf1) >= sizeof(tempStats.movelist)
 			&& appData.debugMode) {
 			fprintf(debugFP,
 				"PV is too long; using the first %u bytes.\n",
-				(unsigned) sizeof(programStats.movelist) - 1);
+				(unsigned) sizeof(tempStats.movelist) - 1);
 		    }
 
-                    safeStrCpy( programStats.movelist, buf1, sizeof(programStats.movelist) );
+                    safeStrCpy( tempStats.movelist, buf1, sizeof(tempStats.movelist) );
 		} else {
-		    sprintf(programStats.movelist, " no PV\n");
+		    sprintf(tempStats.movelist, " no PV\n");
 		}
 
-		if (programStats.seen_stat) {
-		    programStats.ok_to_send = 1;
+		if (tempStats.seen_stat) {
+		    tempStats.ok_to_send = 1;
 		}
 
-		if (strchr(programStats.movelist, '(') != NULL) {
-		    programStats.line_is_book = 1;
-		    programStats.nr_moves = 0;
-		    programStats.moves_left = 0;
+		if (strchr(tempStats.movelist, '(') != NULL) {
+		    tempStats.line_is_book = 1;
+		    tempStats.nr_moves = 0;
+		    tempStats.moves_left = 0;
 		} else {
-		    programStats.line_is_book = 0;
+		    tempStats.line_is_book = 0;
 		}
 
-                SendProgramStatsToFrontend( cps, &programStats );
+		    if(tempStats.score != 0 || tempStats.nodes != 0 || tempStats.time != 0)
+			programStats = tempStats; // [HGM] info: only set stats if genuine PV and not an info line
+
+                SendProgramStatsToFrontend( cps, &tempStats );
 
                 /* 
                     [AS] Protect the thinkOutput buffer from overflow... this
@@ -8898,8 +8941,10 @@ GameEnds(result, resultDetails, whosays)
 
     if(endingGame) return; /* [HGM] crash: forbid recursion */
     endingGame = 1;
-    if(twoBoards) { twoBoards = partnerUp = 0; InitDrawingSizes(-2, 0); } // [HGM] dual
-
+    if(twoBoards) { // [HGM] dual: switch back to one board
+	twoBoards = partnerUp = 0; InitDrawingSizes(-2, 0);
+	DrawPosition(TRUE, partnerBoard); // observed game becomes foreground
+    }
     if (appData.debugMode) {
       fprintf(debugFP, "GameEnds(%d, %s, %d)\n",
 	      result, resultDetails ? resultDetails : "(null)", whosays);
@@ -10169,7 +10214,9 @@ LoadGame(f, gameNumber, title, useList)
     if (numPGNTags > 0){
         char *tags;
 	if (gameInfo.variant == VariantNormal) {
-	  gameInfo.variant = StringToVariant(gameInfo.event);
+	  VariantClass v = StringToVariant(gameInfo.event);
+	  // [HGM] do not recognize variants from event tag that were introduced after supporting variant tag
+	  if(v < VariantShogi) gameInfo.variant = v;
 	}
 	if (!matchMode) {
           if( appData.autoDisplayTags ) {
@@ -13356,8 +13403,10 @@ ReceiveFromProgram(isr, closure, message, count, error)
 		   sscanf(message, "error %c", &c)!=1 && sscanf(message, "illegal %c", &c)!=1 &&
 		   sscanf(message, "tell%c", &c)!=1   && sscanf(message, "0-1 %c", &c)!=1 &&
 		   sscanf(message, "1-0 %c", &c)!=1   && sscanf(message, "1/2-1/2 %c", &c)!=1 &&
-		   sscanf(message, "pong %c", &c)!=1   && start != '#')
-			{ quote = "# "; print = (appData.engineComments == 2); }
+		   sscanf(message, "pong %c", &c)!=1   && start != '#')	{
+		    quote = appData.engineComments == 2 ? "# " : "### NON-COMPLIANT! ### ";
+		    print = (appData.engineComments >= 2);
+		}
 		message[0] = start; // restore original message
 	}
 	if(print) {
@@ -15166,3 +15215,4 @@ LoadVariation(int index, char *text)
 	CommentPopDown();
 	ToNrEvent(currentMove+1);
 }
+