X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=backend.c;h=01721f0723b6a73dfa461873a5db8d968605e5cc;hb=76f00fe84ad4ba61b6eb39f374d32bde5714b9c0;hp=7a3c73160ae32ea3080d4e0b5eca3f27d98352c3;hpb=32a64dc5d127fcec56f269a290c3740f2a31da51;p=xboard.git

diff --git a/backend.c b/backend.c
index 7a3c731..01721f0 100644
--- a/backend.c
+++ b/backend.c
@@ -1107,6 +1107,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
@@ -2705,7 +2710,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;
@@ -2744,6 +2749,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, "--> * ") ||
@@ -2763,6 +2769,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])) {
@@ -2770,14 +2783,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])) {
@@ -3667,7 +3689,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 */
@@ -3744,7 +3766,7 @@ ParseBoard12(string)
     char promoChar;
     int ranks=1, files=0; /* [HGM] ICS80: allow variable board size */
     char *bookHit = NULL; // [HGM] book
-    Boolean weird = FALSE, reqFlag = FALSE;
+    Boolean weird = FALSE, reqFlag = FALSE, repaint = FALSE;
 
     fromX = fromY = toX = toY = -1;
     
@@ -3829,11 +3851,12 @@ 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(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(appData.dualBoard && !twoBoards) { twoBoards = repaint = 1; InitDrawingSizes(-2,0); }
+      if(twoBoards) { partnerUp = 1; flipView = !flipView; } // [HGM] dual
+      if(partnerUp) DrawPosition(repaint, partnerBoard);
+      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;
@@ -8904,8 +8927,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);
@@ -10175,7 +10200,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 ) {
@@ -13362,8 +13389,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) {