X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwoptions.c;h=94da5b8402c0e1cc5fc14a362a255a5b9ae2ddd7;hb=d9f4b584106f4d7477158476ff792f6fa0b2630a;hp=cf5967d1dbfb5df224a01b7f84872ec428414556;hpb=e5c6d13c4b6b683419f22274f9926cbee67d68f0;p=xboard.git

diff --git a/winboard/woptions.c b/winboard/woptions.c
index cf5967d..94da5b8 100644
--- a/winboard/woptions.c
+++ b/winboard/woptions.c
@@ -135,6 +135,28 @@ VOID SetLoadOptionEnables(HWND hDlg);
 VOID SetSaveOptionEnables(HWND hDlg);
 VOID SetTimeControlEnables(HWND hDlg);
 
+char *
+InterpretFileName(char *buf, char *homeDir)
+{ // [HGM] file name relative to homeDir. (Taken out of SafeOptionsDialog, because it is generally useful)
+  char *result = NULL;
+  if ((isalpha(buf[0]) && buf[1] == ':') ||
+    (buf[0] == '\\' && buf[1] == '\\')) {
+    return strdup(buf);
+  } else {
+    char buf2[MSG_SIZ], buf3[MSG_SIZ];
+    char *dummy;
+    GetCurrentDirectory(MSG_SIZ, buf3);
+    SetCurrentDirectory(homeDir);
+    if (GetFullPathName(buf, MSG_SIZ, buf2, &dummy)) {
+      result = strdup(buf2);
+    } else {
+      result = strdup(buf);
+    }
+    SetCurrentDirectory(buf3);
+  }
+  return result;
+}
+
 /*---------------------------------------------------------------------------*\
  *
  * General Options Dialog functions
@@ -797,6 +819,7 @@ int radioButton[] = {
     -1, // Twilight,
     OPT_VariantMakruk,
     OPT_VariantSChess,
+    OPT_VariantGrand,
     OPT_VariantSpartan, // Spartan
     -2 // sentinel
 };
@@ -1528,6 +1551,7 @@ FontOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
       SetSampleFontText(hDlg, OPT_SampleCommentsFont, &workFont[COMMENT_FONT]);
       SetSampleFontText(hDlg, OPT_SampleConsoleFont, &workFont[CONSOLE_FONT]);
       SetSampleFontText(hDlg, OPT_SampleMoveHistoryFont, &workFont[MOVEHISTORY_FONT]);
+      SetSampleFontText(hDlg, OPT_SampleGameListFont, &workFont[GAMELIST_FONT]);
       firstPaint = FALSE;
     }
     break;
@@ -1556,6 +1580,7 @@ FontOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 	CopyFont(font[i][CONSOLE_FONT],  &workFont[CONSOLE_FONT]);
 	CopyFont(font[i][COMMENT_FONT],  &workFont[COMMENT_FONT]);
 	CopyFont(font[i][MOVEHISTORY_FONT],  &workFont[MOVEHISTORY_FONT]);
+	CopyFont(font[i][GAMELIST_FONT],  &workFont[GAMELIST_FONT]);
       }
       /* end sad necessity */
 
@@ -1645,6 +1670,11 @@ FontOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
       SetSampleFontText(hDlg, OPT_SampleMoveHistoryFont, &workFont[MOVEHISTORY_FONT]);
       break;
 
+    case OPT_ChooseGameListFont:
+      MyCreateFont(hDlg, &workFont[GAMELIST_FONT]);
+      SetSampleFontText(hDlg, OPT_SampleGameListFont, &workFont[GAMELIST_FONT]);
+      break;
+
     case OPT_DefaultFonts:
       for (i=0; i<NUM_FONTS; i++) {
 	DeleteObject(&workFont[i].hf);
@@ -1658,6 +1688,7 @@ FontOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
       SetSampleFontText(hDlg, OPT_SampleCommentsFont, &workFont[COMMENT_FONT]);
       SetSampleFontText(hDlg, OPT_SampleConsoleFont, &workFont[CONSOLE_FONT]);
       SetSampleFontText(hDlg, OPT_SampleMoveHistoryFont, &workFont[MOVEHISTORY_FONT]);
+      SetSampleFontText(hDlg, OPT_SampleGameListFont, &workFont[GAMELIST_FONT]);
       break;
     }
   }
@@ -2111,7 +2142,7 @@ ParseCommSettings(char *arg, DCB *dcb)
   if (cd->label == NULL) goto cant_parse;
   return;
 cant_parse:
-    ExitArgError(_("Can't parse com port settings"), arg);
+    ExitArgError(_("Can't parse com port settings"), arg, TRUE);
 }
 
 
@@ -2360,6 +2391,15 @@ CommPortOptionsPopup(HWND hwnd)
  *
 \*---------------------------------------------------------------------------*/
 
