X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=engineoutput.c;h=4e009603c6d60d086729c0136a800a20eaafa436;hb=1161f02260cfbb6a22a6d9de91bb31e27f16cc88;hp=3e9da121a73fbb638d1c1f23ae4b8f0ac391f760;hpb=4011e8678d85310eedf19fd00aa5d96a9a60770a;p=xboard.git

diff --git a/engineoutput.c b/engineoutput.c
index 3e9da12..4e00960 100644
--- a/engineoutput.c
+++ b/engineoutput.c
@@ -5,7 +5,8 @@
  *
  * Copyright 2005 Alessandro Scotti
  *
- * Enhancements Copyright 1995, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Free Software Foundation, Inc.
+ * Enhancements Copyright 1995, 2009, 2010, 2011, 2012, 2013, 2014,
+ * 2015, 2016 Free Software Foundation, Inc.
  *
  * ------------------------------------------------------------------------
  *
@@ -221,7 +222,7 @@ SetProgramStats (FrontEndProgramStats * stats) // now directly called by back-en
         clearMemo = TRUE;
     }
 
-    if( lastForwardMostMove[which] != forwardMostMove ) {
+    if( lastForwardMostMove[which] != forwardMostMove && endPV < 0) {
         clearMemo = TRUE;
     }
 
@@ -231,11 +232,14 @@ SetProgramStats (FrontEndProgramStats * stats) // now directly called by back-en
         header[which][0] = NULLCHAR;
         if(gameMode == AnalyzeMode) {
           ChessProgramState *cps = (which ? &second : &first);
-          if((multi = MultiPV(cps)) >= 0) {
-            snprintf(header[which], MSG_SIZ, "\t%s viewpoint\t\tfewer / Multi-PV setting = %d / more\n",
-                                       appData.whitePOV || appData.scoreWhite ? "white" : "mover", cps->option[multi].value);
+          char *exclu = cps->excludeMoves ? exclusionHeader : "";
+          if((multi = MultiPV(cps, 3)) != -1) {
+            char *s = "setting";
+            if(multi < -1) multi = -2 - multi, s = "margin";
+            snprintf(header[which], MSG_SIZ, "\t%s viewpoint\t\tfewer / Multi-PV %s = %d / more\n",
+                                       appData.whitePOV || appData.scoreWhite ? "white" : "mover", s, cps->option[multi].value);
 	  }
-          if(!which) snprintf(header[which]+strlen(header[which]), MSG_SIZ-strlen(header[which]), "%s%s", exclusionHeader, columnHeader);
+          if(!which) snprintf(header[which]+strlen(header[which]), MSG_SIZ-strlen(header[which]), "%s%s", exclu, columnHeader);
           InsertIntoMemo( which, header[which], 0);
         } else {
           snprintf(header[which], MSG_SIZ, "%s", columnHeader);
@@ -253,7 +257,7 @@ SetProgramStats (FrontEndProgramStats * stats) // now directly called by back-en
 
     /* Update */
     lastDepth[which] = depth == 1 && ed.nodes == 0 ? 0 : depth; // [HGM] info-line kudge
-    lastForwardMostMove[which] = forwardMostMove;
+    if(endPV < 0) lastForwardMostMove[which] = forwardMostMove; // not during PV walk!
 
     UpdateControls( &ed );
 }
@@ -401,6 +405,14 @@ SetEngineColorIcon (int which)
 // [HGM] multivar: sort Thinking Output within one depth on score
 
 static int
+MateFlip (int n)
+{   // map mate-score to monotonous scale, so sorting compares them correctly
+    if(n >=  MATE_SCORE) return 2*MATE_SCORE - n;
+    if(n <= -MATE_SCORE) return -2*MATE_SCORE - n;
+    return n;
+}
+
+static int
 InsertionPoint (int len, EngineOutputData *ed)
 {
 	int i, offs = 0, newScore = ed->score, n = ed->which;
@@ -424,7 +436,7 @@ InsertionPoint (int len, EngineOutputData *ed)
 		keys[i+n+2] = ed->moveKey;
 		fail[i+n+2] = failType;
 		if(ed->moveKey != keys[i+n] && // same move always tops previous one (as a higher score must be a fail low)
-		   newScore < scores[i+n] && fail[i+n] == ' ') break;
+		   MateFlip(newScore) < MateFlip(scores[i+n]) && fail[i+n] == ' ') break;
 		// if it had higher score as previous, move previous in stead
 		scores[i+n+2] = ed->moveKey == keys[i+n] ? newScore : scores[i+n]; // correct scores of fail-low/high searches
 		textEnd[i+n+2] = textEnd[i+n] + len;
@@ -442,7 +454,6 @@ InsertionPoint (int len, EngineOutputData *ed)
       return offs + strlen(header[ed->which]);
 }
 
-#define MATE_SCORE 100000
 static char spaces[] = "            "; // [HGM] align: spaces for padding
 
 static void
@@ -692,7 +703,7 @@ OutputKibitz (int window, char *text)
 	}
 	opponentKibitzes = TRUE; // this causes split window DisplayMode in ICS modes.
 	VerifyDisplayMode();
-	strncpy(text+strlen(text)-1, "\r\n",sizeof(text+strlen(text)-1)); // to not lose line breaks on copying
+	strncpy(text+strlen(text)-1, "\r\n", 4); // to not lose line breaks on copying
 	if(gameMode == IcsObserving) {
 	    DoSetWindowText(0, nLabel, gameInfo.white);
 	    SetIcon( 0, nColorIcon,  nColorWhite);