X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=backend.c;h=13afbc52f435b666fe21ec76ee1c3997661edd45;hb=8baea05c6e9e63f8b1b57891b67b5ac0e1961b81;hp=7e8ed598b3db54170608a586a766028379be6810;hpb=40eab476400a6232e304c760c8d8559fbe697c46;p=xboard.git

diff --git a/backend.c b/backend.c
index 7e8ed59..13afbc5 100644
--- a/backend.c
+++ b/backend.c
@@ -129,6 +129,7 @@ extern int gettimeofday(struct timeval *, struct timezone *);
 # include "zippy.h"
 #endif
 #include "backendz.h"
+#include "evalgraph.h"
 #include "gettext.h"
 
 #ifdef ENABLE_NLS
@@ -1844,6 +1845,7 @@ read_from_player (InputSourceRef isr, VOIDSTAR closure, char *message, int count
 {
     int outError, outCount;
     static int gotEof = 0;
+    static FILE *ini;
 
     /* Pass data read from player on to ICS */
     if (count > 0) {
@@ -1852,6 +1854,17 @@ read_from_player (InputSourceRef isr, VOIDSTAR closure, char *message, int count
 	if (outCount < count) {
             DisplayFatalError(_("Error writing to ICS"), outError, 1);
 	}
+	if(have_sent_ICS_logon == 2) {
+	  if(ini = fopen(appData.icsLogon, "w")) { // save first two lines (presumably username & password) on init script file
+	    fprintf(ini, "%s", message);
+	    have_sent_ICS_logon = 3;
+	  } else
+	    have_sent_ICS_logon = 1;
+	} else if(have_sent_ICS_logon == 3) {
+	    fprintf(ini, "%s", message);
+	    fclose(ini);
+	  have_sent_ICS_logon = 1;
+	}
     } else if (count < 0) {
 	RemoveInputSource(isr);
 	DisplayFatalError(_("Error reading from keyboard"), error, 1);
@@ -2513,9 +2526,7 @@ PlotSeekAd (int i)
 void
 PlotSingleSeekAd (int i)
 {
-	DrawSeekOpen();
 	PlotSeekAd(i);
-	DrawSeekClose();
 }
 
 void
@@ -2602,14 +2613,13 @@ DrawSeekGraph ()
     h = BOARD_HEIGHT * (squareSize + lineGap) + lineGap;
     w = BOARD_WIDTH  * (squareSize + lineGap) + lineGap;
 
-    DrawSeekOpen();
     DrawSeekBackground(0, 0, w, h);
     DrawSeekAxis(hMargin, h-1-vMargin, w-5, h-1-vMargin);
     DrawSeekAxis(hMargin, h-1-vMargin, hMargin, 5);
     for(i=0; i<4000; i+= 100) if(i>=minRating && i<maxRating) {
 	int yy =((double)i - minRating)/(maxRating - minRating)*(h-vMargin-squareSize/8-1) + vMargin;
 	yy = h-1-yy;
-	DrawSeekAxis(hMargin+5*(i%500==0), yy, hMargin-5, yy); // rating ticks
+	DrawSeekAxis(hMargin-5, yy, hMargin+5*(i%500==0), yy); // rating ticks
 	if(i%500 == 0) {
 	    char buf[MSG_SIZ];
 	    snprintf(buf, MSG_SIZ, "%d", i);
@@ -2627,7 +2637,6 @@ DrawSeekGraph ()
 	}
     }
     for(i=0; i<nrOfSeekAds; i++) PlotSeekAd(i);
-    DrawSeekClose();
     return TRUE;
 }
 
@@ -3441,9 +3450,15 @@ read_from_ics (InputSourceRef isr, VOIDSTAR closure, char *data, int count, int
 		continue;
 	    }
 
-	    if (!have_sent_ICS_logon && looking_at(buf, &i, "login:")) {
-		ICSInitScript();
-		have_sent_ICS_logon = 1;
+	    if (looking_at(buf, &i, "login:")) {
+	      if (!have_sent_ICS_logon) {
+		if(ICSInitScript())
+		  have_sent_ICS_logon = 1;
+		else // no init script was found
+		  have_sent_ICS_logon = (appData.autoCreateLogon ? 2 : 1); // flag that we should capture username + password
+	      } else { // we have sent (or created) the InitScript, but apparently the ICS rejected it
+		  have_sent_ICS_logon = (appData.autoCreateLogon ? 2 : 1); // request creation of a new script
+	      }
 		continue;
 	    }
 
@@ -6755,7 +6770,7 @@ UserMoveEvent(int fromX, int fromY, int toX, int toY, int promoChar)
 	}
     }
 
-    if(doubleClick) { // [HGM] exclude: move entered with double-click on from square is for exclusion, not playing
+    if(doubleClick && gameMode == AnalyzeMode) { // [HGM] exclude: move entered with double-click on from square is for exclusion, not playing
         if(ExcludeOneMove(fromY, fromX, toY, toX, promoChar, '*')) // toggle
 	     ClearPremoveHighlights(); // was included
 	else ClearHighlights(), SetPremoveHighlights(ff, rf, ft, rt); // exclusion indicated  by premove highlights
@@ -13449,18 +13464,59 @@ ToggleSecond ()
   }
 }
 
+/* Toggle ShowThinking */
 void
+ToggleShowThinking()
+{
+  appData.showThinking = !appData.showThinking;
+  ShowThinkingEvent();
+}
+
+int
 AnalyzeModeEvent ()
 {
-    if (gameMode == AnalyzeMode) { ToggleSecond(); return; }
+    char buf[MSG_SIZ];
+
+    if (!first.analysisSupport) {
+      snprintf(buf, sizeof(buf), _("%s does not support analysis"), first.tidy);
+      DisplayError(buf, 0);
+      return 0;
+    }
+    /* [DM] icsEngineAnalyze [HGM] This is horrible code; reverse the gameMode and isEngineAnalyze tests! */
+    if (appData.icsActive) {
+        if (gameMode != IcsObserving) {
+	  snprintf(buf, MSG_SIZ, _("You are not observing a game"));
+            DisplayError(buf, 0);
+            /* secure check */
+            if (appData.icsEngineAnalyze) {
+                if (appData.debugMode)
+                    fprintf(debugFP, _("Found unexpected active ICS engine analyze \n"));
+                ExitAnalyzeMode();
+                ModeHighlight();
+            }
+            return 0;
+        }
+        /* if enable, user wants to disable icsEngineAnalyze */
+        if (appData.icsEngineAnalyze) {
+                ExitAnalyzeMode();
+                ModeHighlight();
+                return 0;
+        }
+        appData.icsEngineAnalyze = TRUE;
+        if (appData.debugMode)
+            fprintf(debugFP, _("ICS engine analyze starting... \n"));
+    }
+
+    if (gameMode == AnalyzeMode) { ToggleSecond(); return 0; }
     if (appData.noChessProgram || gameMode == AnalyzeMode)
-      return;
+      return 0;
 
     if (gameMode != AnalyzeFile) {
         if (!appData.icsEngineAnalyze) {
                EditGameEvent();
-               if (gameMode != EditGame) return;
+               if (gameMode != EditGame) return 0;
         }
+	if (!appData.showThinking) ToggleShowThinking();
 	ResurrectChessProgram();
 	SendToProgram("analyze\n", &first);
 	first.analyzing = TRUE;
@@ -13476,6 +13532,7 @@ AnalyzeModeEvent ()
     StartAnalysisClock();
     GetTimeMark(&lastNodeCountTime);
     lastNodeCount = 0;
+    return 1;
 }
 
 void
@@ -13484,9 +13541,17 @@ AnalyzeFileEvent ()
     if (appData.noChessProgram || gameMode == AnalyzeFile)
       return;
 
+    if (!first.analysisSupport) {
+      char buf[MSG_SIZ];
+      snprintf(buf, sizeof(buf), _("%s does not support analysis"), first.tidy);
+      DisplayError(buf, 0);
+      return;
+    }
+
     if (gameMode != AnalyzeMode) {
 	EditGameEvent();
 	if (gameMode != EditGame) return;
+	if (!appData.showThinking) ToggleShowThinking();
 	ResurrectChessProgram();
 	SendToProgram("analyze\n", &first);
 	first.analyzing = TRUE;
@@ -13503,6 +13568,7 @@ AnalyzeFileEvent ()
     GetTimeMark(&lastNodeCountTime);
     lastNodeCount = 0;
     if(appData.timeDelay > 0) StartLoadGameTimer((long)(1000.0f * appData.timeDelay));
+    AnalysisPeriodicEvent(1);
 }
 
 void
@@ -17435,3 +17501,59 @@ LoadVariation (int index, char *text)
 	ToNrEvent(currentMove+1);
 }
 
+void
+LoadTheme ()
+{
+    char *p, *q, buf[MSG_SIZ];
+    if(engineLine && engineLine[0]) { // a theme was selected from the listbox
+	snprintf(buf, MSG_SIZ, "-theme %s", engineLine);
+	ParseArgsFromString(buf);
+	ActivateTheme(TRUE); // also redo colors
+	return;
+    }
+    p = nickName;
+    if(*p && !strchr(p, '"')) // theme name specified and well-formed; add settings to theme list
+    {
+	int len;
+	q = appData.themeNames;
+	snprintf(buf, MSG_SIZ, "\"%s\"", nickName);
+      if(appData.useBitmaps) {
+	snprintf(buf+strlen(buf), MSG_SIZ-strlen(buf), " -ubt true -lbtf \"%s\" -dbtf \"%s\" -lbtm %d -dbtm %d",
+		appData.liteBackTextureFile, appData.darkBackTextureFile, 
+		appData.liteBackTextureMode,
+		appData.darkBackTextureMode );
+      } else {
+	snprintf(buf+strlen(buf), MSG_SIZ-strlen(buf), " -ubt false -lsc %s -dsc %s",
+		Col2Text(2),   // lightSquareColor
+		Col2Text(3) ); // darkSquareColor
+      }
+      if(appData.useBorder) {
+	snprintf(buf+strlen(buf), MSG_SIZ-strlen(buf), " -ub true -border \"%s\"",
+		appData.border);
+      } else {
+	snprintf(buf+strlen(buf), MSG_SIZ-strlen(buf), " -ub false");
+      }
+      if(appData.useFont) {
+	snprintf(buf+strlen(buf), MSG_SIZ-strlen(buf), " -upf true -pf \"%s\" -fptc \"%s\" -fpfcw %s -fpbcb %s",
+		appData.renderPiecesWithFont,
+		appData.fontToPieceTable,
+		Col2Text(9),    // appData.fontBackColorWhite
+		Col2Text(10) ); // appData.fontForeColorBlack
+      } else {
+	snprintf(buf+strlen(buf), MSG_SIZ-strlen(buf), " -upf false -pid \"%s\"",
+		appData.pieceDirectory);
+	if(!appData.pieceDirectory[0])
+	  snprintf(buf+strlen(buf), MSG_SIZ-strlen(buf), " -wpc %s -bpc %s",
+		Col2Text(0),   // whitePieceColor
+		Col2Text(1) ); // blackPieceColor
+      }
+      snprintf(buf+strlen(buf), MSG_SIZ-strlen(buf), " -hsc %s -phc %s\n",
+		Col2Text(4),   // highlightSquareColor
+		Col2Text(5) ); // premoveHighlightColor
+	appData.themeNames = malloc(len = strlen(q) + strlen(buf) + 1);
+	if(insert != q) insert[-1] = NULLCHAR;
+	snprintf(appData.themeNames, len, "%s\n%s%s", q, buf, insert);
+	if(q) 	free(q);
+    }
+    ActivateTheme(FALSE);
+}