X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=engineoutput.c;h=a21282e0fdffc5ad33fcd9a77410f50c74407b2e;hb=56310c5b198bc521e0a715377c68378b7bcf10a5;hp=22b008c19f5d837f6a71d90993e878eccb387dae;hpb=e80c98c04e951e5026a24531cd6316be962636b9;p=xboard.git

diff --git a/engineoutput.c b/engineoutput.c
index 22b008c..a21282e 100644
--- a/engineoutput.c
+++ b/engineoutput.c
@@ -28,7 +28,6 @@
 #include "config.h"
 
 #include <stdio.h>
-#include <malloc.h>
 
 #if STDC_HEADERS
 # include <stdlib.h>
@@ -44,6 +43,7 @@
 #include "common.h"
 #include "frontend.h"
 #include "backend.h"
+#include "moves.h"
 #include "engineoutput.h"
 
 typedef struct {
@@ -70,10 +70,31 @@ static void UpdateControls( EngineOutputData * ed );
 static int  lastDepth[2] = { -1, -1 };
 static int  lastForwardMostMove[2] = { -1, -1 };
 static int  engineState[2] = { -1, -1 };
+static char lastLine[2][MSG_SIZ];
+static char header[MSG_SIZ];
 
 #define MAX_VAR 400
 static int scores[MAX_VAR], textEnd[MAX_VAR], curDepth[2], nrVariations[2];
 
+void MakeEngineOutputTitle()
+{
+	static char buf[MSG_SIZ];
+	static char oldTitle[MSG_SIZ];
+	char *title = "Engine Output";
+      extern int initialRulePlies;
+	int count;
+	// figure out value of 50-move counter
+	count = currentMove;
+	while( (signed char)boards[count][EP_STATUS] <= EP_NONE && count > backwardMostMove ) count--;
+	if( count == backwardMostMove ) count -= initialRulePlies;
+	count += 2*appData.ruleMoves - currentMove;
+	snprintf(buf, MSG_SIZ, "%s (%d ply to draw)", title, count);
+	if(count <= 40) title = buf;
+	if(!strcmp(oldTitle, title)) return;
+	safeStrCpy(oldTitle, title, MSG_SIZ);
+	SetEngineOutputTitle(title);
+}
+
 // back end, due to front-end wrapper for SetWindowText, and new SetIcon arguments
 void SetEngineState( int which, int state, char * state_data )
 {
@@ -111,8 +132,7 @@ void SetProgramStats( FrontEndProgramStats * stats ) // now directly called by b
 {
     EngineOutputData ed;
     int clearMemo = FALSE;
-    int which;
-    int depth;
+    int which, depth, multi;
 
     if( stats == 0 ) {
         SetEngineState( 0, STATE_IDLE, "" );
@@ -154,8 +174,14 @@ void SetProgramStats( FrontEndProgramStats * stats ) // now directly called by b
         ed.name = second.tidy;
     }
 
+    if( ed.pv != 0 && ed.pv[0] == ' ' ) {
+        if( strncmp( ed.pv, " no PV", 6 ) == 0 ) { /* Hack on hack! :-O */
+            ed.pv = "";
+        }
+    }
+
     /* Clear memo if needed */
-    if( lastDepth[which] > depth || (lastDepth[which] == depth && depth <= 1) ) {
+    if( lastDepth[which] > depth || (lastDepth[which] == depth && depth <= 1 && ed.pv[0]) ) { // no reason to clear if we won't add line
         clearMemo = TRUE;
     }
 
@@ -163,18 +189,24 @@ void SetProgramStats( FrontEndProgramStats * stats ) // now directly called by b
         clearMemo = TRUE;
     }
 
-    if( clearMemo ) { DoClearMemo(which); nrVariations[which] = 0; }
+    if( clearMemo ) {
+        DoClearMemo(which); nrVariations[which] = 0;
+        header[0] = NULLCHAR;
+        if(gameMode == AnalyzeMode && (multi = MultiPV(&first)) >= 0) {
+            snprintf(header, MSG_SIZ, "\t%s viewpoint\t\tfewer / Multi-PV setting = %d / more\n",
+                                       appData.whitePOV ? "white" : "mover", first.option[multi].value);
+            InsertIntoMemo( which, header, 0);
+        } else
+        if(appData.ponderNextMove && lastLine[which][0]) {
+            InsertIntoMemo( which, lastLine[which], 0 );
+            InsertIntoMemo( which, "\n", 0 );
+        }
+    }
 
     /* Update */
     lastDepth[which] = depth == 1 && ed.nodes == 0 ? 0 : depth; // [HGM] info-line kudge
     lastForwardMostMove[which] = forwardMostMove;
 
-    if( ed.pv != 0 && ed.pv[0] == ' ' ) {
-        if( strncmp( ed.pv, " no PV", 6 ) == 0 ) { /* Hack on hack! :-O */
-            ed.pv = "";
-        }
-    }
-
     UpdateControls( &ed );
 }
 
@@ -339,7 +371,7 @@ static int InsertionPoint( int len, EngineOutputData * ed )
 		scores[n] = newScore;
 	}
 	nrVariations[n] += 2;
-      return offs;
+      return offs + (gameMode == AnalyzeMode)*strlen(header);
 }
 
 
@@ -349,7 +381,7 @@ static void UpdateControls( EngineOutputData * ed )
 //    int isPondering = FALSE;
 
     char s_label[MAX_NAME_LENGTH + 32];
-
+    int h;
     char * name = ed->name;
 
     /* Label */
@@ -449,11 +481,12 @@ static void UpdateControls( EngineOutputData * ed )
         }
 
         /* Score */
-        if( ed->score > 0 ) {
-	  snprintf( s_score, sizeof(s_score)/sizeof(s_score[0]), "+%.2f", ed->score / 100.0 );
+        h = (gameMode == AnalyzeMode && appData.whitePOV && !WhiteOnMove(currentMove) ? -1 : 1) * ed->score;
+        if( h > 0 ) {
+	  snprintf( s_score, sizeof(s_score)/sizeof(s_score[0]), "+%.2f", h / 100.0 );
         }
         else {
-	  snprintf( s_score, sizeof(s_score)/sizeof(s_score[0]), "%.2f", ed->score / 100.0 );
+	  snprintf( s_score, sizeof(s_score)/sizeof(s_score[0]), "%.2f", h / 100.0 );
         }
 
         /* Time */
@@ -476,6 +509,7 @@ static void UpdateControls( EngineOutputData * ed )
 
         /* Update memo */
         InsertIntoMemo( ed->which, buf, InsertionPoint(strlen(buf), ed) );
+        strncpy(lastLine[ed->which], buf, MSG_SIZ);
     }
 
     /* Colors */