X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwoptions.c;h=41f090ffcd775412b356406ed45022505ec571fe;hb=0235f1ff0f54978979e94bb8d34ad1a882bbff68;hp=e548360a52276b05ebad57c94be3c6f3061297ee;hpb=92b980ff1f96624f669e2007e2b03a7ff8350f68;p=xboard.git

diff --git a/winboard/woptions.c b/winboard/woptions.c
index e548360..41f090f 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 Free Software Foundation, Inc.
+ * Copyright 2000, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
  *
  * Enhancements Copyright 2005 Alessandro Scotti
  *
@@ -210,6 +210,8 @@ GeneralOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
     CHECK_BOX(OPT_HighlightMoveArrow, appData.highlightMoveWithArrow);
     CHECK_BOX(OPT_AutoLogo, appData.autoLogo); // [HGM] logo
     CHECK_BOX(OPT_SmartMove, appData.oneClick); // [HGM] one-click
+    CHECK_BOX(OPT_AutoTags, appData.autoDisplayTags); // [HGM]
+    CHECK_BOX(OPT_AutoComment, appData.autoDisplayComment); // [HGM]
 
 #undef CHECK_BOX
 
@@ -259,6 +261,8 @@ GeneralOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
       appData.highlightMoveWithArrow=IS_CHECKED(OPT_HighlightMoveArrow);
       appData.autoLogo             =IS_CHECKED(OPT_AutoLogo); // [HGM] logo
       appData.oneClick             =IS_CHECKED(OPT_SmartMove); // [HGM] one-click
+      appData.autoDisplayTags      =IS_CHECKED(OPT_AutoTags); // [HGM]
+      appData.autoDisplayComment   =IS_CHECKED(OPT_AutoComment); // [HGM]
 
 #undef IS_CHECKED
 
@@ -608,8 +612,9 @@ BoardOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 
     lsc = lightSquareColor;
     dsc = darkSquareColor;
-    wpc = whitePieceColor;
-    bpc = blackPieceColor;
+    fonts = appData.useFont;
+    wpc = fonts ? appData.fontBackColorWhite : whitePieceColor;
+    bpc = fonts ? appData.fontForeColorBlack : blackPieceColor;
     hsc = highlightSquareColor;
     phc = premoveHighlightColor;
     mono = appData.monoMode;
@@ -617,7 +622,6 @@ BoardOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
     flip = appData.upsideDown;
     size = boardSize;
     bitmaps = appData.useBitmaps;
-    fonts = appData.useFont;
     grid = appData.overrideLineGap >= 0;
 
     SetBoardOptionEnables(hDlg);
@@ -661,8 +665,8 @@ BoardOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
       if ((mono != appData.monoMode) ||
 	  (lsc  != lightSquareColor) ||
 	  (dsc  != darkSquareColor) ||
-	  (wpc  != whitePieceColor) ||
-	  (bpc  != blackPieceColor) ||
+	  (wpc  != fonts ? appData.fontBackColorWhite : whitePieceColor) ||
+	  (bpc  != fonts ? appData.fontForeColorBlack : blackPieceColor) ||
 	  (hsc  != highlightSquareColor) ||
           (flip != appData.upsideDown) ||
           (white != appData.allWhite) ||
@@ -673,8 +677,13 @@ BoardOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 
 	  lightSquareColor = lsc;
 	  darkSquareColor = dsc;
-	  whitePieceColor = wpc;
-	  blackPieceColor = bpc;
+	  if(fonts) {
+	    appData.fontBackColorWhite = wpc;
+	    appData.fontForeColorBlack = bpc;
+	  } else {
+	    whitePieceColor = wpc;
+	    blackPieceColor = bpc;
+	  }
 	  highlightSquareColor = hsc;
 	  premoveHighlightColor = phc;
 	  appData.monoMode = mono;
@@ -690,6 +699,7 @@ BoardOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
       }
       DeleteObject(pieces[0]);
       DeleteObject(pieces[1]);
+
       DeleteObject(pieces[2]);
       return TRUE;
 