+int
+LoadOptionsWhichRadio(HWND hDlg)
+{
+  return (IsDlgButtonChecked(hDlg, OPT_Exact) ? 1 :
+         (IsDlgButtonChecked(hDlg, OPT_Subset) ? 2 :
+         (IsDlgButtonChecked(hDlg, OPT_Struct) ? 3 :
+         (IsDlgButtonChecked(hDlg, OPT_Material) ? 4 : -1))));
+}
+
 VOID
 SetLoadOptionEnables(HWND hDlg)
 {
@@ -2375,6 +2415,7 @@ LoadOptions(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
   char buf[MSG_SIZ];
   float fnumber;
+  int ok;
 
   switch (message) {
   case WM_INITDIALOG: /* message: initialize dialog box */
@@ -2390,6 +2431,23 @@ LoadOptions(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
       CheckDlgButton(hDlg, OPT_Autostep, FALSE);
     }
     SetLoadOptionEnables(hDlg);
+    SetDlgItemInt(hDlg, OPT_elo1, appData.eloThreshold1, FALSE);
+    SetDlgItemInt(hDlg, OPT_elo2, appData.eloThreshold2, FALSE);
+    SetDlgItemInt(hDlg, OPT_date, appData.dateThreshold, FALSE);
+    switch (appData.searchMode) {
+    case 1:
+      CheckDlgButton(hDlg, OPT_Exact, TRUE);
+      break;
+    case 2:
+      CheckDlgButton(hDlg, OPT_Subset, TRUE);
+      break;
+    case 3:
+      CheckDlgButton(hDlg, OPT_Struct, TRUE);
+      break;
+    case 4:
+      CheckDlgButton(hDlg, OPT_Material, TRUE);
+      break;
+    }
     return TRUE;
 
   case WM_COMMAND: /* message: received a command */
@@ -2407,6 +2465,10 @@ LoadOptions(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
       } else {
 	appData.timeDelay = (float) -1.0;
       }
+      appData.eloThreshold1 = GetDlgItemInt(hDlg, OPT_elo1, &ok, FALSE);
+      appData.eloThreshold2 = GetDlgItemInt(hDlg, OPT_elo2, &ok, FALSE);
+      appData.dateThreshold = GetDlgItemInt(hDlg, OPT_date, &ok, FALSE);
+      appData.searchMode = LoadOptionsWhichRadio(hDlg);
       EndDialog(hDlg, TRUE);
       return TRUE;
 
@@ -2494,7 +2556,7 @@ SaveOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
       if (IsDlgButtonChecked(hDlg, OPT_Autosave)) {
 	appData.autoSaveGames = TRUE;
 	if (IsDlgButtonChecked(hDlg, OPT_AVPrompt)) {
-	  appData.saveGameFile = "";
+	  ASSIGN(appData.saveGameFile, ""); // [HGM] make sure value is ALWAYS in allocated memory
 	} else /*if (IsDlgButtonChecked(hDlg, OPT_AVToFile))*/ {
 	  GetDlgItemText(hDlg, OPT_AVFilename, buf, MSG_SIZ);
 	  if (*buf == NULLCHAR) {
@@ -2502,25 +2564,12 @@ SaveOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 		       _("Option Error"), MB_OK|MB_ICONEXCLAMATION);
 	    return FALSE;
 	  }
-	  if ((isalpha(buf[0]) && buf[1] == ':') ||
-	    (buf[0] == '\\' && buf[1] == '\\')) {
-	    appData.saveGameFile = strdup(buf);
-	  } else {
-	    char buf2[MSG_SIZ], buf3[MSG_SIZ];
-	    char *dummy;
-	    GetCurrentDirectory(MSG_SIZ, buf3);
-	    SetCurrentDirectory(installDir);
-	    if (GetFullPathName(buf, MSG_SIZ, buf2, &dummy)) {
-	      appData.saveGameFile = strdup(buf2);
-	    } else {
-	      appData.saveGameFile = strdup(buf);
-	    }
-	    SetCurrentDirectory(buf3);
-	  }
+	  FREE(appData.saveGameFile);
+	  appData.saveGameFile = InterpretFileName(buf, homeDir);
 	}
       } else {
 	appData.autoSaveGames = FALSE;
-	appData.saveGameFile = "";
+	ASSIGN(appData.saveGameFile, "");
       }
       appData.oldSaveStyle = IsDlgButtonChecked(hDlg, OPT_Old);
       appData.saveOutOfBookInfo = IsDlgButtonChecked( hDlg, OPT_OutOfBookInfo );
@@ -2829,7 +2878,7 @@ VOID EnginePlayOptionsPopup(HWND hwnd)
  * UCI Options Dialog functions
  *
 \*---------------------------------------------------------------------------*/
-static BOOL BrowseForFolder( const char * title, char * path )
+BOOL BrowseForFolder( const char * title, char * path )
 {
     BOOL result = FALSE;
     BROWSEINFO bi;