X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=UCI2WB.c;h=9f1ad06c419ed64bdb109368c51d1d7b362fd1df;hb=768046d29eff91d4afbcea23dcb2a623a6a747c9;hp=eeb93c3bbd2ca4370fc18d1589f91040de804f97;hpb=7fb95d5105ce2608c5a378a99e5f6076fc0e6f12;p=uci2wb.git

diff --git a/UCI2WB.c b/UCI2WB.c
index eeb93c3..9f1ad06 100644
--- a/UCI2WB.c
+++ b/UCI2WB.c
@@ -1,6 +1,15 @@
-/************************* UCI2WB by H.G.Muller ****************************/
-
-#define VERSION "1.10"
+/****************************************************************************/
+/*                           UCI2WB by H.G.Muller                           */
+/*                                                                          */
+/* UCI2WB is an adapter to run engines that communicate in various dialects */
+/* of the Universal Chess Interface in a GUI that supports XBoard protocol  */
+/* (CECP). It supports UCI (when used for Xiangqi: the 'Cyclone dialect'),  */
+/* as well as USI and UCCI when used with the flags -s or -x, respectively. */
+/* This version of UCI2WB is released under the GNU General Public License, */
+/* of which you should have received a copy together with this file.        */
+/****************************************************************************/
+
+#define VERSION "2.0"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -120,7 +129,7 @@ Play(int nr)
 	FromFEN(iniPos + 4); // in XQ iniPos always has just "fen " prefix
 	for(i=0; i<nr; i++) {
 	    int from=Sqr(move[i], 0), to=Sqr(move[i], 2);
-	    if(board[to]) last = i;
+	    if(board[to] || (board[from]|32)  == 'p' && move[i][1] != move[i][3]) last = i;
 	    board[to] = board[from]; board[from] = 0;
 	}
 	return last;
