X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=engineoutput.c;h=a21282e0fdffc5ad33fcd9a77410f50c74407b2e;hb=56310c5b198bc521e0a715377c68378b7bcf10a5;hp=9c493adff4a22d061cfada5f70a13959f95e0a57;hpb=18fe8fec4c8638dccb0c59c781a9ad900ddb3043;p=xboard.git diff --git a/engineoutput.c b/engineoutput.c old mode 100755 new mode 100644 index 9c493ad..a21282e --- a/engineoutput.c +++ b/engineoutput.c @@ -28,7 +28,6 @@ #include "config.h" #include -#include #if STDC_HEADERS # include @@ -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 */ @@ -402,7 +434,7 @@ static void UpdateControls( EngineOutputData * ed ) strncpy( mov, ed->hint, sizeof(mov) ); mov[ sizeof(mov)-1 ] = '\0'; - sprintf( buf, "[%d] %d/%d: %s [%02d:%02d:%02d]", ed->depth, ed->an_move_index, + snprintf( buf, sizeof(buf)/sizeof(buf[0]), "[%d] %d/%d: %s [%02d:%02d:%02d]", ed->depth, ed->an_move_index, ed->an_move_count, mov, time_mins / 60, time_mins % 60, time_secs % 60 ); } @@ -421,10 +453,10 @@ static void UpdateControls( EngineOutputData * ed ) unsigned long nps_100 = ed->nodes / ed->time; if( nps_100 < 100000 ) { - sprintf( s_label, "NPS: %lu", nps_100 * 100 ); + snprintf( s_label, sizeof(s_label)/sizeof(s_label[0]), "NPS: %lu", nps_100 * 100 ); } else { - sprintf( s_label, "NPS: %.1fk", nps_100 / 10.0 ); + snprintf( s_label, sizeof(s_label)/sizeof(s_label[0]), "NPS: %.1fk", nps_100 / 10.0 ); } } @@ -442,26 +474,29 @@ static void UpdateControls( EngineOutputData * ed ) /* Nodes */ if( ed->nodes < 1000000 ) { - sprintf( s_nodes, u64Display, ed->nodes ); + snprintf( s_nodes, sizeof(s_nodes)/sizeof(s_nodes[0]), u64Display, ed->nodes ); } else { - sprintf( s_nodes, "%.1fM", u64ToDouble(ed->nodes) / 1000000.0 ); + snprintf( s_nodes, sizeof(s_nodes)/sizeof(s_nodes[0]), "%.1fM", u64ToDouble(ed->nodes) / 1000000.0 ); } /* Score */ - if( ed->score > 0 ) { - sprintf( s_score, "+%.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 { - sprintf( s_score, "%.2f", ed->score / 100.0 ); + snprintf( s_score, sizeof(s_score)/sizeof(s_score[0]), "%.2f", h / 100.0 ); } /* Time */ - sprintf( s_time, "%d:%02d.%02d", time_secs / 60, time_secs % 60, time_cent ); + snprintf( s_time, sizeof(s_time)/sizeof(s_time[0]), "%d:%02d.%02d", time_secs / 60, time_secs % 60, time_cent ); /* Put all together... */ - if(ed->nodes == 0 && ed->score == 0 && ed->time == 0) sprintf( buf, "%3d\t", ed->depth ); else - sprintf( buf, "%3d\t%s\t%s\t%s\t", ed->depth, s_score, s_nodes, s_time ); + if(ed->nodes == 0 && ed->score == 0 && ed->time == 0) + snprintf( buf, sizeof(buf)/sizeof(buf[0]), "%3d\t", ed->depth ); + else + snprintf( buf, sizeof(buf)/sizeof(buf[0]), "%3d\t%s\t%s\t%s\t", ed->depth, s_score, s_nodes, s_time ); /* Add PV */ buflen = strlen(buf); @@ -474,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 */ @@ -483,13 +519,16 @@ static void UpdateControls( EngineOutputData * ed ) // [HGM] kibitz: write kibitz line; split window for it if necessary void OutputKibitz(int window, char *text) { + static int currentLineEnd[2]; + int where = 0; if(!EngineOutputIsUp()) return; if(!opponentKibitzes) { // on first kibitz of game, clear memos - DoClearMemo(1); - if(gameMode == IcsObserving) DoClearMemo(0); + DoClearMemo(1); currentLineEnd[1] = 0; + if(gameMode == IcsObserving) { DoClearMemo(0); currentLineEnd[0] = 0; } } 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 if(gameMode == IcsObserving) { DoSetWindowText(0, nLabel, gameInfo.white); SetIcon( 0, nColorIcon, nColorWhite); @@ -498,5 +537,8 @@ void OutputKibitz(int window, char *text) DoSetWindowText(1, nLabel, gameMode == IcsPlayingBlack ? gameInfo.white : gameInfo.black); // opponent name SetIcon( 1, nColorIcon, gameMode == IcsPlayingBlack ? nColorWhite : nColorBlack); SetIcon( 1, nStateIcon, nClear); - InsertIntoMemo(window-1, text, 0); // [HGM] multivar: always at top + if(strstr(text, "\\ ") == text) where = currentLineEnd[window-1]; // continuation line +//if(appData.debugMode) fprintf(debugFP, "insert '%s' at %d (end = %d,%d)\n", text, where, currentLineEnd[0], currentLineEnd[1]); + InsertIntoMemo(window-1, text, where); // [HGM] multivar: always at top + currentLineEnd[window-1] = where + strlen(text); }