X-Git-Url: http://winboard.nl/cgi-bin?p=uci2wb.git;a=blobdiff_plain;f=UCI2WB.c;h=37f9de63b5418cea2f073e62621e2a9a37df405a;hp=ff5ec8cdfb142053da5a38a346c25fb35b47d3d9;hb=be5b48e447abc318aa999ad07198ba2da3fff41f;hpb=7bd5b32b970229a4a9cc23ca2e8849e30c6d9823

diff --git a/UCI2WB.c b/UCI2WB.c
index ff5ec8c..37f9de6 100644
--- a/UCI2WB.c
+++ b/UCI2WB.c
@@ -9,7 +9,7 @@
 /* of which you should have received a copy together with this file.        */
 /****************************************************************************/
 
-#define VERSION "2.1"
+#define VERSION "2.2"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -39,10 +39,10 @@
 #define NONE  2
 #define ANALYZE 3
 
-char move[2000][10], checkOptions[8192], iniPos[256], hashOpt[20], pause, pondering, suspended, ponder, post, hasHash, c, sc='c', suffix[81], *variants;
+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;
-char currMove[20], moveMap[500][10], /* for analyze mode */ canPonder[20], threadOpt[20];
+char currMove[20], moveMap[500][10], /* for analyze mode */ canPonder[20], threadOpt[20], varList[8000];
 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;
@@ -312,6 +312,7 @@ Engine2GUI()
 	    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(!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(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
 	    }
@@ -351,7 +352,13 @@ Engine2GUI()
 	}
 	else if(!strcmp(command, "readyok")) { pause = 0; Sync(WAKEUP); } // resume processing of GUI commands
 	else if(sc == 'x'&& !strcmp(command, "ucciok") || sscanf(command, "u%ciok", &c)==1 && c==sc) {
-	    if(frc) printf("feature variants=\"normal,fischerandom\" oocastle=%d\n", frc<0); // unannounced FRC uses O-O castling
+	    char *p = varList, *q = varList;
+	    while(*q && *q != '\n')  if(!strncmp(q, " var ", 5)) *p++ = ',', q +=5; // replace var keywords by commas
+				else if(!strncmp(q-1, " chess ", 7)) strcpy(p, "normal"), p += 6, q += 5; // 'chess' is called 'normal' in CECP
+				else if(!strncmp(q-1, " threecheck", 11)) *p++ = '3', q += 5; // 'threecheck' is written '3check' in CECP
+				else *p++ = *q++; // copy other variant names unmodified
+	    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");
 	    Sync(WAKEUP); // done with options
@@ -412,6 +419,7 @@ GUI2Engine()
 	    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");
 	    pause = 1; // wait for option settings to take effect
 	    fprintf(toE, "isready\n"); fflush(toE);
 	    Sync(PAUSE); // wait for readyok
@@ -461,7 +469,7 @@ GUI2Engine()
 	}
 	else if(!strcmp(command, "setboard")) {
 		stm = (strstr(line+9, " b ") ? BLACK : WHITE);
-                if(p = strchr(line+9, '[')) { char c;
+                if((p = strchr(line+9, '[')) && !varOpt) { char c;
                     *p++ = 0; q = strchr(p, ']'); *q = 0; r = q + 4; 
 		    if(sc == 's') q[2] = 'w' + 'b' - q[2], strcpy(r=q+3, " 1\n"); // Shogi: reverse color
 		    else r = strchr(strchr(q+4, ' ') + 1, ' '); // skip to second space (after e.p. square)
@@ -472,6 +480,7 @@ GUI2Engine()
 		iniPos[strlen(iniPos)-1] = sm = 0; collect = (computer == ANALYZE);
 	}
 	else if(!strcmp(command, "variant")) {
+		if(varOpt) fprintf(toE, "setoption name UCI_Variant value %sucinewgame\n", strcmp(line+8, "3check\n") ? line+8 : "threecheck\n");
 		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");