X-Git-Url: http://winboard.nl/cgi-bin?p=uci2wb.git;a=blobdiff_plain;f=UCI2WB.c;h=2971c3f5df7e00abec317f6574d387abb8c38c3c;hp=c13ea347d0b6640c2b8f284992efd6725fdf2d32;hb=85a82d8e5887b236ac8c6bad257301b4d30b948d;hpb=e7c084cff327333c02190799fc3803c1a2b4fe74

diff --git a/UCI2WB.c b/UCI2WB.c
index c13ea34..2971c3f 100644
--- a/UCI2WB.c
+++ b/UCI2WB.c
@@ -398,7 +398,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,13 +412,18 @@ 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"); EPRINT((f, "# quit\n")) exit(-1); }
 	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;
@@ -539,7 +544,6 @@ GUI2Engine()
 	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) 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') 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(0); }
     }