X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=backend.c;h=3f6229da29fab8839781c7a70822004c2e7b732d;hb=dcb381e902c84b25e2a7301c5ba1d9f437503b5b;hp=5770e333a4071696654302172a403223af9ed724;hpb=78faea4c21208a7219dc11180519b18f0444c5f7;p=xboard.git

diff --git a/backend.c b/backend.c
index 5770e33..3f6229d 100644
--- a/backend.c
+++ b/backend.c
@@ -898,7 +898,7 @@ FloatToFront(char **list, char *engineLine)
     ASSIGN(*list, tidy+1);
 }
 
-char *wbOptions;
+char *insert, *wbOptions; // point in ChessProgramNames were we should insert new engine
 
 void
 Load (ChessProgramState *cps, int i)
@@ -954,8 +954,10 @@ Load (ChessProgramState *cps, int i)
 			isUCI ? (isUCI == TRUE ? " -fUCI" : gameInfo.variant == VariantShogi ? " -fUSI" : " -fUCCI") : "",
 			storeVariant ? " -variant " : "",
 			storeVariant ? VariantName(gameInfo.variant) : "");
+	if(wbOptions && wbOptions[0]) snprintf(buf+strlen(buf)-1, MSG_SIZ-strlen(buf), " %s\n", wbOptions);
 	firstChessProgramNames = malloc(len = strlen(q) + strlen(buf) + 1);
-	snprintf(firstChessProgramNames, len, "%s%s", q, buf);
+	if(insert != q) insert[-1] = NULLCHAR;
+	snprintf(firstChessProgramNames, len, "%s\n%s%s", q, buf, insert);
 	if(q) 	free(q);
 	FloatToFront(&appData.recentEngineList, buf);
     }
@@ -6129,7 +6131,6 @@ WriteMap (int s)
 static void
 ClearMap ()
 {
-    int j;
     safeStrCpy(exclusionHeader, "exclude: none best +tail                                          \n", MSG_SIZ);
     excludePtr = 24; exCnt = 0;
     WriteMap(0);
@@ -6161,7 +6162,7 @@ UpdateExcludeHeader (int fromY, int fromX, int toY, int toX, char promoChar, cha
 static int
 ExcludeOneMove (int fromY, int fromX, int toY, int toX, signed char promoChar, char state)
 {   // include or exclude the given move, as specified by state ('+' or '-'), or toggle
-    char *p, buf[MSG_SIZ];
+    char buf[MSG_SIZ];
     int j, k;
     ChessMove moveType;
     if(promoChar == -1) { // kludge to indicate best move
@@ -6188,7 +6189,6 @@ static void
 ExcludeClick (int index)
 {
     int i, j;
-    char buf[MSG_SIZ];
     Exclusion *e = excluTab;
     if(index < 25) { // none, best or tail clicked
 	if(index < 13) { // none: include all
@@ -10030,6 +10030,7 @@ NamesToList (char *names, char **engineList, char **engineMnemonic, char *group)
 {
     char buf[MSG_SIZ], *p, *q;
     int i=1, header, skip, all = !strcmp(group, "all"), depth = 0;
+    insert = names; // afterwards, this global will point just after last retrieved engine line or group end in the 'names'
     skip = !all && group[0]; // if group requested, we start in skip mode
     for(;*names && depth >= 0 && i < MAXENGINES-1; names = p) {
 	p = names; q = buf; header = 0;
@@ -10037,7 +10038,7 @@ NamesToList (char *names, char **engineList, char **engineMnemonic, char *group)
 	*q = 0;
 	if(*p == '\n') p++;
 	if(buf[0] == '#') {
-	    if(strstr(buf, "# end") == buf) { depth--; continue; } // leave group, and suppress printing label
+	    if(strstr(buf, "# end") == buf) { if(!--depth) insert = p; continue; } // leave group, and suppress printing label
 	    depth++; // we must be entering a new group
 	    if(all) continue; // suppress printing group headers when complete list requested
 	    header = 1;
@@ -10046,7 +10047,7 @@ NamesToList (char *names, char **engineList, char **engineMnemonic, char *group)
 	if(depth != header && !all || skip) continue; // skip contents of group (but print first-level header)
 	if(engineList[i]) free(engineList[i]);
 	engineList[i] = strdup(buf);
-	if(buf[0] != '#') TidyProgramName(engineList[i], "localhost", buf); // group headers not tidied
+	if(buf[0] != '#') insert = p, TidyProgramName(engineList[i], "localhost", buf); // group headers not tidied
 	if(engineMnemonic[i]) free(engineMnemonic[i]);
 	if((q = strstr(engineList[i]+2, "variant")) && q[-2]== ' ' && (q[-1]=='/' || q[-1]=='-') && (q[7]==' ' || q[7]=='=')) {
 	    strcat(buf, " (");
@@ -15533,8 +15534,8 @@ ParseOption (Option *opt, ChessProgramState *cps)
 	    if(sscanf(p, " -check %d", &def) < 1) return FALSE;
 	    opt->value = (def != 0);
 	    opt->type = CheckBox;
-	} else if(p = strstr(opt->name, " -combo ")) {
-	    opt->textValue = (char*) (&cps->comboList[cps->comboCnt]); // cheat with pointer type
+	} else if(p = strstr(opt->name,	" -combo ")) {
+	    opt->textValue = (char*) (opt->choice = &cps->comboList[cps->comboCnt]); // cheat with pointer type
 	    cps->comboList[cps->comboCnt++] = q = p+8; // holds possible choices
 	    if(*q == '*') cps->comboList[cps->comboCnt-1]++;
 	    opt->value = n = 0;
@@ -15655,7 +15656,10 @@ ParseFeatures (char *args, ChessProgramState *cps)
     if (BoolFeature(&p, "memory", &cps->memSize, cps)) continue;
     if (BoolFeature(&p, "smp", &cps->maxCores, cps)) continue;
     if (StringFeature(&p, "egt", cps->egtFormats, cps)) continue;
-    if (StringFeature(&p, "option", cps->option[cps->nrOptions].name, cps)) {
+    if (StringFeature(&p, "option", buf, cps)) {
+	FREE(cps->option[cps->nrOptions].name);
+	cps->option[cps->nrOptions].name = malloc(MSG_SIZ);
+	safeStrCpy(cps->option[cps->nrOptions].name, buf, MSG_SIZ);
 	if(!ParseOption(&(cps->option[cps->nrOptions++]), cps)) { // [HGM] options: add option feature
 	  snprintf(buf, MSG_SIZ, "rejected option %s\n", cps->option[--cps->nrOptions].name);
 	    SendToProgram(buf, cps);