@@ -848,6 +858,7 @@ int radioButton[] = {
     OPT_VariantGreat,
     -1, // Twilight,
     OPT_VariantMakruk,
+    OPT_VariantASEAN,
     OPT_VariantSChess,
     OPT_VariantGrand,
     OPT_VariantSpartan, // Spartan
@@ -1188,6 +1199,7 @@ IcsOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
     CHECK_BOX(OPT_AutoKibitz, appData.autoKibitz);
     CHECK_BOX(OPT_AutoComment, appData.autoComment);
     CHECK_BOX(OPT_AutoObserve, appData.autoObserve);
+    CHECK_BOX(OPT_AutoCreate, appData.autoCreateLogon);
     CHECK_BOX(OPT_GetMoveList, appData.getMoveList);
     CHECK_BOX(OPT_LocalLineEditing, appData.localLineEditing);
     CHECK_BOX(OPT_QuietPlay, appData.quietPlay);
@@ -1273,6 +1285,7 @@ IcsOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
       appData.autoKibitz       = IS_CHECKED(OPT_AutoKibitz);
       appData.autoComment      = IS_CHECKED(OPT_AutoComment);
       appData.autoObserve      = IS_CHECKED(OPT_AutoObserve);
+      appData.autoCreateLogon  = IS_CHECKED(OPT_AutoCreate);
       appData.getMoveList      = IS_CHECKED(OPT_GetMoveList);
       appData.localLineEditing = IS_CHECKED(OPT_LocalLineEditing);
       appData.quietPlay        = IS_CHECKED(OPT_QuietPlay);
@@ -2951,6 +2964,20 @@ VOID EnginePlayOptionsPopup(HWND hwnd)
  * UCI Options Dialog functions
  *
 \*---------------------------------------------------------------------------*/
+INT CALLBACK BrowseCallbackProc(HWND hwnd, 
+                                UINT uMsg,
+                                LPARAM lp, 
+                                LPARAM pData) 
+{
+    switch(uMsg) 
+    {
+      case BFFM_INITIALIZED: 
+        SendMessage(hwnd, BFFM_SETSELECTION, TRUE, (LPARAM)pData);
+        break;
+    }
+    return 0;
+}
+
 BOOL BrowseForFolder( const char * title, char * path )
 {
     BOOL result = FALSE;
@@ -2961,6 +2988,8 @@ BOOL BrowseForFolder( const char * title, char * path )
 
     bi.lpszTitle = title == 0 ? _("Choose Folder") : title;
     bi.ulFlags = BIF_RETURNONLYFSDIRS;
+    bi.lpfn = BrowseCallbackProc;
+    bi.lParam = (LPARAM) path;
 
     pidl = SHBrowseForFolder( &bi );
 
@@ -2980,6 +3009,13 @@ BOOL BrowseForFolder( const char * title, char * path )
     return result;
 }
 
+int
+IsMultiFormat(char *s)
+{
+  char *p = strchr(s, ':');
+  return p && p != s+1;
+}
+
 LRESULT CALLBACK UciOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
   char buf[MAX_PATH];
@@ -2995,7 +3031,10 @@ LRESULT CALLBACK UciOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM
     /* Initialize the dialog items */
     SetDlgItemText( hDlg, IDC_PolyglotDir, appData.polyglotDir );
     SetDlgItemInt( hDlg, IDC_HashSize, appData.defaultHashSize, TRUE );
+    if(appData.defaultPathEGTB[0])
     SetDlgItemText( hDlg, IDC_PathToEGTB, appData.defaultPathEGTB );
+    else
+    SetDlgItemText( hDlg, IDC_PathToEGTB, appData.egtFormats );
     SetDlgItemInt( hDlg, IDC_SizeOfEGTB, appData.defaultCacheSizeEGTB, TRUE );
     CheckDlgButton( hDlg, IDC_UseBook, (BOOL) appData.usePolyglotBook );
     SetDlgItemText( hDlg, IDC_BookFile, appData.polyglotBook );
@@ -3020,7 +3059,11 @@ LRESULT CALLBACK UciOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM
       appData.defaultHashSize = GetDlgItemInt(hDlg, IDC_HashSize, NULL, FALSE );
       appData.defaultCacheSizeEGTB = GetDlgItemInt(hDlg, IDC_SizeOfEGTB, NULL, FALSE );
       GetDlgItemText( hDlg, IDC_PathToEGTB, buf, sizeof(buf) );
-      appData.defaultPathEGTB = strdup(buf);
+      if(IsMultiFormat(buf)) {
+        ASSIGN(appData.egtFormats, buf);
+      } else {
+        ASSIGN(appData.defaultPathEGTB, buf);
+      }
       GetDlgItemText( hDlg, IDC_BookFile, buf, sizeof(buf) );
       appData.polyglotBook = strdup(buf);
       appData.usePolyglotBook = (Boolean) IsDlgButtonChecked( hDlg, IDC_UseBook );