int checks, combos, buttons, layout, groups;\r
char title[MSG_SIZ];\r
char *engineName, *engineDir, *engineChoice, *engineLine, *nickName, *params;\r
-Boolean isUCI, hasBook, storeVariant, v1, addToList, useNick;\r
+Boolean isUCI, hasBook, storeVariant, v1, addToList, useNick, isUCCI;\r
extern Option installOptions[], matchOptions[];\r
char *engineNr[] = { N_("First"), N_("Second"), NULL };\r
char *engineList[1000] = {" "}, *engineMnemonic[1000] = {""};\r
void (*okFunc)();\r
ChessProgramState *activeCps;\r
Option *activeList;\r
-void InstallOK P((void));\r
-typedef void ButtonCallback(HWND h);\r
+int InstallOK P((void));\r
+typedef int ButtonCallback(HWND h);\r
ButtonCallback *comboCallback;\r
\r
void\r
0x0000, 0x0000, L"Engine #1 Settings ", 8, L"MS Sans Serif"\r
};\r
\r
+char *\r
+AddCR(char *s)\r
+{\r
+ char *p=s, *q;\r
+ int n=0;\r
+ while(p = strchr(p, '\n')) p++, n++; // count linefeeds\r
+ p = q = malloc(strlen(s) + n + 1);\r
+ while(*p++ = *s++) if(p[-1] == '\n') p[-1] = '\r', *p++ = '\n';\r
+ return q;\r
+}\r
+\r
void\r
SetOptionValues(HWND hDlg, ChessProgramState *cps, Option *optionList)\r
// Put all current option values in controls, and write option names next to them\r
case TextBox:\r
case FileName:\r
case PathName:\r
- SetDlgItemText( hDlg, 2001+2*i, cps ? optionList[j].textValue : *(char**)optionList[j].target );\r
+ name = AddCR(cps ? optionList[j].textValue : *(char**)optionList[j].target); // stupid CR...\r
+ SetDlgItemText( hDlg, 2001+2*i, name);\r
+ free(name);\r
break;\r
case CheckBox:\r
CheckDlgButton( hDlg, 2000+2*i, (cps ? optionList[j].value : *(Boolean*)optionList[j].target) != 0);\r
}\r
\r
\r
-void\r
+int\r
GetOptionValues(HWND hDlg, ChessProgramState *cps, Option *optionList)\r
// read out all controls, and if value is altered, remember it and send it to the engine\r
{\r
if(cps) len = MSG_SIZ - strlen(optionList[j].name) - 9, text = newText;\r
else len = GetWindowTextLength(GetDlgItem(hDlg, 2001+2*i)) + 1, text = (char*) malloc(len);\r
success = GetDlgItemText( hDlg, 2001+2*i, text, len );\r
- if(!success) break;\r
+ if(!success) text[0] = NULLCHAR; // empty string can be valid input\r
if(!cps) {\r
char *p;\r
p = (optionList[j].type != FileName ? strdup(text) : InterpretFileName(text, homeDir)); // all files relative to homeDir!\r
snprintf(buf, MSG_SIZ, "option %s=%s\n", optionList[j].name, newText);\r
if(changed) SendToProgram(buf, cps);\r
}\r
- if(!cps && okFunc) ((ButtonCallback*) okFunc)(0);\r
+ if(!cps && okFunc) return ((ButtonCallback*) okFunc)(0);\r
+ return 1;\r
}\r
\r
char *defaultExt[] = { NULL, "pgn", "fen", "exe", "trn", "bin", "log", "ini" };\r
case WM_COMMAND:\r
switch( LOWORD(wParam) ) {\r
case IDOK:\r
- GetOptionValues(hDlg, activeCps, activeList);\r
+ if(!GetOptionValues(hDlg, activeCps, activeList)) return FALSE;\r
EndDialog( hDlg, 0 );\r
comboCallback = NULL; activeCps = NULL;\r
return TRUE;\r
AddControl(x, y+1, 95, 9, 0x0082, SS_ENDELLIPSIS | WS_VISIBLE | WS_CHILD, i);\r
extra = 13*activeList[layoutList[i/2]].min;\r
AddControl(x+95, y, 200, 11+extra, 0x0081, ES_AUTOHSCROLL | WS_BORDER | WS_VISIBLE | WS_CHILD | WS_TABSTOP | \r
- (extra ? ES_MULTILINE | WS_VSCROLL :0), i+1);\r
+ (extra ? ES_MULTILINE | ES_WANTRETURN | WS_VSCROLL :0), i+1);\r
break;\r
case Label:\r
extra = activeList[layoutList[i/2]].value;\r
return;\r
}\r
\r
-void InstallOK()\r
+int InstallOK()\r
{\r
+ if(isUCCI) isUCI = 2;\r
if(engineChoice[0] == engineNr[0][0]) Load(&first, 0); else Load(&second, 1);\r
+ return 1;\r
}\r
\r
Option installOptions[] = {\r
{ 0, 0, 0, NULL, NULL, NULL, NULL, Label, N_("or specify one below:") },\r
{ 0, 0, 0, NULL, (void*) &nickName, NULL, NULL, TextBox, N_("Nickname (optional):") },\r
{ 0, 0, 0, NULL, (void*) &useNick, NULL, NULL, CheckBox, N_("Use nickname in PGN tag") },\r
- { 0, 0, 3, NULL, (void*) &engineName, NULL, NULL, FileName, N_("Engine Executable:") },\r
- { 0, 0, 0, NULL, (void*) ¶ms, NULL, NULL, TextBox, N_("Engine command-line Parameters:") },\r
- { 0, 0, 0, NULL, (void*) &engineDir, NULL, NULL, PathName, N_("Engine Directory:") },\r
- { 95, 0, 0, NULL, NULL, NULL, NULL, Label, N_("(Directory will be derived from engine path when empty)") },\r
- { 0, 0, 0, NULL, (void*) &isUCI, NULL, NULL, CheckBox, N_("UCI") },\r
- { 0, 0, 0, NULL, (void*) &v1, NULL, NULL, CheckBox, N_("WB protocol v1 (skip waiting for features)") },\r
+ { 0, 0, 3, NULL, (void*) &engineName, NULL, NULL, FileName, N_("Engine (*.exe):") },\r
+ { 0, 0, 0, NULL, (void*) ¶ms, NULL, NULL, TextBox, N_("command-line parameters:") },\r
+ { 0, 0, 0, NULL, (void*) &engineDir, NULL, NULL, PathName, N_("directory:") },\r
+ { 95, 0, 0, NULL, NULL, NULL, NULL, Label, N_("(Directory will be derived from engine path when left empty)") },\r
{ 0, 0, 0, NULL, (void*) &addToList, NULL, NULL, CheckBox, N_("Add this engine to the list") },\r
{ 0, 0, 0, NULL, (void*) &hasBook, NULL, NULL, CheckBox, N_("Must not use GUI book") },\r
+ { 0, 0, 0, NULL, (void*) &isUCI, NULL, NULL, CheckBox, N_("UCI") },\r
+ { 0, 0, 0, NULL, (void*) &v1, NULL, NULL, CheckBox, N_("WB protocol v1 (skip waiting for features)") },\r
+ { 0, 0, 0, NULL, (void*) &isUCCI, NULL, NULL, CheckBox, N_("UCCI / USI (uses specified /uxiAdapter)") },\r
{ 0, 0, 0, NULL, (void*) &storeVariant, NULL, NULL, CheckBox, N_("Force current variant with this engine") },\r
{ 0, 0, 2, NULL, (void*) &engineChoice, (char*) engineNr, engineNr, ComboBox, N_("Load mentioned engine as") },\r
{ 0, 1, 0, NULL, (void*) &InstallOK, "", NULL, EndMark , "" }\r
{\r
int n=0;\r
\r
- isUCI = storeVariant = v1 = useNick = FALSE; addToList = hasBook = TRUE; // defaults\r
+ isUCI = isUCCI = storeVariant = v1 = useNick = FALSE; addToList = hasBook = TRUE; // defaults\r
if(engineDir) free(engineDir); engineDir = strdup("");\r
if(params) free(params); params = strdup("");\r
if(nickName) free(nickName); nickName = strdup("");\r
GenericPopup(hwnd, installOptions);\r
}\r
\r
-Boolean autoinc, twice;\r
+Boolean autoinc, twice, swiss;\r
+char *tfName;\r
\r
-void MatchOK()\r
+int MatchOK()\r
{\r
if(autoinc) appData.loadGameIndex = appData.loadPositionIndex = -(twice + 1);\r
- if(appData.participants) free(appData.participants);\r
- appData.participants = strdup(engineName);\r
- if(CreateTourney(appData.tourneyFile)) MatchEvent(2); \r
-// ScheduleDelayedEvent(MatchEvent(2), 10); // start tourney\r
+ if(swiss) { appData.defaultMatchGames = 1; appData.tourneyType = -1; }\r
+ if(CreateTourney(tfName)) MatchEvent(2); else return !appData.participants[0];\r
+ return 1;\r
}\r
\r
Option tourneyOptions[] = {\r
- { 0, 0, 4, NULL, (void*) &appData.tourneyFile, "", NULL, FileName, N_("Tournament file:") },\r
+ { 0, 0, 4, NULL, (void*) &tfName, "", NULL, FileName, N_("Tournament file:") },\r
+ { 30, 0, 0, NULL, NULL, NULL, NULL, Label, N_("If you specify an existing file, the rest of this dialog will be ignored.") },\r
+ { 30, 0, 0, NULL, NULL, NULL, NULL, Label, N_("Otherwise, the file will be created, with the settings you specify below:") },\r
{ 0, 1, 0, NULL, (void*) &engineChoice, (char*) (engineMnemonic+1), (engineMnemonic+1), ComboBox, N_("Select Engine:") },\r
- { 0xD, 7, 0, NULL, (void*) &engineName, "", NULL, TextBox, "Tourney participants:" },\r
+ { 0xD, 7, 0, NULL, (void*) &appData.participants, "", NULL, TextBox, "Tourney participants:" },\r
+ { 0, 0, 0, NULL, (void*) &swiss, "", NULL, CheckBox, N_("Use Swiss pairing engine (cycles = rounds)") },\r
{ 0, 0, 10, NULL, (void*) &appData.tourneyType, "", NULL, Spin, N_("Tourney type (0=RR, 1=gauntlet):") },\r
{ 0, 0, 0, NULL, (void*) &appData.cycleSync, "", NULL, CheckBox, N_("Sync after cycle") },\r
{ 0, 1, 1000000000, NULL, (void*) &appData.tourneyCycles, "", NULL, Spin, N_("Number of tourney cycles:") },\r
{ 0, 0, 0, NULL, (void*) &MatchOK, "", NULL, EndMark , "" }\r
};\r
\r
-void AddToTourney(HWND hDlg)\r
+int AddToTourney(HWND hDlg)\r
{\r
char buf[MSG_SIZ];\r
-// GetDlgItemText( hDlg, 2001+2*3, buf, MSG_SIZ-3 ); // this gives the previous selection !!!\r
+// GetDlgItemText( hDlg, 2001+2*7, buf, MSG_SIZ-3 ); // this gives the previous selection !!!\r
// strncat(buf, "\r\n", MSG_SIZ);\r
- int i = ComboBox_GetCurSel(GetDlgItem(hDlg, 2001+2*3));\r
+ int i = ComboBox_GetCurSel(GetDlgItem(hDlg, 2001+2*7));\r
snprintf(buf, MSG_SIZ, "%s\r\n", engineMnemonic[i+1]);\r
- SendMessage( GetDlgItem(hDlg, 2001+2*5), EM_SETSEL, 99999, 99999 );\r
- SendMessage( GetDlgItem(hDlg, 2001+2*5), EM_REPLACESEL, (WPARAM) FALSE, (LPARAM) buf );\r
+ SendMessage( GetDlgItem(hDlg, 2001+2*9), EM_SETSEL, 99999, 99999 );\r
+ SendMessage( GetDlgItem(hDlg, 2001+2*9), EM_REPLACESEL, (WPARAM) FALSE, (LPARAM) buf );\r
+ return 0;\r
}\r
\r
void TourneyPopup(HWND hwnd)\r
NamesToList(firstChessProgramNames, engineList, engineMnemonic);\r
comboCallback = &AddToTourney;\r
autoinc = appData.loadGameIndex < 0 || appData.loadPositionIndex < 0;\r
- twice = TRUE;\r
- while(engineList[n]) n++; tourneyOptions[1].max = n-1;\r
+ twice = TRUE; swiss = appData.tourneyType < 0;\r
+ while(engineList[n]) n++; tourneyOptions[3].max = n-1;\r
snprintf(title, MSG_SIZ, _("Tournament and Match Options"));\r
+ ASSIGN(tfName, appData.tourneyFile[0] ? appData.tourneyFile : MakeName(appData.defName));\r
\r
GenericPopup(hwnd, tourneyOptions);\r
}\r
projects / xboard.git / blobdiff