@@ -129,14 +138,13 @@ Play(int nr)
 void
 StartSearch(char *ponder)
 {	// send the 'go' command to engine. Suffix by ponder.
-	char *draw = "draw ";
 	int x = (ponder[0] != 0);                   // during ponder stm is the opponent
 	int black = (stm == BLACK ^ x ^ sc == 's'); // set if our color is what the engine calls black
 	int nr = moveNr + x;                        // we ponder for one move ahead!
-	if(sc == 'x') black = 1; else draw = "";    // in UCCI 'black' refers to us and 'white' to opponent
-	drawOffer = 0;
-	fprintf(toE, "\ngo%s %s%stime %d %stime %d", ponder, draw, bTime, black ? myTime : hisTime, wTime, !black ? myTime : hisTime);
-	DPRINT(    "\n# go%s %s%stime %d %stime %d", ponder, draw, bTime, black ? myTime : hisTime, wTime, !black ? myTime : hisTime);
+	if(sc == 'x') black = 1; else drawOffer = 0;// in UCCI 'black' refers to us and 'white' to opponent
+	if(!x && drawOffer) ponder = " draw", drawOffer = 0; //pass draw offer only when not pondering
+	fprintf(toE, "\ngo%s %stime %d %stime %d", ponder, bTime, black ? myTime : hisTime, wTime, !black ? myTime : hisTime);
+	DPRINT(    "\n# go%s %stime %d %stime %d", ponder, bTime, black ? myTime : hisTime, wTime, !black ? myTime : hisTime);
 	if(sTime > 0) { fprintf(toE, " movetime %d", sTime); DPRINT(" movetime %d", sTime); } else
 	if(mps) { fprintf(toE, " movestogo %d", mps*(nr/(2*mps)+1)-nr/2); DPRINT(" movestogo %d", mps*(nr/(2*mps)+1)-nr/2); }
 	if(inc && !suffix) { fprintf(toE, " %s %d %s %d", wInc, inc, bInc, inc); DPRINT(" %s %d %s %d", wInc, inc, bInc, inc); }
@@ -237,16 +245,16 @@ Engine2GUI()
 	DPRINT("# engine said: %s", line), fflush(stdout);
 	if(sscanf(line, "%s", command) != 1) continue;
 	if(!strcmp(command, "bestmove")) {
-	    if(pause) { pondering = pause = 0; Sync(WAKEUP); continue; } // bestmove was reply to ponder miss or analysis result; ignore.
+	    if(pause == 1) { pondering = pause = 0; Sync(WAKEUP); continue; } // bestmove was reply to ponder miss or analysis result; ignore.
+	    else if(pondering) { pondering = 0; printf("%d 0 0 0 UCI violation! Engine moves during ponder\n", lastDepth+1); continue; } // ignore ponder search
 	    // move was a move to be played
-	    if((p = strstr(line+8, " draw")) && p != line+8)   { *p = '\n'; printf("offer draw\n"); computer = NONE; } // UCCI
+	    if(p = strstr(line+8, " draw")) *p = 0, printf("offer draw\n"); // UCCI
 	    if(strstr(line+9, "resign")) { printf("resign\n"); computer = NONE; }
 	    if(strstr(line+9, "(none)") || strstr(line+9, "null") ||
 	       strstr(line+9, "0000")) { printf("%s\n", lastScore < -99999 ? "resign" : "1/2-1/2 {stalemate}"); computer = NONE; }
 	    sscanf(line, "bestmove %s", move[moveNr++]);
 	    myTime -= (GetTickCount() - startTime)*1.02 + inc; // update own clock, so we can give correct wtime, btime with ponder
 	    if(mps && ((moveNr+1)/2) % mps == 0) myTime += tc; if(sTime) myTime = sTime; // new session or move starts
-
 	    stm = WHITE+BLACK - stm;
 	    // first start a new ponder search, if pondering is on and we have a move to ponder on
 	    if(p = strstr(line+9, "ponder")) {
@@ -259,6 +267,7 @@ Engine2GUI()
 	    } else move[moveNr][0] = 0;
 	    Move4GUI(line+9);
 	    printf("move %s\n", line+9); // send move to GUI
+	    if(pause) { pause = 0; Sync(WAKEUP); } // release commands that came in during think
 	    if(lastScore == 100001 && iniPos[0] != 'f') { printf("%s {mate}\n", stm == BLACK ? "1-0" : "0-1"); computer = NONE; }
 	}
 	else if(!strcmp(command, "info")) {
@@ -298,15 +307,15 @@ Engine2GUI()
 	    if(p = strstr(line+6, " max "))  sscanf(p+1, "max %d", &max), *p = '\n';
 	    if(p = strstr(line+6, " default "))  sscanf(p+1, "default %[^\n]*", val), *p = '\n';
 	    if(!(p = strstr(line+6, " name "))) p = line+1; sscanf(p+6, "%[^\n]", name); // 'name' is omitted in UCCI
-	    if(!strcmp(name, "Threads")) { strcpy(threadOpt, name); continue; }
-	    if(!strcmp(name, "Ponder") || !strcmp(name, "USI_Ponder")) { strcpy(canPonder, name); continue; }
-	    if(!strcmp(name, "Hash") || !strcmp(name, "USI_Hash") || !strcmp(name, "hashsize")) {
+	    if(!strcasecmp(name, "Threads")) { strcpy(threadOpt, name); continue; }
+	    if(!strcasecmp(name, "Ponder") || !strcasecmp(name, "USI_Ponder")) { strcpy(canPonder, name); continue; }
+	    if(!strcasecmp(name, "Hash") || !strcasecmp(name, "USI_Hash") || !strcasecmp(name, "hashsize")) {
 		memory = oldMem = atoi(val); hasHash = 1; 
 		strcpy(hashOpt, name);
 		continue;
 	    }
-	    if(!strcmp(name, "newgame") && !strcmp(type, "button")) { newGame++; continue; }
-	    if(!strcmp(name, "usemillisec")) { unit = (!strcmp(val, "false") ? 2 : 1); continue; }
+	    if(!strcasecmp(name, "newgame") && !strcmp(type, "button")) { newGame++; continue; }
+	    if(!strcasecmp(name, "usemillisec")) { unit = (!strcmp(val, "false") ? 2 : 1); continue; }
 	    // pass on engine-defined option as WB option feature
 	    if(!strcmp(type, "filename")) type[4] = 0;
 	    sprintf(buf, "feature option=\"%s -%s", name, type); q = buf + strlen(buf);
@@ -368,7 +377,7 @@ GUI2Engine()
 
 	if((computer == stm || computer == ANALYZE) && !suspended) {
 	    DPRINT("# start search\n");
-	    LoadPos(moveNr); // load position
+	    LoadPos(moveNr); fflush(stdout); // load position
 	    // and set engine thinking (note USI swaps colors!)
 	    startTime = GetTickCount();
 	    if(computer == ANALYZE) {
@@ -379,12 +388,12 @@ GUI2Engine()
 		}
 		fprintf(toE, "\n"); DPRINT("\n");
 	    // code for searchmoves goes here
-	    } else StartSearch("");
+	    } else { pause = 2; StartSearch(""); fflush(stdout); fflush(toE); Sync(PAUSE); } // block input during 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"); exit(-1); }
+	line[++i] = 0; if(x == EOF) { printf("# EOF\n"); fprintf(toE, "quit\n"); exit(-1); }
 	sscanf(line, "%s", command);
 	if(!strcmp(command, "new")) {
 	    computer = BLACK; moveNr = 0; depth = -1; move[0][0] = 0;
@@ -393,10 +402,10 @@ GUI2Engine()
 	    oldMem = memory;
 	    // we can set other options here
 	    if(sc == 'x') { if(newGame) fprintf(toE, "setoption newgame\n"); } else // optional in UCCI
-	    fprintf(toE, "u%cinewgame\n", sc); fflush(toE);
 	    pause = 1; // wait for option settings to take effect
-	    fprintf(toE, "isready\n");
+	    fprintf(toE, "isready\n"); fflush(toE);
 	    Sync(PAUSE); // wait for readyok
+	    fprintf(toE, "u%cinewgame\n", sc); fflush(toE);
 	}
 	else if(!strcmp(command, "usermove")) {
 	    sscanf(line, "usermove %s", command); // strips off linefeed
@@ -405,8 +414,10 @@ GUI2Engine()
 	    // when pondering we either continue the ponder search as normal search, or abort it
 	    if(pondering || computer == ANALYZE) {
 		if(pondering && !strcmp(command, move[moveNr])) { // ponder hit
+		    char *draw = drawOffer ? " draw" : ""; drawOffer = 0;
 		    pondering = 0; moveNr++; startTime = GetTickCount(); // clock starts running now
-		    fprintf(toE, "ponderhit\n"); DPRINT("# ponderhit\n");
+		    fprintf(toE, "ponderhit%s\n", draw); DPRINT("# ponderhit%s\n", draw);
+		    fflush(toE); fflush(stdout); pause = 2; Sync(PAUSE); // block input during thinking
 		    goto nomove;
 		}
 		StopPonder(1);
@@ -430,7 +441,7 @@ GUI2Engine()
 	}
 	else if(!strcmp(command, "protover")) {
 	    if(!variants) variants = sc=='s' ? "shogi,5x5+5_shogi" : VARIANTS;
-	    printf("feature variants=\"%s\" setboard=1 usermove=1 debug=1 ping=1 reuse=0 exclude=1 pause=1 done=0\n", variants);
+	    printf("feature variants=\"%s\" setboard=1 usermove=1 debug=1 ping=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);
 	    fprintf(toE, sc == 'x' ? "ucci\n" : "u%ci\n", sc); fflush(toE); // prompt UCI engine for options
 	    Sync(PAUSE); // wait for uciok
@@ -486,7 +497,7 @@ GUI2Engine()
 	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, "ping"))   pause = 1, fprintf(toE, "isready\n"), fflush(toE), Sync(PAUSE), printf("pong %s", line+5);
+	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, "sd"))     sscanf(line, "sd %d", &depth);
@@ -604,7 +615,7 @@ main(int argc, char **argv)
 #ifdef WIN32
 	CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) Engine2GUI, (LPVOID) NULL, 0, &thread_id);
 #else
-        { pthread_t t; signal(SIGINT, SIG_IGN); pthread_create(&t, NULL, Engine2GUI, NULL); }
+        { pthread_t t; signal(SIGINT, SIG_IGN); signal(SIGTERM, SIG_IGN); pthread_create(&t, NULL, Engine2GUI, NULL); }
 #endif
 
 	// handle GUI->engine traffic in original thread