X-Git-Url: http://winboard.nl/cgi-bin?p=uci2wb.git;a=blobdiff_plain;f=UCI2WB.c;h=7d915e821777765398d0e85b3c64214d3aa24e1a;hp=ebbc301ad8830bde5b08b2ca0478f67ccda50bec;hb=1e8b2a6e137452edec15c70394d22bf864a5d54f;hpb=bb2dee0069d753a79201c629fb1a1528fae960e5

diff --git a/UCI2WB.c b/UCI2WB.c
index ebbc301..7d915e8 100644
--- a/UCI2WB.c
+++ b/UCI2WB.c
@@ -44,7 +44,7 @@
 char move[2000][10], checkOptions[8192], iniPos[256], hashOpt[20], pause, pondering, suspended, ponder, post, hasHash, c, sc='c', suffix[81], *variants, varOpt;
 int mps, tc, inc, sTime, depth, myTime, hisTime, stm, computer = NONE, memory, oldMem=0, cores, moveNr, lastDepth, lastScore, startTime, debug, flob;
 int statDepth, statScore, statNodes, statTime, currNr, size, collect, nr, sm, inex, on[500], frc, byo = -1, namOpt, comp;
-char currMove[20], moveMap[500][10], /* for analyze mode */ canPonder[20], threadOpt[20], varList[8000];
+char currMove[20], moveMap[500][10], /* for analyze mode */ canPonder[20], threadOpt[20], varList[8000], anaOpt[20];
 char board[100];  // XQ board for UCCI
 char *nameWord = "name ", *valueWord = "value ", *wTime = "w", *bTime = "b", *wInc = "winc", *bInc = "binc", newGame; // keywords that differ in UCCI
 int unit = 1, drawOffer;
@@ -191,6 +191,12 @@ StartPonder()
 	StartSearch(" ponder");
 }
 
+void
+Analyze(char *val)
+{
+    if(*anaOpt) EPRINT((f, "# setoption %s%s %s%s\n", nameWord, anaOpt, valueWord, val));
+}
+
 char *Convert(char *pv)
 {   // convert Shogi coordinates to WB
     char *p, *q, c;
@@ -321,8 +327,9 @@ Engine2GUI()
 	    if(!strcasecmp(name, "UCI_Chess960")) { frc=2; continue; }
 	    if(!strcasecmp(name, "UCI_Variant")) { if(p = strstr(line+6, " var ")) strcpy(varList, p); varOpt = 1; continue; }
 	    if(!strcasecmp(name, "UCI_Opponent")) { namOpt = 1; continue; }
+	    if(!strcasecmp(name+2, "I_AnalyseMode")) { strcpy(anaOpt, name); continue; }
 	    if(frc< 0 && (strstr(name, "960") || strcasestr(name, "frc")) && !strcmp(type, "check")) {
-		fprintf(toE, "setoption name %s value true\n", name); strcpy(val, "true"); // set non-standard suspected FRC options
+		EPRINT((f, "# setoption name %s value true\n", name)) strcpy(val, "true"); // set non-standard suspected FRC options
 	    }
 	    if(!strcasecmp(name, "Threads")) { strcpy(threadOpt, name); continue; }
 	    if(!strcasecmp(name, "Ponder") || !strcasecmp(name, "USI_Ponder")) { strcpy(canPonder, name); continue; }
@@ -368,7 +375,7 @@ Engine2GUI()
 	    if(frc) sprintf(p, ",normal,fischerandom"), printf("feature oocastle=%d\n", frc<0); // unannounced FRC uses O-O castling
 	    if(*varList) printf("feature variants=\"%s\"\n", varList+1); // from UCI_Variant combo and/or UCI_Chess960 check options
 	    printf("feature smp=1 memory=%d done=1\n", hasHash);
-	    if(unit == 2) unit = 1, fprintf(toE, "setoption usemillisec true\n");
+	    if(unit == 2) { unit = 1; EPRINT((f, "# setoption usemillisec true\n")) }
 	    Sync(WAKEUP); // done with options
 	}
     }
@@ -398,7 +405,7 @@ GUI2Engine()
     char line[256], command[256], *p, *q, *r, mySide, searching = 0;
 
     while(1) {
-	int i, x;
+	int i, x, think=0;
 
 	if((computer == stm || computer == ANALYZE && !searching) && !suspended) {
 	    DPRINT("# start search\n");
@@ -412,25 +419,30 @@ GUI2Engine()
 		    for(i=1; i<nr; i++) if(on[i]) EPRINT((f, " %s", moveMap[i]))
 		}
 		EPRINT((f, "\n")) searching = 1; // suppresses spurious commands during analysis starting new searches
-	    } else { pause = 2; StartSearch(""); fflush(stdout); fflush(toE); Sync(PAUSE); } // block input during thinking
+	    } else pause = think = 2, StartSearch(""); // request suspending of input processing while thinking
 	}
       nomove:
 	fflush(toE); fflush(stdout);
 	i = 0; while((x = getchar()) != EOF && (line[i] = x) != '\n') i++;
