X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwsettings.c;h=84c02cbb121ecd8f1f89bb82bf0612fd1f813e45;hb=407cd1126c6c24d890359f1fe1686f6d90c0ad61;hp=b1fe4d70d4f81f7430c0cf2aa8330a561ff2e53f;hpb=0019f0f86309b939047d7260114168320c50e875;p=xboard.git

diff --git a/winboard/wsettings.c b/winboard/wsettings.c
index b1fe4d7..84c02cb 100644
--- a/winboard/wsettings.c
+++ b/winboard/wsettings.c
@@ -34,15 +34,15 @@ int breaks[MAX_OPTIONS];
 int checks, combos, buttons, layout, groups;
 char title[MSG_SIZ];
 char *engineName, *engineDir, *engineChoice, *engineLine, *nickName, *params;
-Boolean isUCI, hasBook, storeVariant, v1, addToList, useNick;
+Boolean isUCI, hasBook, storeVariant, v1, addToList, useNick, isUCCI;
 extern Option installOptions[], matchOptions[];
 char *engineNr[] = { N_("First"), N_("Second"), NULL };
 char *engineList[1000] = {" "}, *engineMnemonic[1000] = {""};
 void (*okFunc)();
 ChessProgramState *activeCps;
 Option *activeList;
-void InstallOK P((void));
-typedef void ButtonCallback(HWND h);
+int InstallOK P((void));
+typedef int ButtonCallback(HWND h);
 ButtonCallback *comboCallback;
 
 void
@@ -262,6 +262,17 @@ struct {
     0x0000, 0x0000, L"Engine #1 Settings ", 8, L"MS Sans Serif"
 };
 
+char *
+AddCR(char *s)
+{
+    char *p=s, *q;
+    int n=0;
+    while(p = strchr(p, '\n')) p++, n++; // count linefeeds
+    p = q = malloc(strlen(s) + n + 1);
+    while(*p++ = *s++) if(p[-1] == '\n') p[-1] = '\r', *p++ = '\n';
+    return q;
+}
+
 void
 SetOptionValues(HWND hDlg, ChessProgramState *cps, Option *optionList)
 // Put all current option values in controls, and write option names next to them
@@ -285,7 +296,9 @@ SetOptionValues(HWND hDlg, ChessProgramState *cps, Option *optionList)
 	    case TextBox:
 	    case FileName:
 	    case PathName:
-		SetDlgItemText( hDlg, 2001+2*i, cps ? optionList[j].textValue : *(char**)optionList[j].target );
+		name = AddCR(cps ? optionList[j].textValue : *(char**)optionList[j].target); // stupid CR...
+		SetDlgItemText( hDlg, 2001+2*i, name);
+		free(name);
 		break;
 	    case CheckBox:
 		CheckDlgButton( hDlg, 2000+2*i, (cps ? optionList[j].value : *(Boolean*)optionList[j].target) != 0);
@@ -321,7 +334,7 @@ SetOptionValues(HWND hDlg, ChessProgramState *cps, Option *optionList)
 }
 
 
-void
+int
 GetOptionValues(HWND hDlg, ChessProgramState *cps, Option *optionList)
 // read out all controls, and if value is altered, remember it and send it to the engine
 {
@@ -349,7 +362,7 @@ GetOptionValues(HWND hDlg, ChessProgramState *cps, Option *optionList)
 		if(cps) len = MSG_SIZ - strlen(optionList[j].name) - 9, text = newText;
 		else    len = GetWindowTextLength(GetDlgItem(hDlg, 2001+2*i)) + 1, text = (char*) malloc(len);
 		success = GetDlgItemText( hDlg, 2001+2*i, text, len );
-		if(!success) break;
+		if(!success) text[0] = NULLCHAR; // empty string can be valid input
 		if(!cps) {
 		    char *p;
 		    p = (optionList[j].type != FileName ? strdup(text) : InterpretFileName(text, homeDir)); // all files relative to homeDir!
@@ -394,7 +407,8 @@ GetOptionValues(HWND hDlg, ChessProgramState *cps, Option *optionList)
 	  snprintf(buf, MSG_SIZ, "option %s=%s\n", optionList[j].name, newText);
 	if(changed) SendToProgram(buf, cps);
     }
-    if(!cps && okFunc) ((ButtonCallback*) okFunc)(0);
+    if(!cps && okFunc) return ((ButtonCallback*) okFunc)(0);
+    return 1;
 }
 
 char *defaultExt[] = { NULL, "pgn", "fen", "exe", "trn", "bin", "log", "ini" };
