X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=UCI2WB.c;h=97040710e56b8daa826f94d7b2e14aee25211b3c;hb=b21ae66c2f54efdb05fc45c77759d1dc62a96ee4;hp=ed3b884745ae795e0755ac0cc2c2f3323ea6ffc9;hpb=7baf116260ab2945f3dd74ee7bc93bd77cad5bc7;p=uci2wb.git

diff --git a/UCI2WB.c b/UCI2WB.c
index ed3b884..9704071 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;
@@ -148,7 +157,7 @@ void
 StopPonder(int pondering)
 {
 	if(!pondering) return;
-	pause = 1;
+	pause = 2;
 	fprintf(toE, "stop\n"); fflush(toE); DPRINT("# stop\n"); // note: 'pondering' remains set until engine acknowledges 'stop' with 'bestmove'
 	Sync(PAUSE); // wait for engine to acknowledge 'stop' with 'bestmove'.
 }
@@ -237,6 +246,7 @@ Engine2GUI()
 	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.
+	    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 = 0, printf("offer draw\n"); // UCCI
 	    if(strstr(line+9, "resign")) { printf("resign\n"); computer = NONE; }
@@ -382,7 +392,7 @@ GUI2Engine()
       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;
@@ -429,7 +439,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
@@ -603,7 +613,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