X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwsettings.c;h=768a3867c9b6276184be32cf85801f8e6b076d0f;hb=5e0403d88fc0c96cfcc246ddb7f08462b584ae62;hp=bfad5880333ffdf3041a080621d17ff504dbc370;hpb=01bccb194cfca30703d9b49b05a6f2837d67f0f0;p=xboard.git

diff --git a/winboard/wsettings.c b/winboard/wsettings.c
index bfad588..768a386 100644
--- a/winboard/wsettings.c
+++ b/winboard/wsettings.c
@@ -37,7 +37,7 @@ char *engineName, *engineDir, *engineChoice, *engineLine, *nickName, *params;
 Boolean isUCI, hasBook, storeVariant, v1, addToList, useNick, isUCCI;
 extern Option installOptions[], matchOptions[];
 char *engineNr[] = { N_("First"), N_("Second"), NULL };
-char *engineList[1000] = {" "}, *engineMnemonic[1000] = {""};
+char *engineList[MAXENGINES] = {" "}, *engineMnemonic[MAXENGINES] = {""};
 void (*okFunc)();
 ChessProgramState *activeCps;
 Option *activeList;
@@ -366,7 +366,7 @@ GetOptionValues(HWND hDlg, ChessProgramState *cps, Option *optionList)
 		if(!cps) {
 		    char *p;
 		    p = (optionList[j].type != FileName ? strdup(text) : InterpretFileName(text, homeDir)); // all files relative to homeDir!
-		    FREE(*(char**)optionList[j].target); *(char**)optionList[j].target = p;
+		    FREE(*(char**)optionList[j].target); *(char**)optionList[j].target = p;
 		    free(text); text = p;
 		    while(*p++ = *text++) if(p[-1] == '\r') p--; // crush CR
 		    break;
@@ -387,9 +387,9 @@ GetOptionValues(HWND hDlg, ChessProgramState *cps, Option *optionList)
 		if(!success) break;
 		new = -1;
 		for(k=0; k<optionList[j].max; k++) {
-		    if(!strcmp(choices[k], newText)) new = k;
+		    if(choices[k] && !strcmp(choices[k], newText)) new = k;
 		}
-		if(!cps && new) {
+		if(!cps && new > 0) {
 		    if(*(char**)optionList[j].target) free(*(char**)optionList[j].target);
 		    *(char**)optionList[j].target = strdup(optionList[j].choice[new]);
 		    break;
@@ -480,6 +480,7 @@ LRESULT CALLBACK SettingsProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPa
 		}
 		if(j < 0) break;
 		if(comboCallback && activeList[j].type == ComboBox && HIWORD(wParam) == CBN_SELCHANGE) {
+		    if(j > 5) break; // Yegh! Must solve problem with more than one ombobox in dialog
 		    (*comboCallback)(hDlg);
 		    break;
 		} else
@@ -628,6 +629,7 @@ EngineOptionsPopup(HWND hwnd, ChessProgramState *cps)
 
 int InstallOK()
 {
+    if(engineLine[0] == '#') { DisplayError(_("Select single engine from the group"), 0); return 0; }
     if(isUCCI) isUCI = 2;
     if(engineChoice[0] == engineNr[0][0])  Load(&first, 0); else Load(&second, 1);
     return 1;
@@ -670,10 +672,27 @@ GenericPopup(HWND hwnd, Option *optionList)
     return;
 }
 
-void LoadEnginePopUp(HWND hwnd)
+int
+EnterGroup(HWND hDlg)
 {
-    int n=0;
+    char buf[MSG_SIZ];
+    HANDLE hwndCombo = GetDlgItem(hDlg, 2001+2*1);
+    int i = ComboBox_GetCurSel(hwndCombo);
+    if(i == 0) buf[0] = NULLCHAR; // back to top level
+    else if(engineList[i][0] == '#') safeStrCpy(buf, engineList[i], MSG_SIZ); // group header, open group
+    else return 0; // normal line, select engine
+    installOptions[0].max = NamesToList(firstChessProgramNames, engineList, engineMnemonic, buf); // replace list by only the group contents
+    SendMessage(hwndCombo, CB_RESETCONTENT, 0, 0);
+    SendMessage(hwndCombo, CB_ADDSTRING, 0, (LPARAM) buf);
+    for(i=1; i<installOptions[0].max; i++) {
+	    SendMessage(hwndCombo, CB_ADDSTRING, 0, (LPARAM) engineMnemonic[i]);
+    }
+    SendMessage(hwndCombo, CB_SELECTSTRING, (WPARAM) 0, (LPARAM) buf);
+    return 0;
+}
 
+void LoadEnginePopUp(HWND hwnd)
+{
     isUCI = isUCCI = storeVariant = v1 = useNick = FALSE; addToList = hasBook = TRUE; // defaults
     if(engineDir)    free(engineDir);    engineDir = strdup("");
     if(params)       free(params);       params = strdup("");
@@ -681,9 +700,9 @@ void LoadEnginePopUp(HWND hwnd)
     if(engineChoice) free(engineChoice); engineChoice = strdup(engineNr[0]);
     if(engineLine)   free(engineLine);   engineLine = strdup("");
     if(engineName)   free(engineName);   engineName = strdup("");
-    NamesToList(firstChessProgramNames, engineList, engineMnemonic);
-    while(engineList[n]) n++; installOptions[0].max = n;
+    installOptions[0].max = NamesToList(firstChessProgramNames, engineList, engineMnemonic, ""); // only top level
     snprintf(title, MSG_SIZ, _("Load Engine"));
+    comboCallback = &EnterGroup;
 
     GenericPopup(hwnd, installOptions);
 }
@@ -694,6 +713,7 @@ char *tfName;
 int MatchOK()
 {
     if(autoinc) appData.loadGameIndex = appData.loadPositionIndex = -(twice + 1);
+    if(!appData.loadGameFile[0]) appData.loadGameIndex = -2*twice; // kludge to pass value of "twice" for use in GUI book
     if(swiss) { appData.defaultMatchGames = 1; appData.tourneyType = -1; }
     if(CreateTourney(tfName) && !matchMode) { // CreateTourney reloads original settings if file already existed
 	MatchEvent(2);
@@ -726,11 +746,31 @@ void UpgradeParticipant(HWND hDlg)
     Substitute(participants, FALSE);
 }
 
+void Inspect(HWND hDlg)
+{
+    FILE *f;
+    char name[MSG_SIZ];
+    GetDlgItemText(hDlg, 2001+2*1, name, MSG_SIZ );
+    if(name && name[0] && (f = fopen(name, "r")) ) {
+	char *saveSaveFile;
+	saveSaveFile = appData.saveGameFile; appData.saveGameFile = NULL; // this is a persistent option, protect from change
+	ParseArgsFromFile(f);
+	autoinc = ((appData.loadPositionFile[0] ? appData.loadGameIndex : appData.loadPositionIndex) < 0);
+	twice = ((appData.loadPositionFile[0] ? appData.loadGameIndex : appData.loadPositionIndex) == -2);
+	swiss = appData.tourneyType < 0;
+	SetOptionValues(hDlg, NULL, activeList);
+	FREE(appData.saveGameFile); appData.saveGameFile = saveSaveFile;
+    } else DisplayError(_("First you must specify an existing tourney file to clone"), 0);
+}
+
+void TimeControlOptionsPopup P((HWND hDlg));
+void UciOptionsPopup P((HWND hDlg));
+
 Option tourneyOptions[] = {
   { 0,  0,          4, NULL, (void*) &tfName, "", NULL, FileName, N_("Tournament file:") },
   { 30, 0,          0, NULL, NULL, NULL, NULL, Label, N_("If you specify an existing file, the rest of this dialog will be ignored.") },
   { 30, 0,          0, NULL, NULL, NULL, NULL, Label, N_("Otherwise, the file will be created, with the settings you specify below:") },
-  { 0,  1,          0, NULL, (void*) &engineChoice, (char*) (engineMnemonic+1), (engineMnemonic+1), ComboBox, N_("Select Engine:") },
+  { 0,  1,          0, NULL, (void*) &engineChoice, (char*) engineMnemonic, engineMnemonic, ComboBox, N_("Select Engine:") },
   { 0xD, 7,         0, NULL, (void*) &appData.participants, "", NULL, TextBox, N_("Tourney participants:") },
   { 0,  0,          0, NULL, (void*) &swiss, "", NULL, CheckBox, N_("Use Swiss pairing engine (cycles = rounds)") },
   { 0,  0,         10, NULL, (void*) &appData.tourneyType, "", NULL, Spin, N_("Tourney type (0=RR, 1=gauntlet):") },
@@ -746,33 +786,46 @@ Option tourneyOptions[] = {
   { 0,  0,          0, NULL, (void*) &autoinc, "", NULL, CheckBox, N_("Step through lines/positions in file") },
   { 0,  0, 1000000000, NULL, (void*) &appData.rewindIndex, "", NULL, Spin, N_("Rewind after (0 = never):") },
   { 0,  0,          0, NULL, (void*) &twice, "", NULL, CheckBox, N_("Use each line/position twice") },
+  { 0,  0,          0, NULL, (void*) &appData.defNoBook, "", NULL, CheckBox, N_("Make all use GUI book by default") },
   { 0,  0, 1000000000, NULL, (void*) &appData.matchPause, "", NULL, Spin, N_("Pause between Games (ms):") },
   { 0,  0,          0, NULL, (void*) &ReplaceParticipant, "", NULL, Button, N_("Replace Engine") },
   { 0,  0,          0, NULL, (void*) &UpgradeParticipant, "", NULL, Button, N_("Upgrade Engine") },
+  { 0,  0,          0, NULL, (void*) &TimeControlOptionsPopup, "", NULL, Button, N_("Time Control...") },
+  { 0,  0,          0, NULL, (void*) &UciOptionsPopup, "", NULL, Button, N_("Common Engine...") },
+  { 0,  0,          0, NULL, (void*) &Inspect, "", NULL, Button, N_("Clone Tourney") },
   { 0, 0, 0, NULL, (void*) &MatchOK, "", NULL, EndMark , "" }
 };
 
 int AddToTourney(HWND hDlg)
 {
-    char buf[MSG_SIZ];
-//    GetDlgItemText( hDlg, 2001+2*7, buf, MSG_SIZ-3 ); // this gives the previous selection !!!
-//    strncat(buf, "\r\n", MSG_SIZ);
-    int i = ComboBox_GetCurSel(GetDlgItem(hDlg, 2001+2*7));
-    snprintf(buf, MSG_SIZ, "%s\r\n", engineMnemonic[i+1]);
+  char buf[MSG_SIZ];
+  HANDLE hwndCombo = GetDlgItem(hDlg, 2001+2*7);
+  int i = ComboBox_GetCurSel(hwndCombo);
+  if(i == 0) buf[0] = NULLCHAR; // back to top level
+  else if(engineList[i][0] == '#') safeStrCpy(buf, engineList[i], MSG_SIZ); // group header, open group
+  else { // normal line, select engine
+    snprintf(buf, MSG_SIZ, "%s\r\n", engineMnemonic[i]);
     SendMessage( GetDlgItem(hDlg, 2001+2*9), EM_SETSEL, 99999, 99999 );
     SendMessage( GetDlgItem(hDlg, 2001+2*9), EM_REPLACESEL, (WPARAM) FALSE, (LPARAM) buf );
     return 0;
+  }
+  installOptions[0].max = NamesToList(firstChessProgramNames, engineList, engineMnemonic, buf); // replace list by only the group contents
+  SendMessage(hwndCombo, CB_RESETCONTENT, 0, 0);
+  SendMessage(hwndCombo, CB_ADDSTRING, 0, (LPARAM) buf);
+  for(i=1; i<installOptions[0].max; i++) {
+    SendMessage(hwndCombo, CB_ADDSTRING, 0, (LPARAM) engineMnemonic[i]);
+  }
+  SendMessage(hwndCombo, CB_SELECTSTRING, (WPARAM) 0, (LPARAM) buf);
+  return 0;
 }
 
 void TourneyPopup(HWND hwnd)
 {
-    int n=0;
-
-    NamesToList(firstChessProgramNames, engineList, engineMnemonic);
+    int n = NamesToList(firstChessProgramNames, engineList, engineMnemonic, "");
     comboCallback = &AddToTourney;
     autoinc = appData.loadGameIndex < 0 || appData.loadPositionIndex < 0;
-    twice = TRUE; swiss = appData.tourneyType < 0;
-    while(engineList[n]) n++; tourneyOptions[3].max = n-1;
+    twice = FALSE; swiss = appData.tourneyType < 0;
+    tourneyOptions[3].max = n;
     snprintf(title, MSG_SIZ, _("Tournament and Match Options"));
     ASSIGN(tfName, appData.tourneyFile[0] ? appData.tourneyFile : MakeName(appData.defName));