Fix disappearence of pieces that were moved illegally

[xboard.git] / engineoutput.c

diff --git a/engineoutput.c b/engineoutput.c
index caf8f8b..42eccc0 100644 (file)
--- a/engineoutput.c
+++ b/engineoutput.c
@@ -5,7 +5,7 @@
  *
  * Copyright 2005 Alessandro Scotti
  *
  *
  * Copyright 2005 Alessandro Scotti
  *

- * Enhancements Copyright 1995, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+ * Enhancements Copyright 1995, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.

  *
  * ------------------------------------------------------------------------
  *
  *
  * ------------------------------------------------------------------------
  *


@@ -53,7 +53,13 @@
 # define  _(s) gettext (s)
 # define N_(s) gettext_noop (s)
 #else
 # 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
 
 # define N_(s)  s
 #endif
 


@@ -68,6 +74,7 @@ typedef struct {
     char * hint;
     int an_move_index;
     int an_move_count;
     char * hint;
     int an_move_index;
     int an_move_count;

+    int moveKey;

 } EngineOutputData;
 
 // called by other front-end
 } EngineOutputData;
 
 // called by other front-end


@@ -82,10 +89,10 @@ 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 int  lastForwardMostMove[2] = { -1, -1 };
 static int  engineState[2] = { -1, -1 };
 static char lastLine[2][MSG_SIZ];

-static char header[MSG_SIZ];
+static char header[2][MSG_SIZ];

 
 #define MAX_VAR 400
 
 #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;
 
 
 extern int initialRulePlies;
 


@@ -106,7 +113,7 @@ MakeEngineOutputTitle ()
        if( count == backwardMostMove ) count -= initialRulePlies;
        count = currentMove - count;
        if(!rule) rule = 100;
        if( count == backwardMostMove ) count -= initialRulePlies;
        count = currentMove - count;
        if(!rule) rule = 100;

-       if(count >= rule - 40 && (!appData.icsActive || gameMode == IcsObserving)) {
+       if(count >= rule - 40 && (!appData.icsActive || gameMode == IcsObserving || appData.zippyPlay)) {

                snprintf(buf, MSG_SIZ, ngettext("%s (%d reversible ply)", "%s (%d reversible plies)", count), title, count);
                safeStrCpy(title, buf, MSG_SIZ);
        }
                snprintf(buf, MSG_SIZ, ngettext("%s (%d reversible ply)", "%s (%d reversible plies)", count), title, count);
                safeStrCpy(title, buf, MSG_SIZ);
        }


@@ -117,7 +124,7 @@ MakeEngineOutputTitle ()
 
 // back end, due to front-end wrapper for SetWindowText, and new SetIcon arguments
 void
 
 // back end, due to front-end wrapper for SetWindowText, and new SetIcon arguments
 void

-SetEngineState (int which, int state, char * state_data)
+SetEngineState (int which, enum ENGINE_STATE state, char * state_data)

 {
     int x_which = 1 - which;
 
 {
     int x_which = 1 - which;
 


@@ -155,6 +162,9 @@ SetProgramStats (FrontEndProgramStats * stats) // now directly called by back-en
     EngineOutputData ed;
     int clearMemo = FALSE;
     int which, depth, multi;
     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, "" );
 
     if( stats == 0 ) {
         SetEngineState( 0, STATE_IDLE, "" );


@@ -213,11 +223,15 @@ SetProgramStats (FrontEndProgramStats * stats) // now directly called by back-en
 
     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 || appData.scoreWhite ? "white" : "mover", first.option[multi].value);
-            InsertIntoMemo( which, header, 0);
+        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);
+         }
+          if(!which) snprintf(header[which]+strlen(header[which]), MSG_SIZ-strlen(header[which]), "%s", exclusionHeader);
+          InsertIntoMemo( which, header[which], 0);

         } else
         if(appData.ponderNextMove && lastLine[which][0]) {
             InsertIntoMemo( which, lastLine[which], 0 );
         } else
         if(appData.ponderNextMove && lastLine[which][0]) {
             InsertIntoMemo( which, lastLine[which], 0 );


@@ -225,6 +239,10 @@ SetProgramStats (FrontEndProgramStats * stats) // now directly called by back-en
         }
     }
 
         }
     }
 

+    if(ed.pv && ed.pv[0] && 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;
     /* Update */
     lastDepth[which] = depth == 1 && ed.nodes == 0 ? 0 : depth; // [HGM] info-line kudge
     lastForwardMostMove[which] = forwardMostMove;


@@ -330,12 +348,14 @@ VerifyDisplayMode ()
     switch( gameMode ) {
     case IcsObserving:    // [HGM] ICS analyze
        if(!appData.icsEngineAnalyze) return;
     switch( gameMode ) {
     case IcsObserving:    // [HGM] ICS analyze
        if(!appData.icsEngineAnalyze) return;

-    case AnalyzeMode:

     case AnalyzeFile:
     case MachinePlaysWhite:
     case MachinePlaysBlack:
         mode = 0;
         break;
     case AnalyzeFile:
     case MachinePlaysWhite:
     case MachinePlaysBlack:
         mode = 0;
         break;

+    case AnalyzeMode:
+        mode = second.analyzing;
+        break;

     case IcsPlayingWhite:
     case IcsPlayingBlack:
         mode = appData.zippyPlay && opponentKibitzes; // [HGM] kibitz
     case IcsPlayingWhite:
     case IcsPlayingBlack:
         mode = appData.zippyPlay && opponentKibitzes; // [HGM] kibitz


@@ -389,10 +409,13 @@ InsertionPoint (int len, EngineOutputData *ed)
                offs = textEnd[i+n];
                textEnd[i+n+2] = offs + len;
                scores[i+n+2] = newScore;
                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;
                // 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;
        }
        if(i<0) {
                offs = 0;


@@ -400,7 +423,7 @@ InsertionPoint (int len, EngineOutputData *ed)
                scores[n] = newScore;
        }
        nrVariations[n] += 2;
                scores[n] = newScore;
        }
        nrVariations[n] += 2;

-      return offs + (gameMode == AnalyzeMode)*strlen(header);
+      return offs + (gameMode == AnalyzeMode)*strlen(header[ed->which]);

 }
 
 
 }
 
 


@@ -483,10 +506,10 @@ UpdateControls (EngineOutputData *ed)
         unsigned long nps_100 = ed->nodes / ed->time;
 
         if( nps_100 < 100000 ) {
         unsigned long nps_100 = ed->nodes / ed->time;
 
         if( nps_100 < 100000 ) {

-         snprintf( s_label, sizeof(s_label)/sizeof(s_label[0]), "NPS: %lu", nps_100 * 100 );
+         snprintf( s_label, sizeof(s_label)/sizeof(s_label[0]), "%s: %lu", _("NPS"), nps_100 * 100 );

         }
         else {
         }
         else {

-         snprintf( s_label, sizeof(s_label)/sizeof(s_label[0]), "NPS: %.1fk", nps_100 / 10.0 );
+         snprintf( s_label, sizeof(s_label)/sizeof(s_label[0]), "%s: %.1fk", _("NPS"), nps_100 / 10.0 );

         }
     }
 
         }
     }