-	line[++i] = 0; if(x == EOF) { printf("# EOF\n"); fprintf(toE, "quit\n"); exit(-1); }
+	line[++i] = 0; if(x == EOF) { printf("# EOF\n"); sprintf(line, "quit -1\n"); }
 	sscanf(line, "%s", command);
+	if(!strcmp(command, "offer")) { drawOffer = 1; goto nomove; } // backlogged anyway, so this can be done instantly
+	if(think) {      // command arrived during thinking; order abort for 'instant commands'
+	    if(!strcmp(command, "quit") || !strcmp(command, "force") || !strcmp(command, "?")) { EPRINT((f, "# stop\n")); fflush(toE); }
+	    Sync(PAUSE); // block processing of input during thinking
+	}
 	if(!strcmp(command, "new")) {
 	    computer = BLACK; moveNr = 0; depth = -1; move[0][0] = 0;
 	    stm = WHITE; strcpy(iniPos, "position startpos"); frc &= ~1;
-	    if(memory != oldMem && hasHash) fprintf(toE, "setoption %s%s %s%d\n", nameWord, hashOpt, valueWord, memory);
+	    if(memory != oldMem && hasHash) EPRINT((f, "# setoption %s%s %s%d\n", nameWord, hashOpt, valueWord, memory))
 	    oldMem = memory;
 	    // we can set other options here
-	    if(sc == 'x') { if(newGame) fprintf(toE, "setoption newgame\n"); } else // optional in UCCI
-	    if(varOpt) fprintf(toE, "setoption name UCI_Variant value chess\n");
+	    if(sc == 'x') { if(newGame) EPRINT((f, "# setoption newgame\n")) } else // optional in UCCI
+	    if(varOpt) EPRINT((f, "# setoption name UCI_Variant value chess\n"))
 	    pause = 1; // wait for option settings to take effect
-	    fprintf(toE, "isready\n"); fflush(toE);
+	    EPRINT((f, "# isready\n")) fflush(toE);
 	    Sync(PAUSE); // wait for readyok
-	    fprintf(toE, "u%cinewgame\n", sc); fflush(toE);
+	    EPRINT((f, "# u%cinewgame\n", sc)) fflush(toE);
 	}
 	else if(!strcmp(command, "usermove")) {
 	    sscanf(line, "usermove %s", command); // strips off linefeed
@@ -472,7 +484,7 @@ GUI2Engine()
 	    printf("feature variants=\"%s\" setboard=1 usermove=1 debug=1 ping=1 name=1 reuse=0 exclude=1 pause=1 sigint=0 sigterm=0 done=0\n", variants);
 	    printf("feature option=\"UCI2WB debug output -check %d\"\n", debug);
 	    if(sc == 's') printf("feature option=\"Floating Byoyomi -check %d\"\nfeature option=\"Byoyomi -spin %d -1 1000\"\n", flob, byo);
-	    fprintf(toE, sc == 'x' ? "ucci\n" : "u%ci\n", sc); fflush(toE); // prompt UCI engine for options
+	    EPRINT((f, sc == 'x' ? "# ucci\n" : "u%ci\n", sc)) fflush(toE); // prompt UCI engine for options
 	    Sync(PAUSE); // wait for uciok
 	}
 	else if(!strcmp(command, "setboard")) {
@@ -489,13 +501,13 @@ GUI2Engine()
 	}
 	else if(!strcmp(command, "variant")) {
 		if(varOpt) {
-		    fprintf(toE, "setoption name UCI_Variant value %sucinewgame\nisready\n", strcmp(line+8, "3check\n") ? line+8 : "threecheck\n");
+		    EPRINT((f, "# setoption name UCI_Variant value %sucinewgame\nisready\n", strcmp(line+8, "3check\n") ? line+8 : "threecheck\n"))
 		    fflush(toE); Sync(PAUSE);
 		}
 		if(!strcmp(line+8, "shogi\n")) size = 9, strcpy(iniPos, "position startpos");
 		if(!strcmp(line+8, "5x5+5_shogi\n")) size = 5, strcpy(iniPos, "position startpos");
 		if(!strcmp(line+8, "xiangqi\n")) strcpy(iniPos, "fen rnbakabnr/9/1c5c1/p1p1p1p1p/9/9/P1P1P1P1P/1C5C1/9/RNBAKABNR r");
-		if(!strcmp(line+8, "fischerandom\n")) { frc |= 1; if(frc > 0) fprintf(toE, "setoption name UCI_Chess960 value true\n"); }
+		if(!strcmp(line+8, "fischerandom\n")) { frc |= 1; if(frc > 0) EPRINT((f, "# setoption name UCI_Chess960 value true\n")) }
 	}
 	else if(!strcmp(command, "undo") && (i=1) || !strcmp(command, "remove") && (i=2)) {
 	    if(pondering || computer == ANALYZE) StopPonder(1), searching = 0;
@@ -522,26 +534,25 @@ GUI2Engine()
 	    suspended = 0; // causes thinking to start in normal way if on move or analyzing
 	}
 	else if(!strcmp(command, "xboard")) ;