@@ -418,7 +432,7 @@ LRESULT CALLBACK SettingsProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPa
     case WM_COMMAND:
         switch( LOWORD(wParam) ) {
         case IDOK:
-	    GetOptionValues(hDlg, activeCps, activeList);
+	    if(!GetOptionValues(hDlg, activeCps, activeList)) return FALSE;
             EndDialog( hDlg, 0 );
 	    comboCallback = NULL; activeCps = NULL;
             return TRUE;
@@ -517,7 +531,7 @@ void AddOption(int x, int y, Control type, int i)
 	    AddControl(x, y+1, 95, 9, 0x0082, SS_ENDELLIPSIS | WS_VISIBLE | WS_CHILD, i);
 	    extra = 13*activeList[layoutList[i/2]].min;
 	    AddControl(x+95, y, 200, 11+extra, 0x0081, ES_AUTOHSCROLL | WS_BORDER | WS_VISIBLE | WS_CHILD | WS_TABSTOP | 
-								(extra ? ES_MULTILINE | WS_VSCROLL :0), i+1);
+								(extra ? ES_MULTILINE | ES_WANTRETURN | WS_VSCROLL :0), i+1);
 	    break;
 	case Label:
 	    extra = activeList[layoutList[i/2]].value;
@@ -610,9 +624,11 @@ EngineOptionsPopup(HWND hwnd, ChessProgramState *cps)
     return;
 }
 
