-/************************* UCI2WB by H.G.Muller ****************************/\r
-\r
-#define VERSION "1.10"\r
+/****************************************************************************/\r
+/* UCI2WB by H.G.Muller */\r
+/* */\r
+/* UCI2WB is an adapter to run engines that communicate in various dialects */\r
+/* of the Universal Chess Interface in a GUI that supports XBoard protocol */\r
+/* (CECP). It supports UCI (when used for Xiangqi: the 'Cyclone dialect'), */\r
+/* as well as USI and UCCI when used with the flags -s or -x, respectively. */\r
+/* This version of UCI2WB is released under the GNU General Public License, */\r
+/* of which you should have received a copy together with this file. */\r
+/****************************************************************************/\r
+\r
+#define VERSION "2.3"\r
\r
#include <stdio.h>\r
#include <stdlib.h>\r
#include <string.h>\r
\r
// Set VARIANTS for in WinBoard variant feature. (With -s option this will always be reset to use "shogi".)\r
-# define VARIANTS "normal,xiangqi"\r
+#define VARIANTS "normal,xiangqi"\r
+#define STDVARS "chess,chess960,crazyhouse,threecheck,giveaway,atomic,seirawan,shogi,xiangqi"\r
\r
#define DPRINT if(debug) printf\r
+#define EPRINT(X) { char f[999]; sprintf X; DPRINT("%s", f); fprintf(toE, "%s", f + 2*(*f == '#')); /* strip optional # prefix */ }\r
\r
#define WHITE 0\r
#define BLACK 1\r
#define NONE 2\r
#define ANALYZE 3\r
\r
-char move[2000][10], checkOptions[8192], iniPos[256], hashOpt[20], pause, pondering, suspended, ponder, post, hasHash, c, sc='c', *suffix, *variants;\r
-int mps, tc, inc, sTime, depth, myTime, hisTime, stm, computer = NONE, memory, oldMem=0, cores, moveNr, lastDepth, lastScore, startTime, debug;\r
-int statDepth, statScore, statNodes, statTime, currNr, size, collect, nr, sm, inex, on[500];\r
-char currMove[20], moveMap[500][10], /* for analyze mode */ canPonder[20];\r
+char move[2000][10], checkOptions[8192], iniPos[256], hashOpt[20], pause, pondering, suspended, ponder, post, hasHash, c, sc='c', suffix[81], *variants, varOpt;\r
+int mps, tc, inc, sTime, depth, myTime, hisTime, stm, computer = NONE, memory, oldMem=0, cores, moveNr, lastDepth, lastScore, startTime, debug, flob;\r
+int statDepth, statScore, statNodes, statTime, currNr, size, collect, nr, sm, inex, on[500], frc, byo = -1, namOpt, comp;\r
+char currMove[20], moveMap[500][10], /* for analyze mode */ canPonder[20], threadOpt[20], varList[8000];\r
+char board[100]; // XQ board for UCCI\r
+char *nameWord = "name ", *valueWord = "value ", *wTime = "w", *bTime = "b", *wInc = "winc", *bInc = "binc", newGame; // keywords that differ in UCCI\r
+int unit = 1, drawOffer;\r
\r
FILE *toE, *fromE, *fromF;\r
int pid;\r
\r
#ifdef WIN32\r
+char *strcasestr (char *p, char *q) { char *r = p; while(*r) *r = tolower(*r), r++; return strstr(p, q); }\r
+\r
WinPipe(HANDLE *hRd, HANDLE *hWr)\r
{\r
SECURITY_ATTRIBUTES saAttr;\r
}\r
\r
void\r
+FromFEN(char *fen)\r
+{ int i=0;\r
+ while(*fen) {\r
+ char c = *fen++;\r
+ if(c >= 'A') board[i++] = c; else\r
+ if(c == '/') i++; else\r
+ if(c == ' ') break; else\r
+ while(c-- > '0' && i < 99) board[i++] = 0;\r
+ if(i >= 99) break;\r
+ }\r
+}\r
+\r
+char *\r
+ToFEN(int stm)\r
+{\r
+ int i, n=0; static char fen[200]; char *p = fen;\r
+ for(i=0; i<99; i++) {\r
+ char c = board[i];\r
+ if(c >= 'A') { if(n) *p++ = '0' + n; n = 0; *p++ = c; } else n ++;\r
+ if(i%10 == 8) { if(n) *p++ = '0' + n; n = -1; *p++ = '/'; }\r
+ }\r
+ sprintf(p-1, " %c - - 0 1", stm);\r
+ return fen;\r
+}\r
+\r
+int\r
+Sqr(char *m, int j)\r
+{\r
+ int n = m[j] - 'a' + 10*('9' - m[j+1]);\r
+ if(n < 0) n = 0; else if(n > 99) n = 99; return n;\r
+}\r
+\r
+int\r
+Play(int nr)\r
+{\r
+ int i, last = -1;\r
+ FromFEN(iniPos + 4); // in XQ iniPos always has just "fen " prefix\r
+ for(i=0; i<nr; i++) {\r
+ int from=Sqr(move[i], 0), to=Sqr(move[i], 2);\r
+ if(board[to] || (board[from]|32) == 'p' && move[i][1] != move[i][3]) last = i;\r
+ board[to] = board[from]; board[from] = 0;\r
+ }\r
+ return last;\r
+}\r
+\r
+void\r
StartSearch(char *ponder)\r
{ // send the 'go' command to engine. Suffix by ponder.\r
- int x = (ponder[0] != 0);\r
- int nr = moveNr + x; // we ponder for one move ahead!\r
- fprintf(toE, "\ngo btime %d wtime %d", stm == BLACK ^ x ^ sc=='s' ? myTime : hisTime, stm == WHITE ^ x ^ sc=='s' ? myTime : hisTime);\r
- DPRINT( "\n# go btime %d wtime %d", stm == BLACK ^ x ^ sc=='s' ? myTime : hisTime, stm == WHITE ^ x ^ sc=='s' ? myTime : hisTime);\r
- if(sTime > 0) { fprintf(toE, " movetime %d", sTime); DPRINT(" movetime %d", sTime); } else\r
- if(mps) { fprintf(toE, " movestogo %d", mps*(nr/(2*mps)+1)-nr/2); DPRINT(" movestogo %d", mps*(nr/(2*mps)+1)-nr/2); }\r
- if(inc && !suffix) { fprintf(toE, " winc %d binc %d", inc, inc); DPRINT(" winc %d binc %d", inc, inc); }\r
- if(depth > 0) { fprintf(toE, " depth %d", depth); DPRINT(" depth %d", depth); }\r
- if(suffix) { fprintf(toE, suffix, inc); DPRINT(suffix, inc); }\r
- fprintf(toE, "%s\n", ponder);\r
- DPRINT("%s\n", ponder);\r
+ int x = (ponder[0] != 0); // during ponder stm is the opponent\r
+ int black = (stm == BLACK ^ x ^ sc == 's'); // set if our color is what the engine calls black\r
+ int nr = moveNr + x; // we ponder for one move ahead!\r
+ int t = (flob ? inc + myTime/40 : 1000*byo*(byo>0)); // byoyomi time \r
+ if(sc == 'x') black = 1; else drawOffer = 0;// in UCCI 'black' refers to us and 'white' to opponent\r
+ if(!x && drawOffer) ponder = " draw", drawOffer = 0; //pass draw offer only when not pondering\r
+ EPRINT((f, "# go%s %stime %d %stime %d", ponder, bTime, (black ? myTime : hisTime) - t, wTime, (!black ? myTime : hisTime) - t))\r
+ if(sTime > 0) EPRINT((f, " movetime %d", sTime)) else\r
+ if(mps) EPRINT((f, " movestogo %d", mps*(nr/(2*mps)+1)-nr/2))\r
+ if(flob || byo >= 0) sprintf(suffix, " byoyomi %d", t); // for engines running purely on byoyomi\r
+ if(inc && !*suffix) EPRINT((f, " %s %d %s %d", wInc, inc, bInc, inc))\r
+ if(depth > 0) EPRINT((f, " depth %d", depth))\r
+ if(*suffix) EPRINT((f, suffix, inc))\r
+ EPRINT((f, "\n"))\r
}\r
\r
void\r
{\r
if(!pondering) return;\r
pause = 1;\r
- fprintf(toE, "stop\n"); fflush(toE); DPRINT("# stop\n"); // note: 'pondering' remains set until engine acknowledges 'stop' with 'bestmove'\r
+ EPRINT((f, "# stop\n")) fflush(toE); // note: 'pondering' remains set until engine acknowledges 'stop' with 'bestmove'\r
Sync(PAUSE); // wait for engine to acknowledge 'stop' with 'bestmove'.\r
}\r
\r
void\r
LoadPos(int moveNr)\r
{\r
- int j;\r
- fprintf(toE, "%s moves", iniPos);\r
- DPRINT( "# %s moves", iniPos);\r
- for(j=0; j<moveNr; j++) { fprintf(toE, " %s", move[j]); DPRINT(" %s", move[j]); }\r
+ int j, lastCapt = 0; char *pos = iniPos, buf[200], stm;\r
+ if(sc == 'x') { // UCCI: send only reversible moves\r
+ lastCapt = Play(moveNr); // find last capture (returns -1 if none!)\r
+ Play(++lastCapt); // reconstruct board after last capture\r
+ stm = (!strstr(iniPos+4, " b ") ^ lastCapt & 1 ? 'w' : 'b');\r
+ sprintf(buf, "position fen %s", ToFEN(stm)); pos = buf; // send it as FEN (with "position" in UCCI!)\r
+ }\r
+ EPRINT((f, "# %s moves", pos))\r
+ for(j=lastCapt; j<moveNr; j++) EPRINT((f, " %s", move[j]))\r
+ EPRINT((f, "\n"))\r
}\r
\r
void\r
DPRINT("# engine said: %s", line), fflush(stdout);\r
if(sscanf(line, "%s", command) != 1) continue;\r
if(!strcmp(command, "bestmove")) {\r
- if(pause) { pondering = pause = 0; Sync(WAKEUP); continue; } // bestmove was reply to ponder miss or analysis result; ignore.\r
+ if(pause == 1) { pondering = pause = 0; Sync(WAKEUP); continue; } // bestmove was reply to ponder miss or analysis result; ignore.\r
+ else if(pondering) { pondering = 0; printf("%d 0 0 0 UCI violation! Engine moves during ponder\n", lastDepth+1); continue; } // ignore ponder search\r
// move was a move to be played\r
+ if(p = strstr(line+8, " draw")) *p = 0, printf("offer draw\n"); // UCCI\r
if(strstr(line+9, "resign")) { printf("resign\n"); computer = NONE; }\r
+ if(strstr(line+9, "win")) { printf("%s {claim}\n", stm== WHITE ? "1-0" :"0-1"); computer = NONE; } // USI\r
if(strstr(line+9, "(none)") || strstr(line+9, "null") ||\r
strstr(line+9, "0000")) { printf("%s\n", lastScore < -99999 ? "resign" : "1/2-1/2 {stalemate}"); computer = NONE; }\r
sscanf(line, "bestmove %s", move[moveNr++]);\r
} else move[moveNr][0] = 0;\r
Move4GUI(line+9);\r
printf("move %s\n", line+9); // send move to GUI\r
+ if(move[moveNr][0]) printf("Hint: %s\n", move[moveNr]);\r
+ if(pause) { pause = 0; Sync(WAKEUP); } // release commands that came in during think\r
if(lastScore == 100001 && iniPos[0] != 'f') { printf("%s {mate}\n", stm == BLACK ? "1-0" : "0-1"); computer = NONE; }\r
}\r
else if(!strcmp(command, "info")) {\r
- int d=0, s=0, t=0, n=0;\r
- char *pv;\r
+ int d=0, s=0, t=(GetTickCount() - startTime)/10, n=1;\r
+ char *pv, varName[80];\r
if(sscanf(line+5, "string times @ %c", &dummy) == 1) { printf("# %s", line+12); continue; }\r
+ if(sscanf(line+5, "string variant %s", varName) == 1) {\r
+ if(!strstr(STDVARS, varName) && (p = strstr(line+18, " startpos "))) printf("setup (-) 8x8+0_fairy %s", p+10);\r
+ continue;\r
+ }\r
if(collect && (pv = strstr(line+5, "currmove "))) {\r
if(p = strstr(line+5, "currmovenumber ")) {\r
n = atoi(p+15);\r
if(p = strstr(line+6, " min ")) sscanf(p+1, "min %d", &min), *p = '\n';\r
if(p = strstr(line+6, " max ")) sscanf(p+1, "max %d", &max), *p = '\n';\r
if(p = strstr(line+6, " default ")) sscanf(p+1, "default %[^\n]*", val), *p = '\n';\r
- if(p = strstr(line+6, " name ")) sscanf(p+1, "name %[^\n]*", name);\r
- if(!strcmp(name, "Ponder") || !strcmp(name, "USI_Ponder")) { strcpy(canPonder, name); continue; }\r
- if(!strcmp(name, "Hash") || !strcmp(name, "USI_Hash")) {\r
+ if(!(p = strstr(line+6, " name "))) p = line+1; sscanf(p+6, "%[^\n]", name); // 'name' is omitted in UCCI\r
+ if(!strcasecmp(name, "UCI_Chess960")) { frc=2; continue; }\r
+ if(!strcasecmp(name, "UCI_Variant")) { if(p = strstr(line+6, " var ")) strcpy(varList, p); varOpt = 1; continue; }\r
+ if(!strcasecmp(name, "UCI_Opponent")) { namOpt = 1; continue; }\r
+ if(frc< 0 && (strstr(name, "960") || strcasestr(name, "frc")) && !strcmp(type, "check")) {\r
+ fprintf(toE, "setoption name %s value true\n", name); strcpy(val, "true"); // set non-standard suspected FRC options\r
+ }\r
+ if(!strcasecmp(name, "Threads")) { strcpy(threadOpt, name); continue; }\r
+ if(!strcasecmp(name, "Ponder") || !strcasecmp(name, "USI_Ponder")) { strcpy(canPonder, name); continue; }\r
+ if(!strcasecmp(name, "Hash") || !strcasecmp(name, "USI_Hash") || !strcasecmp(name, "hashsize")) {\r
memory = oldMem = atoi(val); hasHash = 1; \r
strcpy(hashOpt, name);\r
continue;\r
}\r
+ if(!strcasecmp(name, "newgame") && !strcmp(type, "button")) { newGame++; continue; }\r
+ if(!strcasecmp(name, "usemillisec")) { unit = (!strcmp(val, "false") ? 2 : 1); continue; }\r
// pass on engine-defined option as WB option feature\r
if(!strcmp(type, "filename")) type[4] = 0;\r
sprintf(buf, "feature option=\"%s -%s", name, type); q = buf + strlen(buf);\r
if(buf[0]) printf("%s", buf);\r
}\r
else if(!strcmp(command, "id")) {\r
- char name[256];\r
+ static char name[256], version[256];\r
if(sscanf(line, "id name %[^\n]", name) == 1) printf("feature myname=\"%s (U%cI2WB)\"\n", name, sc-32);\r
+ if(sscanf(line, "id version %[^\n]", version) == 1 && *name) printf("feature myname=\"%s %s (U%cI2WB)\"\n", name, version, sc-32);\r
}\r
else if(!strcmp(command, "readyok")) { pause = 0; Sync(WAKEUP); } // resume processing of GUI commands\r
- else if(sscanf(command, "u%ciok", &c)==1 && c==sc) printf("feature smp=1 memory=%d done=1\n", hasHash), Sync(WAKEUP); // done with options\r
+ else if(sc == 'x'&& !strcmp(command, "ucciok") || sscanf(command, "u%ciok", &c)==1 && c==sc) {\r
+ char *p = varList, *q = varList;\r
+ while(*q && *q != '\n') if(!strncmp(q, " var ", 5)) *p++ = ',', q +=5; // replace var keywords by commas\r
+ else if(!strncmp(q-1, " chess ", 7)) strcpy(p, "normal"), p += 6, q += 5; // 'chess' is called 'normal' in CECP\r
+ else if(!strncmp(q-1, " threecheck", 11)) *p++ = '3', q += 5; // 'threecheck' is written '3check' in CECP\r
+ else *p++ = *q++; // copy other variant names unmodified\r
+ if(frc) sprintf(p, ",normal,fischerandom"), printf("feature oocastle=%d\n", frc<0); // unannounced FRC uses O-O castling\r
+ if(*varList) printf("feature variants=\"%s\"\n", varList+1); // from UCI_Variant combo and/or UCI_Chess960 check options\r
+ printf("feature smp=1 memory=%d done=1\n", hasHash);\r
+ if(unit == 2) unit = 1, fprintf(toE, "setoption usemillisec true\n");\r
+ Sync(WAKEUP); // done with options\r
+ }\r
}\r
}\r
\r
void\r
GUI2Engine()\r
{\r
- char line[256], command[256], *p, *q, *r;\r
+ char line[256], command[256], *p, *q, *r, mySide, searching = 0;\r
\r
while(1) {\r
int i, x;\r
\r
- if((computer == stm || computer == ANALYZE) && !suspended) {\r
+ if((computer == stm || computer == ANALYZE && !searching) && !suspended) {\r
DPRINT("# start search\n");\r
- LoadPos(moveNr); // load position\r
+ LoadPos(moveNr); fflush(stdout); // load position\r
// and set engine thinking (note USI swaps colors!)\r
- startTime = GetTickCount();\r
+ startTime = GetTickCount(); mySide = stm; // remember side we last played for\r
if(computer == ANALYZE) {\r
- fprintf(toE, "\ngo infinite"); DPRINT("\n# go infinite");\r
+ EPRINT((f, "# go infinite"))\r
if(sm & 1) { // some moves are disabled\r
- fprintf(toE, " searchmoves"); DPRINT(" searchmoves");\r
- for(i=1; i<nr; i++) if(on[i]) { fprintf(toE, " %s", moveMap[i]); DPRINT(" %s", moveMap[i]); }\r
+ EPRINT((f, " searchmoves"))\r
+ for(i=1; i<nr; i++) if(on[i]) EPRINT((f, " %s", moveMap[i]))\r
}\r
- fprintf(toE, "\n"); DPRINT("\n");\r
- // code for searchmoves goes here\r
- } else StartSearch("");\r
+ EPRINT((f, "\n")) searching = 1; // suppresses spurious commands during analysis starting new searches\r
+ } else { pause = 2; StartSearch(""); fflush(stdout); fflush(toE); Sync(PAUSE); } // block input during thinking\r
}\r
nomove:\r
fflush(toE); fflush(stdout);\r
i = 0; while((x = getchar()) != EOF && (line[i] = x) != '\n') i++;\r
- line[++i] = 0; if(x == EOF) { printf("# EOF\n"); exit(-1); }\r
+ line[++i] = 0; if(x == EOF) { printf("# EOF\n"); fprintf(toE, "quit\n"); exit(-1); }\r
sscanf(line, "%s", command);\r
if(!strcmp(command, "new")) {\r
computer = BLACK; moveNr = 0; depth = -1; move[0][0] = 0;\r
- stm = WHITE; strcpy(iniPos, "position startpos");\r
- if(memory != oldMem && hasHash) fprintf(toE, "setoption name %s value %d\n", hashOpt, memory);\r
+ stm = WHITE; strcpy(iniPos, "position startpos"); frc &= ~1;\r
+ if(memory != oldMem && hasHash) fprintf(toE, "setoption %s%s %s%d\n", nameWord, hashOpt, valueWord, memory);\r
oldMem = memory;\r
// we can set other options here\r
+ if(sc == 'x') { if(newGame) fprintf(toE, "setoption newgame\n"); } else // optional in UCCI\r
+ if(varOpt) fprintf(toE, "setoption name UCI_Variant value chess\n");\r
pause = 1; // wait for option settings to take effect\r
- fprintf(toE, "isready\n");\r
- fprintf(toE, "u%cinewgame\n", sc); fflush(toE);\r
+ fprintf(toE, "isready\n"); fflush(toE);\r
Sync(PAUSE); // wait for readyok\r
+ fprintf(toE, "u%cinewgame\n", sc); fflush(toE);\r
}\r
else if(!strcmp(command, "usermove")) {\r
sscanf(line, "usermove %s", command); // strips off linefeed\r
// when pondering we either continue the ponder search as normal search, or abort it\r
if(pondering || computer == ANALYZE) {\r
if(pondering && !strcmp(command, move[moveNr])) { // ponder hit\r
- pondering = 0; moveNr++; startTime = GetTickCount(); // clock starts running now\r
- fprintf(toE, "ponderhit\n"); DPRINT("# ponderhit\n");\r
+ char *draw = drawOffer ? " draw" : ""; drawOffer = 0;\r
+ pondering = 0; pause = 2; moveNr++; startTime = GetTickCount(); // clock starts running now\r
+ EPRINT((f, "# ponderhit%s\n", draw)) fflush(toE); fflush(stdout);\r
+ Sync(PAUSE); // block input during thinking\r
goto nomove;\r
}\r
- StopPonder(1);\r
+ StopPonder(1); searching = 0;\r
}\r
strcpy(move[moveNr++], command); // possibly overwrites ponder move\r
}\r
int sec = 0;\r
sscanf(line, "level %d %d:%d %d", &mps, &tc, &sec, &inc) == 4 ||\r
sscanf(line, "level %d %d %d", &mps, &tc, &inc);\r
- tc = (60*tc + sec)*1000; inc *= 1000; sTime = 0;\r
+ tc = (60*tc + sec)*1000; inc *= 1000; sTime = 0; tc /= unit; inc /= unit;\r
}\r
else if(!strcmp(command, "option")) {\r
char name[80], *p;\r
+ if(searching) StopPonder(1), searching = 0; // force new search if settings change during analysis (multi-PV!)\r
if(sscanf(line+7, "UCI2WB debug output=%d", &debug) == 1) ; else\r
+ if(sscanf(line+7, "Floating Byoyomi=%d", &flob) == 1) ; else\r
+ if(sscanf(line+7, "Byoyomi=%d", &byo) == 1) ; else\r
if(p = strchr(line, '=')) {\r
*p++ = 0;\r
if(strstr(checkOptions, line+7)) sprintf(p, "%s\n", atoi(p) ? "true" : "false");\r
- fprintf(toE, "setoption name %s value %s", line+7, p); DPRINT("# setoption name %s value %s", line+7, p);\r
- } else { fprintf(toE, "setoption name %s\n", line+7); DPRINT("# setoption name %s\n", line+7); }\r
+ EPRINT((f, "# setoption %s%s %s%s", nameWord, line+7, valueWord, p))\r
+ } else EPRINT((f, "# setoption %s%s\n", nameWord, line+7))\r
}\r
else if(!strcmp(command, "protover")) {\r
if(!variants) variants = sc=='s' ? "shogi,5x5+5_shogi" : VARIANTS;\r
- printf("feature variants=\"%s\" setboard=1 usermove=1 debug=1 ping=1 reuse=0 exclude=1 pause=1 done=0\n", variants);\r
+ 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);\r
printf("feature option=\"UCI2WB debug output -check %d\"\n", debug);\r
- fprintf(toE, "u%ci\n", sc); fflush(toE); // this prompts UCI engine for options\r
+ if(sc == 's') printf("feature option=\"Floating Byoyomi -check %d\"\nfeature option=\"Byoyomi -spin %d -1 1000\"\n", flob, byo);\r
+ fprintf(toE, sc == 'x' ? "ucci\n" : "u%ci\n", sc); fflush(toE); // prompt UCI engine for options\r
Sync(PAUSE); // wait for uciok\r
}\r
else if(!strcmp(command, "setboard")) {\r
- if(strstr(line+9, " b ")) stm = BLACK;\r
- if(p = strchr(line+9, '[')) { char c;\r
+ stm = (strstr(line+9, " b ") ? BLACK : WHITE);\r
+ if((p = strchr(line+9, '[')) && !varOpt) { char c;\r
*p++ = 0; q = strchr(p, ']'); *q = 0; r = q + 4; \r
if(sc == 's') q[2] = 'w' + 'b' - q[2], strcpy(r=q+3, " 1\n"); // Shogi: reverse color\r
else r = strchr(strchr(q+4, ' ') + 1, ' '); // skip to second space (after e.p. square)\r
*r = 0; sprintf(command, "%s%s %s %s", line+9, q+1, p, r+1);\r
} else strcpy(command, line+9);\r
+ if(frc == -1 && (p = strchr(command, ' '))) strncpy(p+3, "KQkq", 4); // unannounced FRC\r
sprintf(iniPos, "%s%sfen %s", iniPos[0]=='p' ? "position " : "", sc=='s' ? "s" : "", command);\r
iniPos[strlen(iniPos)-1] = sm = 0; collect = (computer == ANALYZE);\r
}\r
else if(!strcmp(command, "variant")) {\r
+ if(varOpt) {\r
+ fprintf(toE, "setoption name UCI_Variant value %sucinewgame\nisready\n", strcmp(line+8, "3check\n") ? line+8 : "threecheck\n");\r
+ fflush(toE); Sync(PAUSE);\r
+ }\r
if(!strcmp(line+8, "shogi\n")) size = 9, strcpy(iniPos, "position startpos");\r
if(!strcmp(line+8, "5x5+5_shogi\n")) size = 5, strcpy(iniPos, "position startpos");\r
if(!strcmp(line+8, "xiangqi\n")) strcpy(iniPos, "fen rnbakabnr/9/1c5c1/p1p1p1p1p/9/9/P1P1P1P1P/1C5C1/9/RNBAKABNR r");\r
+ if(!strcmp(line+8, "fischerandom\n")) { frc |= 1; if(frc > 0) fprintf(toE, "setoption name UCI_Chess960 value true\n"); }\r
}\r
else if(!strcmp(command, "undo") && (i=1) || !strcmp(command, "remove") && (i=2)) {\r
- if(pondering || computer == ANALYZE) StopPonder(1);\r
+ if(pondering || computer == ANALYZE) StopPonder(1), searching = 0;\r
moveNr = moveNr > i ? moveNr - i : 0; collect = (computer == ANALYZE); sm = 0;\r
}\r
else if(!strcmp(command, ".")) {\r
inex = 1; line[strlen(line)-1] = sm = 0; // strip LF and clear sm flag\r
for(i=1; i<nr; i++) { if(!strcmp(line+8, moveMap[i]) || all) on[i] = in; sm |= on[i]+1; } // sm: 2 = enabled, 1 = disabled\r
if(!(sm & 2)) goto nomove; // no moves enabled; continue current search\r
- if(computer == ANALYZE) StopPonder(1); // abort old analysis\r
+ if(computer == ANALYZE) StopPonder(1), searching = 0; // abort old analysis\r
}\r
else if(!strcmp(command, "pause")) {\r
if(computer == stm) myTime -= GetTickCount() - startTime;\r
}\r
else if(!strcmp(command, "xboard")) ;\r
else if(!strcmp(command, "analyze"))computer = ANALYZE, collect = 1, sm = 0;\r
- else if(!strcmp(command, "exit")) computer = NONE, StopPonder(1);\r
+ else if(!strcmp(command, "exit")) computer = NONE, StopPonder(1), searching = 0;\r
else if(!strcmp(command, "force")) computer = NONE, StopPonder(pondering);\r
else if(!strcmp(command, "go")) computer = stm;\r
- else if(!strcmp(command, "time")) sscanf(line+4, "%d", &myTime), myTime *= 10;\r
- else if(!strcmp(command, "otim")) sscanf(line+4, "%d", &hisTime), hisTime *= 10;\r
+ else if(!strcmp(command, "time")) sscanf(line+4, "%d", &myTime), myTime = (10*myTime)/unit;\r
+ else if(!strcmp(command, "otim")) sscanf(line+4, "%d", &hisTime), hisTime = (10*hisTime)/unit;\r
else if(!strcmp(command, "post")) post = 1;\r
else if(!strcmp(command, "nopost")) post = 0;\r
- else if(!strcmp(command, "easy") && !!*canPonder) ponder = 0, StopPonder(pondering), fprintf(toE, "setoption name %s value false\n", canPonder);\r
- else if(!strcmp(command, "hard") && !!*canPonder) ponder = 1, fprintf(toE, "setoption name %s value true\n", canPonder), StartPonder();\r
- else if(!strcmp(command, "ping")) pause = 1, fprintf(toE, "isready\n"), fflush(toE), Sync(PAUSE), printf("pong %s", line+5);\r
+ else if(!strcmp(command, "easy") && !!*canPonder) ponder = 0, StopPonder(pondering), fprintf(toE, "setoption %s%s %sfalse\n", nameWord, canPonder, valueWord);\r
+ else if(!strcmp(command, "hard") && !!*canPonder) ponder = 1, fprintf(toE, "setoption %s%s %strue\n", nameWord, canPonder, valueWord), StartPonder();\r
+ 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); }\r
else if(!strcmp(command, "memory")) sscanf(line, "memory %d", &memory);\r
- else if(!strcmp(command, "cores")) sscanf(line, "cores %d", &cores);\r
+ else if(!strcmp(command, "cores")&& !!*threadOpt) sscanf(line, "cores %d", &cores), fprintf(toE, "setoption %s%s %s%d\n", nameWord, threadOpt, valueWord, cores);\r
else if(!strcmp(command, "sd")) sscanf(line, "sd %d", &depth);\r
- else if(!strcmp(command, "st")) sscanf(line, "st %d", &sTime), sTime = 1000*sTime - 30, inc = 0;\r
+ else if(!strcmp(command, "st")) sscanf(line, "st %d", &sTime), sTime = 1000*sTime - 30, inc = 0, sTime /= unit;\r
+ else if(!strcmp(command, "name")) { if(namOpt) fprintf(toE, "setoption name UCI_Opponent value none none %s %s", comp ? "computer" : "human", line+5); }\r
+ else if(!strcmp(command, "computer")) comp = 1;\r
+ else if(!strcmp(command, "offer")) drawOffer = 1;\r
+ else if(!strcmp(command, "result")) { if(sc == 's') fprintf(toE, "gameover %s\n", line[8] == '/' ? "draw" : (line[7] == '0') == mySide ? "win" : "lose"); }\r
else if(!strcmp(command, "quit")) fprintf(toE, "quit\n"), fflush(toE), exit(0);\r
}\r
}\r
if(argc > 1 && argv[1][0] == '-') { sc = argv[1][1]; argc--; argv++; }\r
if(argc < 2) { printf("usage is: U%cI2WB [debug] [-s] <engine.exe> [<engine directory>]\n", sc-32); exit(-1); }\r
if(argc > 2) dir = argv[2];\r
- if(argc > 3) suffix = argv[3];\r
+ if(argc > 3) strncpy(suffix, argv[3], 80);\r
+\r
+ if(sc == 'x') nameWord = valueWord = bTime = "", wTime = "opp", bInc = "increment", wInc = "oppincrement", unit = 1000; // switch to UCCI keywords\r
+ else if(sc == 'f' ) frc = -1, sc = 'c'; // UCI for unannounced Chess960\r
+ else if(sc == 'n') sc = 'c'; // UCI for normal Chess\r
\r
// spawn engine proc\r
if(StartEngine(argv[1], dir) != NO_ERROR) { perror(argv[1]), exit(-1); }\r
#ifdef WIN32\r
CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) Engine2GUI, (LPVOID) NULL, 0, &thread_id);\r
#else\r
- { pthread_t t; signal(SIGINT, SIG_IGN); pthread_create(&t, NULL, Engine2GUI, NULL); }\r
+ { pthread_t t; signal(SIGINT, SIG_IGN); signal(SIGTERM, SIG_IGN); pthread_create(&t, NULL, Engine2GUI, NULL); }\r
#endif\r
\r
// handle GUI->engine traffic in original thread\r