-	else if(!strcmp(command, "analyze"))computer = ANALYZE, collect = 1, sm = 0;
-	else if(!strcmp(command, "exit"))   computer = NONE, StopPonder(1), searching = 0;
+	else if(!strcmp(command, "analyze"))computer = ANALYZE, collect = 1, sm = 0, Analyze("true");
+	else if(!strcmp(command, "exit"))   computer = NONE, StopPonder(1), searching = 0, Analyze("false");
 	else if(!strcmp(command, "force"))  computer = NONE, StopPonder(pondering);
 	else if(!strcmp(command, "go"))     computer = stm;
 	else if(!strcmp(command, "time"))   sscanf(line+4, "%d", &myTime),  myTime  = (10*myTime)/unit;
 	else if(!strcmp(command, "otim"))   sscanf(line+4, "%d", &hisTime), hisTime = (10*hisTime)/unit;
 	else if(!strcmp(command, "post"))   post = 1;
 	else if(!strcmp(command, "nopost")) post = 0;
-	else if(!strcmp(command, "easy") && !!*canPonder) ponder = 0, StopPonder(pondering), fprintf(toE, "setoption %s%s %sfalse\n", nameWord, canPonder, valueWord);
-	else if(!strcmp(command, "hard") && !!*canPonder) ponder = 1, fprintf(toE, "setoption %s%s %strue\n", nameWord, canPonder, valueWord), StartPonder();
+	else if(!strcmp(command, "easy") && !!*canPonder) { ponder = 0; StopPonder(pondering); EPRINT((f, "# setoption %s%s %sfalse\n", nameWord, canPonder, valueWord)) }
+	else if(!strcmp(command, "hard") && !!*canPonder) { ponder = 1; EPRINT((f, "# setoption %s%s %strue\n", nameWord, canPonder, valueWord)) StartPonder(); }
 	else if(!strcmp(command, "ping"))   { /* static int done; if(!done) pause = 1, fprintf(toE, "isready\n"), fflush(toE), printf("# send isready\n"), fflush(stdout), Sync(PAUSE); done = 1;*/ printf("po%s", line+2); }
 	else if(!strcmp(command, "memory")) sscanf(line, "memory %d", &memory);
-	else if(!strcmp(command, "cores")&& !!*threadOpt) sscanf(line, "cores %d", &cores), fprintf(toE, "setoption %s%s %s%d\n", nameWord, threadOpt, valueWord, cores);
+	else if(!strcmp(command, "cores")&& !!*threadOpt) { sscanf(line, "cores %d", &cores); EPRINT((f, "# setoption %s%s %s%d\n", nameWord, threadOpt, valueWord, cores)) }
 	else if(!strcmp(command, "sd"))     sscanf(line, "sd %d", &depth);
 	else if(!strcmp(command, "st"))     sscanf(line, "st %d", &sTime), sTime = 1000*sTime - 30, inc = 0, sTime /= unit;
-	else if(!strcmp(command, "name"))   { if(namOpt) fprintf(toE, "setoption name UCI_Opponent value none none %s %s", comp ? "computer" : "human", line+5); }
+	else if(!strcmp(command, "name"))   { if(namOpt) EPRINT((f, "# setoption name UCI_Opponent value none none %s %s", comp ? "computer" : "human", line+5)) }
 	else if(!strcmp(command, "computer")) comp = 1;
-	else if(!strcmp(command, "offer"))  drawOffer = 1;
-	else if(!strcmp(command, "result")) { if(sc == 's') fprintf(toE, "gameover %s\n", line[8] == '/' ? "draw" : (line[7] == '0') == mySide ? "win" : "lose"); }
-	else if(!strcmp(command, "quit"))   fprintf(toE, "quit\n"), fflush(toE), exit(0);
+	else if(!strcmp(command, "result")) { if(sc == 's') EPRINT((f, "# gameover %s\n", line[8] == '/' ? "draw" : (line[7] == '0') == mySide ? "win" : "lose")) }
+	else if(!strcmp(command, "quit"))   { EPRINT((f, "# quit\n")) fflush(toE), exit(atoi(line+4)); }
     }
 }