X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwoptions.c;h=0f035b93db102f8880ecb6da5b4bcfcb9758da38;hb=2a9ed786fc7e279874d1fa22a6bcf87d89328d14;hp=dfc1bfbda67a6ea37797b61b23ed0dd84e3eb8b5;hpb=d5c36d4669c2f625af7c280c5a4ebdc4ba284e95;p=xboard.git

diff --git a/winboard/woptions.c b/winboard/woptions.c
old mode 100755
new mode 100644
index dfc1bfb..0f035b9
--- a/winboard/woptions.c
+++ b/winboard/woptions.c
@@ -1,7 +1,7 @@
 /*
  * woptions.c -- Options dialog box routines for WinBoard
  *
- * Copyright 2000,2009 Free Software Foundation, Inc.
+ * Copyright 2000, 2009, 2010 Free Software Foundation, Inc.
  *
  * Enhancements Copyright 2005 Alessandro Scotti
  *
@@ -131,7 +131,6 @@ void SelectComboValue(HANDLE hwndCombo, ComboData *cd, unsigned value);
 VOID SetLoadOptionEnables(HWND hDlg);
 VOID SetSaveOptionEnables(HWND hDlg);
 VOID SetTimeControlEnables(HWND hDlg);
-void NewSettingEvent(int option, char *command, int value);
 
 /*---------------------------------------------------------------------------*\
  *
@@ -146,12 +145,14 @@ GeneralOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
   static Boolean oldShowCoords;
   static Boolean oldBlindfold;
   static Boolean oldShowButtonBar;
+  static Boolean oldAutoLogo;
 
   switch (message) {
   case WM_INITDIALOG: /* message: initialize dialog box */
     oldShowCoords = appData.showCoords;
     oldBlindfold  = appData.blindfold;
     oldShowButtonBar = appData.showButtonBar;
+    oldAutoLogo  = appData.autoLogo;
 
     /* Center the dialog over the application window */
     CenterWindow (hDlg, GetWindow (hDlg, GW_OWNER));
@@ -181,6 +182,7 @@ GeneralOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
     CHECK_BOX(OPT_SaveExtPGN, appData.saveExtendedInfoInPGN);
     CHECK_BOX(OPT_ExtraInfoInMoveHistory, appData.showEvalInMoveHistory);
     CHECK_BOX(OPT_HighlightMoveArrow, appData.highlightMoveWithArrow);
+    CHECK_BOX(OPT_AutoLogo, appData.autoLogo); // [HGM] logo
 
 #undef CHECK_BOX
 
@@ -228,6 +230,7 @@ GeneralOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
       ShowThinkingEvent(); // [HGM] thinking: tests four options
       appData.testLegality         = IS_CHECKED(OPT_TestLegality);
       appData.highlightMoveWithArrow=IS_CHECKED(OPT_HighlightMoveArrow);
+      appData.autoLogo             =IS_CHECKED(OPT_AutoLogo); // [HGM] logo
 
 #undef IS_CHECKED
 
@@ -249,7 +252,10 @@ GeneralOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
        */
       EndDialog(hDlg, TRUE);
 
-      if (oldShowButtonBar != appData.showButtonBar) {
+      if (oldAutoLogo != appData.autoLogo) { // [HGM] logo: remove any logos when we switch autologo off
+	if(oldAutoLogo) first.programLogo = second.programLogo = NULL;
+	InitDrawingSizes(boardSize, 0);
+      } else if (oldShowButtonBar != appData.showButtonBar) {
 	InitDrawingSizes(boardSize, 0);
       } else if ((oldShowCoords != appData.showCoords) || 
 		 (oldBlindfold != appData.blindfold)) {
@@ -774,7 +780,8 @@ VariantWhichRadio(HWND hDlg)
          (IsDlgButtonChecked(hDlg, OPT_VariantGreat) ? VariantGreat :
          (IsDlgButtonChecked(hDlg, OPT_VariantGiveaway) ? VariantGiveaway :
          (IsDlgButtonChecked(hDlg, OPT_VariantTwilight) ? VariantTwilight :
-          VariantNormal ))))))))))))))))))))))))))));
+         (IsDlgButtonChecked(hDlg, OPT_VariantMakruk) ? VariantMakruk :
+          VariantNormal )))))))))))))))))))))))))))));
 }
 
 LRESULT CALLBACK
