X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwoptions.c;h=a42b513fffe25ac7784a66899501f3ecaa2850b8;hb=456ca4fea2c7092aaaf14e9bc827e534f96e4d22;hp=d3dba208bd6b0fde1b897c6d5a91371c35861753;hpb=bd85ed7a2aac57e6afa8fdab7f3a13ce22910b18;p=xboard.git

diff --git a/winboard/woptions.c b/winboard/woptions.c
index d3dba20..a42b513 100644
--- a/winboard/woptions.c
+++ b/winboard/woptions.c
@@ -1,7 +1,7 @@
 /*
  * woptions.c -- Options dialog box routines for WinBoard
  *
- * Copyright 2000, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
+ * Copyright 2000, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
  *
  * Enhancements Copyright 2005 Alessandro Scotti
  *
@@ -212,6 +212,9 @@ GeneralOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
     CHECK_BOX(OPT_SmartMove, appData.oneClick); // [HGM] one-click
     CHECK_BOX(OPT_AutoTags, appData.autoDisplayTags); // [HGM]
     CHECK_BOX(OPT_AutoComment, appData.autoDisplayComment); // [HGM]
+    CHECK_BOX(OPT_Headers, appData.headers); // [HGM]
+    CHECK_BOX(OPT_Variations, appData.variations); // [HGM]
+    CHECK_BOX(OPT_AutoExtend, appData.autoExtend); // [HGM]
 
 #undef CHECK_BOX
 
@@ -263,6 +266,9 @@ GeneralOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
       appData.oneClick             =IS_CHECKED(OPT_SmartMove); // [HGM] one-click
       appData.autoDisplayTags      =IS_CHECKED(OPT_AutoTags); // [HGM]
       appData.autoDisplayComment   =IS_CHECKED(OPT_AutoComment); // [HGM]
+      appData.headers              =IS_CHECKED(OPT_Headers); // [HGM]
+      appData.variations           =IS_CHECKED(OPT_Variations); // [HGM]
+      appData.autoExtend           =IS_CHECKED(OPT_AutoExtend); // [HGM]
 
 #undef IS_CHECKED
 
@@ -871,12 +877,12 @@ VariantClass
 VariantWhichRadio(HWND hDlg)
 {
   int i=0, j;
+  *engineVariant = NULLCHAR;
   while((j = radioButton[i++]) != -2) {
 	if(j == -1) continue; // no menu button
 	if(IsDlgButtonChecked(hDlg, j) &&
 	   (appData.noChessProgram || strstr(first.variants, VariantName(i-1)))) return (VariantClass) i-1;
   }
-  *engineVariant = NULLCHAR;
   for(i=0; i<9; i++) { // check for engine-defined variants
     if(IsDlgButtonChecked(hDlg, OPT_EngineVariant+i) ) {
 	GetDlgItemText(hDlg, OPT_EngineVariant+i, engineVariant, MSG_SIZ); // remember name, so we can resolve it later
@@ -889,12 +895,15 @@ VariantWhichRadio(HWND hDlg)
 void
 VariantShowRadio(HWND hDlg)
 {
+  char c = *engineVariant;
   int i=0, j;
   CheckDlgButton(hDlg, radioButton[gameInfo.variant], TRUE);
+  *engineVariant = NULLCHAR; // [HGM] kludge to prevent VariantName will always return engineVariant
   while((j = radioButton[i++]) != -2) {
 	if(j == -1) continue; // no menu button
 	EnableWindow(GetDlgItem(hDlg, j), appData.noChessProgram || strstr(first.variants, VariantName(i-1)));
   }
+  *engineVariant = c;
   for(i=0; i<9; i++) { // initialize engine-defined variants
     char *v = EngineDefinedVariant(&first, i); // get name of #i
     if(v) { // there is such a variant
@@ -3068,6 +3077,8 @@ LRESULT CALLBACK UciOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM
     SetDlgItemInt( hDlg, IDC_Games, appData.defaultMatchGames, TRUE );
 
     SendDlgItemMessage( hDlg, IDC_PolyglotDir, EM_SETSEL, 0, -1 );
+    // [HGM] Yet another ponder duplicate
+    CheckDlgButton( hDlg, OPT_PonderNextMove, (BOOL) appData.ponderNextMove );
 
     return TRUE;
 
@@ -3087,10 +3098,11 @@ LRESULT CALLBACK UciOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM
       GetDlgItemText( hDlg, IDC_BookFile, buf, sizeof(buf) );
       appData.polyglotBook = strdup(buf);
       appData.usePolyglotBook = (Boolean) IsDlgButtonChecked( hDlg, IDC_UseBook );
-      // [HGM] smp: get nr of cores:
+      // [HGM] smp: get nr of cores and ponder:
       oldCores = appData.smpCores;
       appData.smpCores = GetDlgItemInt(hDlg, IDC_Cores, NULL, FALSE );
       if(appData.smpCores != oldCores) NewSettingEvent(FALSE, &(first.maxCores), "cores", appData.smpCores);
+      PonderNextMoveEvent((Boolean) IsDlgButtonChecked( hDlg, OPT_PonderNextMove ));
       // [HGM] book: read tick boxes for own book use
       appData.firstHasOwnBookUCI  = (Boolean) IsDlgButtonChecked( hDlg, IDC_OwnBook1 );
       appData.secondHasOwnBookUCI = (Boolean) IsDlgButtonChecked( hDlg, IDC_OwnBook2 );
@@ -3125,6 +3137,7 @@ LRESULT CALLBACK UciOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM
           ofn.hwndOwner = hDlg;
           ofn.hInstance = hInst;
           ofn.lpstrFilter = filter;
+
           ofn.lpstrFile = buf;
           ofn.nMaxFile = sizeof(buf);
           ofn.lpstrTitle = _("Choose Book");