Allow generic dialog to ignore OK

[xboard.git] / winboard / wsettings.c

diff --git a/winboard/wsettings.c b/winboard/wsettings.c
index 72ceb96..159c0a1 100644 (file)
--- a/winboard/wsettings.c
+++ b/winboard/wsettings.c
@@ -41,8 +41,8 @@ char *engineList[1000] = {" "}, *engineMnemonic[1000] = {""};
 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
@@ -334,7 +334,7 @@ SetOptionValues(HWND hDlg, ChessProgramState *cps, Option *optionList)
 }\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
@@ -407,7 +407,8 @@ GetOptionValues(HWND hDlg, ChessProgramState *cps, Option *optionList)
          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
@@ -431,7 +432,7 @@ LRESULT CALLBACK SettingsProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPa
     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
@@ -623,10 +624,11 @@ EngineOptionsPopup(HWND hwnd, ChessProgramState *cps)
     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
@@ -686,19 +688,19 @@ void LoadEnginePopUp(HWND hwnd)
 \r
 Boolean autoinc, twice;\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(CreateTourney(appData.tourneyFile)) MatchEvent(2); else return 0;\r
+    return 1;\r
 }\r
 \r
 Option tourneyOptions[] = {\r
   { 0,  0,          4, NULL, (void*) &appData.tourneyFile, "", 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,         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
@@ -716,15 +718,16 @@ Option tourneyOptions[] = {
   { 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
@@ -735,7 +738,7 @@ void TourneyPopup(HWND hwnd)
     comboCallback = &AddToTourney;\r
     autoinc = appData.loadGameIndex < 0 || appData.loadPositionIndex < 0;\r
     twice = TRUE;\r
-    while(engineList[n]) n++; tourneyOptions[1].max = n-1;\r
+    while(engineList[n]) n++; tourneyOptions[3].max = n-1;\r
     snprintf(title, MSG_SIZ, _("Tournament and Match Options"));\r
 \r
     GenericPopup(hwnd, tourneyOptions);\r