X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=backend.c;h=c19666281f2aa2d11b7147c7d26119c1060a1d59;hb=38c917868e8db7efd7b1a9d0d52e9a14a7d6513e;hp=0a736e73ae49904cb66377106ce4b4ed3e0c70a4;hpb=f4cc69edd466fda83f84629f40c086dd2a249616;p=xboard.git

diff --git a/backend.c b/backend.c
index 0a736e7..c196662 100644
--- a/backend.c
+++ b/backend.c
@@ -393,6 +393,7 @@ PosFlags (index)
 }
 
 FILE *gameFileFP, *debugFP;
+char *currentDebugFile; // [HGM] debug split: to remember name
 
 /*
     [AS] Note: sometimes, the sscanf() function is used to parse the input
@@ -1325,6 +1326,7 @@ InitBackEnd2 ()
     if (appData.debugMode) {
 	fprintf(debugFP, "%s\n", programVersion);
     }
+    ASSIGN(currentDebugFile, appData.nameOfDebugFile); // [HGM] debug split: remember initial name in use
 
     set_cont_sequence(appData.wrapContSeq);
     if (appData.matchGames > 0) {
@@ -9808,7 +9810,7 @@ Substitute (char *participants, int expunge)
 	q = r; while(*q) nPlayers += (*q++ == '\n');
 	p = buf; while(*r && (*p = *r++) != '\n') p++;
 	*p = NULLCHAR;
-	NamesToList(firstChessProgramNames, command, mnemonic);
+	NamesToList(firstChessProgramNames, command, mnemonic, "all");
 	for(i=1; mnemonic[i]; i++) if(!strcmp(buf, mnemonic[i])) break;
 	if(mnemonic[i]) { // The substitute is valid
 	    FILE *f;
@@ -9877,19 +9879,28 @@ CreateTourney (char *name)
 	return 1;
 }
 
-void
-NamesToList (char *names, char **engineList, char **engineMnemonic)
+int
+NamesToList (char *names, char **engineList, char **engineMnemonic, char *group)
 {
     char buf[MSG_SIZ], *p, *q;
-    int i=1;
-    while(*names) {
-	p = names; q = buf;
+    int i=1, header, skip, all = !strcmp(group, "all"), depth = 0;
+    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;
 	while(*p && *p != '\n') *q++ = *p++;
 	*q = 0;
+	if(*p == '\n') p++;
+	if(buf[0] == '#') {
+	    if(strstr(buf, "# end") == buf) { depth--; 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;
+	    if(skip && !strcmp(group, buf)) { depth = 0; skip = FALSE; } // start when we reach requested 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(*p == '\n') p++;
-	TidyProgramName(engineList[i], "localhost", buf);
+	if(buf[0] != '#') 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, " (");
@@ -9897,10 +9908,10 @@ NamesToList (char *names, char **engineList, char **engineMnemonic)
 	    strcat(buf, ")");
 	}
 	engineMnemonic[i] = strdup(buf);
-	names = p; i++;
-      if(i > MAXENGINES - 2) break;
+	i++;
     }
     engineList[i] = engineMnemonic[i] = NULL;
+    return i;
 }
 
 // following implemented as macro to avoid type limitations
@@ -9952,7 +9963,7 @@ RecentEngineEvent (int nr)
     int n;
 //    SwapEngines(1); // bump first to second
 //    ReplaceEngine(&second, 1); // and load it there
-    NamesToList(firstChessProgramNames, command, mnemonic); // get mnemonics of installed engines
+    NamesToList(firstChessProgramNames, command, mnemonic, "all"); // get mnemonics of installed engines
     n = SetPlayer(nr, recentEngines); // select new (using original menu order!)
     if(mnemonic[n]) { // if somehow the engine with the selected nickname is no longer found in the list, we skip
 	ReplaceEngine(&first, 0);
@@ -10063,7 +10074,7 @@ NextTourneyGame (int nr, int *swapColors)
     if(first.pr != NoProc && second.pr != NoProc) return 1; // engines already loaded
 
     // redefine engines, engine dir, etc.
-    NamesToList(firstChessProgramNames, command, mnemonic); // get mnemonics of installed engines
+    NamesToList(firstChessProgramNames, command, mnemonic, "all"); // get mnemonics of installed engines
     if(first.pr == NoProc || nr < 0) {
       SetPlayer(whitePlayer, appData.participants); // find white player amongst it, and parse its engine line
       InitEngine(&first, 0);  // initialize ChessProgramStates based on new settings.
@@ -12319,6 +12330,8 @@ SaveGamePGN (FILE *f)
 
     PrintPGNTags(f, &gameInfo);
 
+    if(appData.numberTag && matchMode) fprintf(f, "[Number \"%d\"]\n", nextGame+1); // [HGM] number tag
+
     if (backwardMostMove > 0 || startedFromSetupPosition) {
         char *fen = PositionToFEN(backwardMostMove, NULL);
         fprintf(f, "[FEN \"%s\"]\n[SetUp \"1\"]\n", fen);
@@ -13395,6 +13408,17 @@ TwoMachinesEvent P((void))
 	break;
     }
 
+    if(matchMode && appData.debugMode) { // [HGM] debug split: game is part of a match; we might have to create a debug file just for this game
+	snprintf(buf, MSG_SIZ, appData.nameOfDebugFile, nextGame+1); // expand name of debug file with %d in it
+	if(strcmp(buf, currentDebugFile)) { // name has changed
+	    FILE *f = fopen(buf, "w");
+	    if(f) { // if opening the new file failed, just keep using the old one
+		ASSIGN(currentDebugFile, buf);
+		fclose(debugFP);
+		debugFP = f;
+	    }
+	}
+    }
 //    forwardMostMove = currentMove;
     TruncateGame(); // [HGM] vari: MachineWhite and MachineBlack do this...
 
@@ -13420,6 +13444,7 @@ TwoMachinesEvent P((void))
 	ScheduleDelayedEvent(TwoMachinesEventIfReady, appData.matchPause - wait);
 	return;
     }
+    // we are now committed to starting the game
     stalling = 0;
     DisplayMessage("", "");
     if (startedFromSetupPosition) {
@@ -14648,7 +14673,7 @@ PrintOpponents (FILE *fp)
 void
 TidyProgramName (char *prog, char *host, char buf[MSG_SIZ])
 {
-    char *p, *q;
+    char *p, *q, c;
     int local = (strcmp(host, "localhost") == 0);
     while (!local && (p = strchr(prog, ';')) != NULL) {
 	p++;
@@ -14665,7 +14690,8 @@ TidyProgramName (char *prog, char *host, char buf[MSG_SIZ])
     while (p >= prog && *p != '/' && *p != '\\') p--;
     p++;
     if(p == prog && *p == '"') p++;
-    if (q - p >= 4 && StrCaseCmp(q - 4, ".exe") == 0) q -= 4;
+    c = *q; *q = 0;
+    if (q - p >= 4 && StrCaseCmp(q - 4, ".exe") == 0) *q = c, q -= 4; else *q = c;
     memcpy(buf, p, q - p);
     buf[q - p] = NULLCHAR;
     if (!local) {
@@ -15609,6 +15635,14 @@ TypeInDoneEvent (char *move)
 	  ToNrEvent(2*n-1);
 	  return;
 	}
+	// undocumented kludge: allow command-line option to be typed in!
+	// (potentially fatal, and does not implement the effect of the option.)
+	// should only be used for options that are values on which future decisions will be made,
+	// and definitely not on options that would be used during initialization.
+	if(strstr(move, "!!! -") == move) {
+	    ParseArgsFromString(move+4);
+	    return;
+        }
 
       if (gameMode != EditGame && currentMove != forwardMostMove && 
 	gameMode != Training) {