-void InstallOK()
+int InstallOK()
 {
+    if(isUCCI) isUCI = 2;
     if(engineChoice[0] == engineNr[0][0])  Load(&first, 0); else Load(&second, 1);
+    return 1;
 }
 
 Option installOptions[] = {
@@ -620,14 +636,15 @@ Option installOptions[] = {
   {   0,  0,    0, NULL, NULL, NULL, NULL, Label, N_("or specify one below:") },
   {   0,  0,    0, NULL, (void*) &nickName, NULL, NULL, TextBox, N_("Nickname (optional):") },
   {   0,  0,    0, NULL, (void*) &useNick, NULL, NULL, CheckBox, N_("Use nickname in PGN tag") },
-  {   0,  0,    3, NULL, (void*) &engineName, NULL, NULL, FileName, N_("Engine Executable:") },
-  {   0,  0,    0, NULL, (void*) &params, NULL, NULL, TextBox, N_("Engine command-line Parameters:") },
-  {   0,  0,    0, NULL, (void*) &engineDir, NULL, NULL, PathName, N_("Engine Directory:") },
-  {  95,  0,    0, NULL, NULL, NULL, NULL, Label, N_("(Directory will be derived from engine path when empty)") },
-  {   0,  0,    0, NULL, (void*) &isUCI, NULL, NULL, CheckBox, N_("UCI") },
-  {   0,  0,    0, NULL, (void*) &v1, NULL, NULL, CheckBox, N_("WB protocol v1 (skip waiting for features)") },
+  {   0,  0,    3, NULL, (void*) &engineName, NULL, NULL, FileName, N_("Engine (*.exe):") },
+  {   0,  0,    0, NULL, (void*) &params, NULL, NULL, TextBox, N_("command-line parameters:") },
+  {   0,  0,    0, NULL, (void*) &engineDir, NULL, NULL, PathName, N_("directory:") },
+  {  95,  0,    0, NULL, NULL, NULL, NULL, Label, N_("(Directory will be derived from engine path when left empty)") },
   {   0,  0,    0, NULL, (void*) &addToList, NULL, NULL, CheckBox, N_("Add this engine to the list") },
   {   0,  0,    0, NULL, (void*) &hasBook, NULL, NULL, CheckBox, N_("Must not use GUI book") },
+  {   0,  0,    0, NULL, (void*) &isUCI, NULL, NULL, CheckBox, N_("UCI") },
+  {   0,  0,    0, NULL, (void*) &v1, NULL, NULL, CheckBox, N_("WB protocol v1 (skip waiting for features)") },
+  {   0,  0,    0, NULL, (void*) &isUCCI, NULL, NULL, CheckBox, N_("UCCI / USI (uses specified /uxiAdapter)") },
   {   0,  0,    0, NULL, (void*) &storeVariant, NULL, NULL, CheckBox, N_("Force current variant with this engine") },
   {   0,  0,    2, NULL, (void*) &engineChoice, (char*) engineNr, engineNr, ComboBox, N_("Load mentioned engine as") },
   {   0,  1,    0, NULL, (void*) &InstallOK, "", NULL, EndMark , "" }
@@ -655,7 +672,7 @@ void LoadEnginePopUp(HWND hwnd)
 {
     int n=0;
 
-    isUCI = storeVariant = v1 = useNick = FALSE; addToList = hasBook = TRUE; // defaults
+    isUCI = isUCCI = storeVariant = v1 = useNick = FALSE; addToList = hasBook = TRUE; // defaults
     if(engineDir)    free(engineDir);    engineDir = strdup("");
     if(params)       free(params);       params = strdup("");
     if(nickName)     free(nickName);     nickName = strdup("");
@@ -669,21 +686,24 @@ void LoadEnginePopUp(HWND hwnd)
     GenericPopup(hwnd, installOptions);
 }
 
-Boolean autoinc, twice;
+Boolean autoinc, twice, swiss;
+char *tfName;
 
-void MatchOK()
+int MatchOK()
 {
     if(autoinc) appData.loadGameIndex = appData.loadPositionIndex = -(twice + 1);
-    if(appData.participants) free(appData.participants);
-    appData.participants = strdup(engineName);
-    if(CreateTourney(appData.tourneyFile)) MatchEvent(2); 
-//	ScheduleDelayedEvent(MatchEvent(2), 10); // start tourney
+    if(swiss) { appData.defaultMatchGames = 1; appData.tourneyType = -1; }
+    if(CreateTourney(tfName)) MatchEvent(2); else return !appData.participants[0];
+    return 1;
 }
 
 Option tourneyOptions[] = {
-  { 0,  0,          4, NULL, (void*) &appData.tourneyFile, "", NULL, FileName, N_("Tournament file:") },
+  { 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:") },
-  { 0xD, 7,         0, NULL, (void*) &engineName, "", NULL, TextBox, "Tourney participants:" },
+  { 0xD, 7,         0, NULL, (void*) &appData.participants, "", NULL, TextBox, "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):") },
   { 0,  0,          0, NULL, (void*) &appData.cycleSync, "", NULL, CheckBox, N_("Sync after cycle") },
   { 0,  1, 1000000000, NULL, (void*) &appData.tourneyCycles, "", NULL, Spin, N_("Number of tourney cycles:") },
@@ -701,15 +721,16 @@ Option tourneyOptions[] = {
   { 0, 0, 0, NULL, (void*) &MatchOK, "", NULL, EndMark , "" }
 };
 
-void AddToTourney(HWND hDlg)
+int AddToTourney(HWND hDlg)
 {
     char buf[MSG_SIZ];
-//    GetDlgItemText( hDlg, 2001+2*3, buf, MSG_SIZ-3 ); // this gives the previous selection !!!
+//    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*3));
+    int i = ComboBox_GetCurSel(GetDlgItem(hDlg, 2001+2*7));
     snprintf(buf, MSG_SIZ, "%s\r\n", engineMnemonic[i+1]);
-    SendMessage( GetDlgItem(hDlg, 2001+2*5), EM_SETSEL, 99999, 99999 );
-    SendMessage( GetDlgItem(hDlg, 2001+2*5), EM_REPLACESEL, (WPARAM) FALSE, (LPARAM) buf );
+    SendMessage( GetDlgItem(hDlg, 2001+2*9), EM_SETSEL, 99999, 99999 );
+    SendMessage( GetDlgItem(hDlg, 2001+2*9), EM_REPLACESEL, (WPARAM) FALSE, (LPARAM) buf );
+    return 0;
 }
 
 void TourneyPopup(HWND hwnd)
@@ -719,9 +740,10 @@ void TourneyPopup(HWND hwnd)
     NamesToList(firstChessProgramNames, engineList, engineMnemonic);
     comboCallback = &AddToTourney;
     autoinc = appData.loadGameIndex < 0 || appData.loadPositionIndex < 0;
-    twice = TRUE;
-    while(engineList[n]) n++; tourneyOptions[1].max = n-1;
+    twice = TRUE; swiss = appData.tourneyType < 0;
+    while(engineList[n]) n++; tourneyOptions[3].max = n-1;
     snprintf(title, MSG_SIZ, _("Tournament and Match Options"));
+    ASSIGN(tfName, appData.tourneyFile[0] ? appData.tourneyFile : MakeName(appData.defName));
 
     GenericPopup(hwnd, tourneyOptions);
 }