@@ -873,6 +880,9 @@ NewVariantDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
     case VariantTwilight:
       CheckDlgButton(hDlg, OPT_VariantTwilight, TRUE);
       break;
+    case VariantMakruk:
+      CheckDlgButton(hDlg, OPT_VariantMakruk, TRUE);
+      break;
     default: ;
     }
 
@@ -1166,11 +1176,17 @@ IcsOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
     /* Initialize the dialog items */
 #define CHECK_BOX(x,y) CheckDlgButton(hDlg, (x), (BOOL)(y))
 
+    CHECK_BOX(OPT_AutoKibitz, appData.autoKibitz);
     CHECK_BOX(OPT_AutoComment, appData.autoComment);
     CHECK_BOX(OPT_AutoObserve, appData.autoObserve);
     CHECK_BOX(OPT_GetMoveList, appData.getMoveList);
     CHECK_BOX(OPT_LocalLineEditing, appData.localLineEditing);
     CHECK_BOX(OPT_QuietPlay, appData.quietPlay);
+    CHECK_BOX(OPT_SeekGraph, appData.seekGraph);
+    CHECK_BOX(OPT_AutoRefresh, appData.autoRefresh);
+    CHECK_BOX(OPT_BgObserve, appData.bgObserve);
+    CHECK_BOX(OPT_DualBoard, appData.dualBoard);
+    CHECK_BOX(OPT_SmartMove, appData.oneClick);
     CHECK_BOX(OPT_Premove, appData.premove);
     CHECK_BOX(OPT_PremoveWhite, appData.premoveWhite);
     CHECK_BOX(OPT_PremoveBlack, appData.premoveBlack);
@@ -1183,6 +1199,7 @@ IcsOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
     SetDlgItemText(hDlg, OPT_IcsAlarmTime, buf);
     SetDlgItemText(hDlg, OPT_PremoveWhiteText, appData.premoveWhiteText);
     SetDlgItemText(hDlg, OPT_PremoveBlackText, appData.premoveBlackText);
+    SetDlgItemText(hDlg, OPT_StartupChatBoxes, appData.chatBoxes);
 
     SendDlgItemMessage(hDlg, OPT_SampleShout,     EM_SETBKGNDCOLOR, 0, cbc);
     SendDlgItemMessage(hDlg, OPT_SampleSShout,    EM_SETBKGNDCOLOR, 0, cbc);
@@ -1244,17 +1261,25 @@ IcsOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
       appData.premove          = IS_CHECKED(OPT_Premove);
       appData.premoveWhite     = IS_CHECKED(OPT_PremoveWhite);
       appData.premoveBlack     = IS_CHECKED(OPT_PremoveBlack);
+      appData.autoKibitz       = IS_CHECKED(OPT_AutoKibitz);
       appData.autoComment      = IS_CHECKED(OPT_AutoComment);
       appData.autoObserve      = IS_CHECKED(OPT_AutoObserve);
       appData.getMoveList      = IS_CHECKED(OPT_GetMoveList);
       appData.localLineEditing = IS_CHECKED(OPT_LocalLineEditing);
       appData.quietPlay        = IS_CHECKED(OPT_QuietPlay);
