X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=engineoutput.c;h=94f2a8791ba6596d328fcc6627a11f3c1c0734a3;hb=fb7eb56b7f69038426c5276f77e04ad1b0f8fcb7;hp=9cd75483a797591fdbd902066dfcc38f15c4e54c;hpb=1d4d9cd9be0e8b7986128e0480ecef3ad3a45933;p=xboard.git diff --git a/engineoutput.c b/engineoutput.c index 9cd7548..94f2a87 100644 --- a/engineoutput.c +++ b/engineoutput.c @@ -5,6 +5,8 @@ * * Copyright 2005 Alessandro Scotti * + * Enhancements Copyright 1995, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. + * * ------------------------------------------------------------------------ * * GNU XBoard is free software: you can redistribute it and/or modify @@ -51,7 +53,13 @@ # define _(s) gettext (s) # define N_(s) gettext_noop (s) #else -# define _(s) (s) +# ifdef WIN32 +# define _(s) T_(s) +# undef ngettext +# define ngettext(s,p,n) T_(p) +# else +# define _(s) (s) +# endif # define N_(s) s #endif @@ -66,6 +74,7 @@ typedef struct { char * hint; int an_move_index; int an_move_count; + int moveKey; } EngineOutputData; // called by other front-end @@ -83,11 +92,12 @@ 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]; +static int scores[MAX_VAR], textEnd[MAX_VAR], keys[MAX_VAR], curDepth[2], nrVariations[2]; extern int initialRulePlies; -void MakeEngineOutputTitle() +void +MakeEngineOutputTitle () { static char buf[MSG_SIZ]; static char oldTitle[MSG_SIZ]; @@ -104,7 +114,7 @@ void MakeEngineOutputTitle() count = currentMove - count; if(!rule) rule = 100; if(count >= rule - 40 && (!appData.icsActive || gameMode == IcsObserving)) { - snprintf(buf, MSG_SIZ, _("%s (%d reversible plies)"), title, count); + snprintf(buf, MSG_SIZ, ngettext("%s (%d reversible ply)", "%s (%d reversible plies)", count), title, count); safeStrCpy(title, buf, MSG_SIZ); } if(!strcmp(oldTitle, title)) return; @@ -113,7 +123,8 @@ void MakeEngineOutputTitle() } // back end, due to front-end wrapper for SetWindowText, and new SetIcon arguments -void SetEngineState( int which, int state, char * state_data ) +void +SetEngineState (int which, int state, char * state_data) { int x_which = 1 - which; @@ -145,11 +156,15 @@ void SetEngineState( int which, int state, char * state_data ) } // back end, now the front-end wrapper ClearMemo is used, and ed no longer contains handles. -void SetProgramStats( FrontEndProgramStats * stats ) // now directly called by back-end +void +SetProgramStats (FrontEndProgramStats * stats) // now directly called by back-end { EngineOutputData ed; int clearMemo = FALSE; int which, depth, multi; + ChessMove moveType; + int ff, ft, rf, rt; + char pc; if( stats == 0 ) { SetEngineState( 0, STATE_IDLE, "" ); @@ -209,10 +224,13 @@ void SetProgramStats( FrontEndProgramStats * stats ) // now directly called by b if( clearMemo ) { DoClearMemo(which); nrVariations[which] = 0; header[0] = NULLCHAR; - if(gameMode == AnalyzeMode && (multi = MultiPV(&first)) >= 0) { + if(gameMode == AnalyzeMode) { + if((multi = MultiPV(&first)) >= 0) { snprintf(header, MSG_SIZ, "\t%s viewpoint\t\tfewer / Multi-PV setting = %d / more\n", appData.whitePOV || appData.scoreWhite ? "white" : "mover", first.option[multi].value); - InsertIntoMemo( which, header, 0); + } + snprintf(header+strlen(header), MSG_SIZ-strlen(header), "%s", exclusionHeader); + InsertIntoMemo( which, header, 0); } else if(appData.ponderNextMove && lastLine[which][0]) { InsertIntoMemo( which, lastLine[which], 0 ); @@ -220,6 +238,10 @@ void SetProgramStats( FrontEndProgramStats * stats ) // now directly called by b } } + if(ParseOneMove(ed.pv, currentMove, &moveType, &ff, &rf, &ft, &rt, &pc)) + ed.moveKey = (ff<<24 | rf << 16 | ft << 8 | rt) ^ pc*87161; + else ed.moveKey = ed.nodes; // kludge to get unique key unlikely to match any move + /* Update */ lastDepth[which] = depth == 1 && ed.nodes == 0 ? 0 : depth; // [HGM] info-line kudge lastForwardMostMove[which] = forwardMostMove; @@ -232,7 +254,8 @@ void SetProgramStats( FrontEndProgramStats * stats ) // now directly called by b #define ENGINE_COLOR_UNKNOWN ' ' // pure back end -static char GetEngineColor( int which ) +static char +GetEngineColor (int which) { char result = ENGINE_COLOR_UNKNOWN; @@ -265,7 +288,8 @@ static char GetEngineColor( int which ) } // pure back end -static char GetActiveEngineColor() +static char +GetActiveEngineColor () { char result = ENGINE_COLOR_UNKNOWN; @@ -277,7 +301,8 @@ static char GetActiveEngineColor() } // pure back end -static int IsEnginePondering( int which ) +static int +IsEnginePondering (int which) { int result = FALSE; @@ -302,7 +327,8 @@ static int IsEnginePondering( int which ) } // back end -static void SetDisplayMode( int mode ) +static void +SetDisplayMode (int mode) { if( windowMode != mode ) { windowMode = mode; @@ -312,7 +338,8 @@ static void SetDisplayMode( int mode ) } // pure back end -static void VerifyDisplayMode() +static void +VerifyDisplayMode () { int mode; @@ -342,7 +369,8 @@ static void VerifyDisplayMode() } // back end. Determine what icon to set in the color-icon field, and print it -void SetEngineColorIcon( int which ) +void +SetEngineColorIcon (int which) { char color = GetEngineColor(which); int nicon = 0; @@ -361,7 +389,8 @@ void SetEngineColorIcon( int which ) // [HGM] multivar: sort Thinking Output within one depth on score -static int InsertionPoint( int len, EngineOutputData * ed ) +static int +InsertionPoint (int len, EngineOutputData *ed) { int i, offs = 0, newScore = ed->score, n = ed->which; @@ -377,10 +406,13 @@ static int InsertionPoint( int len, EngineOutputData * ed ) offs = textEnd[i+n]; textEnd[i+n+2] = offs + len; scores[i+n+2] = newScore; - if(newScore < scores[i+n]) break; + keys[i+n+2] = ed->moveKey; + 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]) break; // if it had higher score as previous, move previous in stead scores[i+n+2] = scores[i+n]; textEnd[i+n+2] = textEnd[i+n] + len; + keys[i+n+2] = keys[i+n]; } if(i<0) { offs = 0; @@ -393,7 +425,8 @@ static int InsertionPoint( int len, EngineOutputData * ed ) // pure back end, now SetWindowText is called via wrapper DoSetWindowText -static void UpdateControls( EngineOutputData * ed ) +static void +UpdateControls (EngineOutputData *ed) { // int isPondering = FALSE; @@ -534,7 +567,8 @@ static void UpdateControls( EngineOutputData * ed ) } // [HGM] kibitz: write kibitz line; split window for it if necessary -void OutputKibitz(int window, char *text) +void +OutputKibitz (int window, char *text) { static int currentLineEnd[2]; int where = 0;