+      appData.seekGraph        = IS_CHECKED(OPT_SeekGraph);
+      appData.autoRefresh      = IS_CHECKED(OPT_AutoRefresh);
+      appData.bgObserve        = IS_CHECKED(OPT_BgObserve);
+      appData.dualBoard        = IS_CHECKED(OPT_DualBoard);
+      appData.oneClick         = IS_CHECKED(OPT_SmartMove);
 
 #undef IS_CHECKED
 
       appData.icsAlarmTime = number * 1000;
       GetDlgItemText(hDlg, OPT_PremoveWhiteText, appData.premoveWhiteText, 5);
       GetDlgItemText(hDlg, OPT_PremoveBlackText, appData.premoveBlackText, 5);
+      GetDlgItemText(hDlg, OPT_StartupChatBoxes, buf, sizeof(buf));
+      buf[sizeof(buf)-1] = NULLCHAR; appData.chatBoxes = StrSave(buf); // memory leak
 
       if (appData.localLineEditing) {
 	DontEcho();
@@ -2793,8 +2818,8 @@ LRESULT CALLBACK EnginePlayOptionsDialog(HWND hDlg, UINT message, WPARAM wParam,
       appData.ruleMoves = GetDlgItemInt(hDlg, IDC_RuleMoves, NULL, FALSE );
       appData.drawRepeats = (int) GetDlgItemInt(hDlg, IDC_DrawRepeats, NULL, FALSE );
 
-      appData.firstScoreIsAbsolute  = IS_CHECKED(IDC_ScoreAbs1);
-      appData.secondScoreIsAbsolute = IS_CHECKED(IDC_ScoreAbs2);
+      first.scoreIsAbsolute  = appData.firstScoreIsAbsolute  = IS_CHECKED(IDC_ScoreAbs1);
+      second.scoreIsAbsolute = appData.secondScoreIsAbsolute = IS_CHECKED(IDC_ScoreAbs2);
 
       EndDialog(hDlg, TRUE);
       return TRUE;
@@ -2893,6 +2918,9 @@ LRESULT CALLBACK UciOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM
     // [HGM] book: tick boxes for own book use
     CheckDlgButton( hDlg, IDC_OwnBook1, (BOOL) appData.firstHasOwnBookUCI );
     CheckDlgButton( hDlg, IDC_OwnBook2, (BOOL) appData.secondHasOwnBookUCI );
+    SetDlgItemInt( hDlg, IDC_BookDep, appData.bookDepth, TRUE );
+    SetDlgItemInt( hDlg, IDC_BookStr, appData.bookStrength, TRUE );
+    SetDlgItemInt( hDlg, IDC_Games, appData.defaultMatchGames, TRUE );
 
     SendDlgItemMessage( hDlg, IDC_PolyglotDir, EM_SETSEL, 0, -1 );
 
@@ -2913,10 +2941,13 @@ LRESULT CALLBACK UciOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM
       // [HGM] smp: get nr of cores:
       oldCores = appData.smpCores;
       appData.smpCores = GetDlgItemInt(hDlg, IDC_Cores, NULL, FALSE );
-      if(appData.smpCores != oldCores) NewSettingEvent(FALSE, "cores", appData.smpCores);
+      if(appData.smpCores != oldCores) NewSettingEvent(FALSE, &(first.maxCores), "cores", appData.smpCores);
       // [HGM] book: read tick boxes for own book use
       appData.firstHasOwnBookUCI  = (Boolean) IsDlgButtonChecked( hDlg, IDC_OwnBook1 );
       appData.secondHasOwnBookUCI = (Boolean) IsDlgButtonChecked( hDlg, IDC_OwnBook2 );
+      appData.bookDepth = GetDlgItemInt(hDlg, IDC_BookDep, NULL, FALSE );
+      appData.bookStrength = GetDlgItemInt(hDlg, IDC_BookStr, NULL, FALSE );
+      appData.defaultMatchGames = GetDlgItemInt(hDlg, IDC_Games, NULL, FALSE );
 
       if(gameMode == BeginningOfGame) Reset(TRUE, TRUE);
       EndDialog(hDlg, TRUE);