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

diff --git a/winboard/woptions.c b/winboard/woptions.c
index 94da5b8..34e3800 100644
--- a/winboard/woptions.c
+++ b/winboard/woptions.c
@@ -1,7 +1,8 @@
 /*
  * woptions.c -- Options dialog box routines for WinBoard
  *
- * Copyright 2000, 2009, 2010, 2011 Free Software Foundation, Inc.
+ * Copyright 2000, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Free
+ * Software Foundation, Inc.
  *
  * Enhancements Copyright 2005 Alessandro Scotti
  *
@@ -210,6 +211,11 @@ 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]
+    CHECK_BOX(OPT_Headers, appData.headers); // [HGM]
+    CHECK_BOX(OPT_Variations, appData.variations); // [HGM]
+    CHECK_BOX(OPT_AutoExtend, appData.autoExtend); // [HGM]
 
 #undef CHECK_BOX
 
@@ -259,6 +265,11 @@ 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]
+      appData.headers              =IS_CHECKED(OPT_Headers); // [HGM]
+      appData.variations           =IS_CHECKED(OPT_Variations); // [HGM]
+      appData.autoExtend           =IS_CHECKED(OPT_AutoExtend); // [HGM]
 
 #undef IS_CHECKED
 
@@ -430,7 +441,7 @@ PaintSampleSquare(
   /*
    * clean up
    */
-  SelectObject(hdcMem, oldBrushPiece);
+  SelectObject(hdcMem, oldBrushSquare);
   SelectObject(hdcMem, oldPen);
   DeleteObject(brushPiece);
   DeleteObject(brushPieceDetail);
@@ -516,7 +527,7 @@ BoardOptionsWhichRadio(HWND hDlg)
 LRESULT CALLBACK
 BoardOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
-  static Boolean  mono, white, flip;
+  static Boolean  mono, white, flip, fonts, bitmaps, grid;
   static BoardSize size;
   static COLORREF lsc, dsc, wpc, bpc, hsc, phc;
   static HBITMAP pieces[3];
@@ -593,20 +604,32 @@ BoardOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
     if (appData.upsideDown)
       CheckDlgButton(hDlg, OPT_UpsideDown, TRUE);
 
+    if (appData.useBitmaps)
+      CheckDlgButton(hDlg, OPT_Bitmaps, TRUE);
+
+    if (appData.useFont)
+      CheckDlgButton(hDlg, OPT_PieceFont, TRUE);
+
+    if (appData.overrideLineGap >= 0)
+      CheckDlgButton(hDlg, OPT_Grid, TRUE);
+
     pieces[0] = DoLoadBitmap(hInst, "n", SAMPLE_SQ_SIZE, "s");
     pieces[1] = DoLoadBitmap(hInst, "n", SAMPLE_SQ_SIZE, "w");
     pieces[2] = DoLoadBitmap(hInst, "n", SAMPLE_SQ_SIZE, "o");
 
     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;
     white= appData.allWhite;
     flip = appData.upsideDown;
     size = boardSize;
+    bitmaps = appData.useBitmaps;
+    grid = appData.overrideLineGap >= 0;
 
     SetBoardOptionEnables(hDlg);
     return TRUE;
@@ -644,25 +667,38 @@ BoardOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 	ChangeBoardSize(size);
       }
 
+      if (bitmaps && !appData.useBitmaps) InitTextures();
+
       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) ||
+          (fonts != appData.useFont) ||
+          (bitmaps != appData.useBitmaps) ||
+          (grid != appData.overrideLineGap >= 0) ||
 	  (phc  != premoveHighlightColor)) {
 
 	  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;
           appData.allWhite = white;
           appData.upsideDown = flip;
+          appData.useFont = fonts;
+          appData.useBitmaps = bitmaps;
+          if(grid != appData.overrideLineGap >= 0) appData.overrideLineGap = grid - 1;
 
 	  InitDrawingColors();
 	  InitDrawingSizes(boardSize, 0);
@@ -670,6 +706,7 @@ BoardOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
       }
       DeleteObject(pieces[0]);
       DeleteObject(pieces[1]);
+
       DeleteObject(pieces[2]);
       return TRUE;
 
@@ -755,12 +792,22 @@ BoardOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 
     case OPT_AllWhite:
       white = !white;
-      SetBoardOptionEnables(hDlg);
       break;
 
     case OPT_UpsideDown:
       flip = !flip;
-      SetBoardOptionEnables(hDlg);
+      break;
+
+    case OPT_Bitmaps:
+      bitmaps = !bitmaps;
+      break;
+
+    case OPT_PieceFont:
+      fonts = !fonts;
+      break;
+
+    case OPT_Grid:
+      grid = !grid;
       break;
     }
     break;
@@ -803,7 +850,7 @@ int radioButton[] = {
     -1,
     -1,
     OPT_VariantShogi,
-    OPT_VariantXiangqi,
+    -1, // Chu
     OPT_VariantCourier,
     OPT_VariantGothic,
     OPT_VariantCapablanca,
@@ -821,6 +868,9 @@ int radioButton[] = {
     OPT_VariantSChess,
     OPT_VariantGrand,
     OPT_VariantSpartan, // Spartan
+    OPT_VariantXiangqi,
+    OPT_VariantASEAN,
+    OPT_VariantLion,
     -2 // sentinel
 };
 
@@ -828,22 +878,40 @@ 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;
   }
+  for(i=0; i<15; 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
+	return VariantUnknown;
+    }
+  }
   return gameInfo.variant; // If no button checked, keep old
 }
 
 void
 VariantShowRadio(HWND hDlg)
 {
+  char c = *engineVariant, *v, *p;
   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)));
+	v = VariantName(i-1); p = strstr(first.variants, v);
+	EnableWindow(GetDlgItem(hDlg, j), appData.noChessProgram || p && (!*v || strlen(v) == strlen(p) || p[strlen(v)] == ','));
+  }
+  *engineVariant = c;
+  for(i=0; i<15; i++) { // initialize engine-defined variants
+    char *v = EngineDefinedVariant(&first, i); // get name of #i
+    if(v) { // there is such a variant
+	EnableWindow(GetDlgItem(hDlg, OPT_EngineVariant+i), TRUE);     // and enable the button
+	SetDlgItemText(hDlg, OPT_EngineVariant+i, v);                  // put its name on button
+    } else EnableWindow(GetDlgItem(hDlg, OPT_EngineVariant+i), FALSE); // no such variant; disable button
   }
 }
 
@@ -901,7 +969,7 @@ NewVariantDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
       }
 
       gameInfo.variant = v;
-      appData.variant = VariantName(v);
+      ASSIGN(appData.variant, VariantName(v));
 
       appData.NrFiles = (int) GetDlgItemInt(hDlg, IDC_Files, NULL, FALSE );
       appData.NrRanks = (int) GetDlgItemInt(hDlg, IDC_Ranks, NULL, FALSE );
@@ -914,6 +982,9 @@ NewVariantDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
       shuffleOpenings = FALSE; /* [HGM] shuffle: possible shuffle reset when we switch */
       startedFromPositionFile = FALSE; /* [HGM] loadPos: no longer valid in new variant */
       appData.pieceToCharTable = NULL;
+      ASSIGN(appData.pieceNickNames, "");
+      ASSIGN(appData.colorNickNames, "");
+      ASSIGN(appData.men, "");
       Reset(TRUE, TRUE);
 
       return TRUE;
@@ -1158,6 +1229,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);
@@ -1243,6 +1315,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);
@@ -1360,6 +1433,9 @@ IcsOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
       UpdateSampleText(hDlg, OPT_SampleSeek, &mca[ColorSeek]);
       break;
 
+
+
+
     case OPT_ChooseNormalColor:
       ColorizeTextPopup(hDlg, ColorNormal);
       UpdateSampleText(hDlg, OPT_SampleNormal, &mca[ColorNormal]);
@@ -1434,6 +1510,8 @@ IcsOptionsPopup(HWND hwnd)
  *
 \*---------------------------------------------------------------------------*/
 
+char *string; // sorry
+
 VOID
 SetSampleFontText(HWND hwnd, int id, const MyFont *mf)
 {
@@ -1451,7 +1529,9 @@ SetSampleFontText(HWND hwnd, int id, const MyFont *mf)
 		 mf->mfp.pointSize, mf->mfp.faceName,
 		 mf->mfp.bold ? " bold" : "",
 		 mf->mfp.italic ? " italic" : "");
+ if(id != OPT_SamplePieceFont)
   SetDlgItemText(hwnd, id, buf);
+ else SetDlgItemText(hwnd, id, string);
 
   hControl = GetDlgItem(hwnd, id);
   hdc = GetDC(hControl);
@@ -1488,6 +1568,7 @@ SetSampleFontText(HWND hwnd, int id, const MyFont *mf)
 
   /* format the text in the rich edit control */
   SendMessage(hControl, EM_SETCHARFORMAT, SCF_ALL, (LPARAM) &cf);
+ if(id != OPT_SamplePieceFont)
   SendMessage(hControl, EM_SETRECT, (WPARAM)0, (LPARAM) &rectFormat);
 
   /* clean up */
@@ -1512,8 +1593,9 @@ CopyFont(MyFont *dest, const MyFont *src)
 LRESULT CALLBACK
 FontOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
-  static MyFont workFont[NUM_FONTS];
+  static MyFont workFont[NUM_FONTS+1];
   static BOOL firstPaint;
+  static char pieceText[] = "ABCDEFGHIJKLMNOPQRSTUVWXZabcdefghijklmnopqrstuvwxyz";
   int i;
   RECT rect;
 
@@ -1523,6 +1605,9 @@ FontOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
     /* copy the current font settings into a working copy */
     for (i=0; i < NUM_FONTS; i++)
       CopyFont(&workFont[i], font[boardSize][i]);
+    strncpy(workFont[NUM_FONTS].mfp.faceName, appData.renderPiecesWithFont, sizeof(workFont[NUM_FONTS].mfp.faceName));
+    workFont[NUM_FONTS].mfp.pointSize = 16.;
+    workFont[NUM_FONTS].mfp.charset = DEFAULT_CHARSET;
 
     Translate(hDlg, DLG_Fonts);
     if (!appData.icsActive)
@@ -1552,6 +1637,8 @@ FontOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
       SetSampleFontText(hDlg, OPT_SampleConsoleFont, &workFont[CONSOLE_FONT]);
       SetSampleFontText(hDlg, OPT_SampleMoveHistoryFont, &workFont[MOVEHISTORY_FONT]);
       SetSampleFontText(hDlg, OPT_SampleGameListFont, &workFont[GAMELIST_FONT]);
+      string = appData.fontToPieceTable;
+      SetSampleFontText(hDlg, OPT_SamplePieceFont, &workFont[NUM_FONTS]);
       firstPaint = FALSE;
     }
     break;
@@ -1567,6 +1654,13 @@ FontOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
       for (i=0; i < NUM_FONTS; i++)
 	CopyFont(font[boardSize][i], &workFont[i]);
 
+      { // Make new piece-to-char table
+	char buf[MSG_SIZ];
+	GetDlgItemText(hDlg, OPT_SamplePieceFont, buf, MSG_SIZ);
+	ASSIGN(appData.fontToPieceTable, buf);
+      }
+      ASSIGN(appData.renderPiecesWithFont, workFont[NUM_FONTS].mfp.faceName); // piece font
+
       /* a sad necessity due to the original design of having a separate
        * console font, tags font, and comment font for each board size.  IMHO
        * these fonts should not be dependent on the current board size.  I'm
@@ -1675,6 +1769,12 @@ FontOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
       SetSampleFontText(hDlg, OPT_SampleGameListFont, &workFont[GAMELIST_FONT]);
       break;
 
+    case OPT_ChoosePieceFont:
+      MyCreateFont(hDlg, &workFont[NUM_FONTS]);
+      string = pieceText;
+      SetSampleFontText(hDlg, OPT_SamplePieceFont, &workFont[NUM_FONTS]);
+      break;
+
     case OPT_DefaultFonts:
       for (i=0; i<NUM_FONTS; i++) {
 	DeleteObject(&workFont[i].hf);
@@ -1714,6 +1814,7 @@ FontsOptionsPopup(HWND hwnd)
 SoundComboData soundComboData[] = {
   {N_("Move"), NULL},
   {N_("Bell"), NULL},
+  {N_("Roar"), NULL},
   {N_("ICS Alarm"), NULL},
   {N_("ICS Win"), NULL},
   {N_("ICS Loss"), NULL},
@@ -2397,7 +2498,9 @@ 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))));
+         (IsDlgButtonChecked(hDlg, OPT_Material) ? 4 :
+         (IsDlgButtonChecked(hDlg, OPT_Range) ? 5 :
+         (IsDlgButtonChecked(hDlg, OPT_Difference) ? 6 : -1))))));
 }
 
 VOID
@@ -2434,6 +2537,10 @@ LoadOptions(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
     SetDlgItemInt(hDlg, OPT_elo1, appData.eloThreshold1, FALSE);
     SetDlgItemInt(hDlg, OPT_elo2, appData.eloThreshold2, FALSE);
     SetDlgItemInt(hDlg, OPT_date, appData.dateThreshold, FALSE);
+    SetDlgItemInt(hDlg, OPT_Stretch, appData.stretch, FALSE);
+    CheckDlgButton(hDlg, OPT_Reversed, appData.ignoreColors);
+    CheckDlgButton(hDlg, OPT_Mirror, appData.findMirror);
+    SetDlgItemText(hDlg, OPT_Counts,  "");
     switch (appData.searchMode) {
     case 1:
       CheckDlgButton(hDlg, OPT_Exact, TRUE);
@@ -2447,6 +2554,12 @@ LoadOptions(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
     case 4:
       CheckDlgButton(hDlg, OPT_Material, TRUE);
       break;
+    case 5:
+      CheckDlgButton(hDlg, OPT_Range, TRUE);
+      break;
+    case 6:
+      CheckDlgButton(hDlg, OPT_Difference, TRUE);
+      break;
     }
     return TRUE;
 
@@ -2468,7 +2581,14 @@ LoadOptions(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
       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.stretch = GetDlgItemInt(hDlg, OPT_Stretch, &ok, FALSE);
       appData.searchMode = LoadOptionsWhichRadio(hDlg);
+      appData.ignoreColors = IsDlgButtonChecked(hDlg, OPT_Reversed);
+      appData.findMirror   = IsDlgButtonChecked(hDlg, OPT_Mirror);
+      GetDlgItemText(hDlg, OPT_Counts, buf, MSG_SIZ);
+      appData.minPieces = appData.maxPieces = 0;
+      sscanf(buf, "%d-%d", &appData.minPieces, &appData.maxPieces);
+      if(appData.maxPieces < appData.minPieces) appData.maxPieces = appData.minPieces;
       EndDialog(hDlg, TRUE);
       return TRUE;
 
@@ -2639,7 +2759,8 @@ LRESULT CALLBACK
 TimeControl(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
   char buf[MSG_SIZ], *tc;
-  int mps, increment, odds1, odds2, st;
+  int mps, odds1, odds2, st;
+  float increment;
   BOOL ok, ok2;
 
   switch (message) {
@@ -2648,7 +2769,7 @@ TimeControl(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
     CenterWindow (hDlg, GetWindow (hDlg, GW_OWNER));
     Translate(hDlg, DLG_TimeControl);
     /* Initialize the dialog items */
-    if (appData.clockMode && !appData.icsActive) {
+    if (/*appData.clockMode &&*/ !appData.icsActive) { // [HGM] even if !clockMode, we could want to set it in tournament dialog
       if (searchTime) {
 	CheckRadioButton(hDlg, OPT_TCUseMoves, OPT_TCUseFixed,
 			 OPT_TCUseFixed);
@@ -2663,12 +2784,15 @@ TimeControl(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 	SetDlgItemText(hDlg, OPT_TCTime2, "");
 	SetDlgItemText(hDlg, OPT_TCInc, "");
       } else {
+	int i = appData.timeIncrement;
+	if(i == appData.timeIncrement) snprintf(buf, MSG_SIZ, "%d", i);
+	else snprintf(buf, MSG_SIZ, "%4.2f", appData.timeIncrement);
 	CheckRadioButton(hDlg, OPT_TCUseMoves, OPT_TCUseFixed,
 			 OPT_TCUseInc);
 	SetDlgItemText(hDlg, OPT_TCTime, "");
 	SetDlgItemText(hDlg, OPT_TCMoves, "");
 	SetDlgItemText(hDlg, OPT_TCTime2, appData.timeControl);
-	SetDlgItemInt(hDlg, OPT_TCInc, appData.timeIncrement, FALSE);
+	SetDlgItemText(hDlg, OPT_TCInc, buf);
       }
       SetDlgItemInt(hDlg, OPT_TCOdds1, 1, FALSE);
       SetDlgItemInt(hDlg, OPT_TCOdds2, 1, FALSE);
@@ -2708,7 +2832,8 @@ TimeControl(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 	}
       tc = buf;
       } else {
-	increment = GetDlgItemInt(hDlg, OPT_TCInc, &ok, FALSE);
+	GetDlgItemText(hDlg, OPT_TCInc, buf, MSG_SIZ);
+	ok = (sscanf(buf, "%f%c", &increment, buf) == 1);
 	if (!ok || increment < 0) {
 	  MessageBox(hDlg, _("Invalid increment"),
 		     _("Option Error"), MB_OK|MB_ICONEXCLAMATION);
@@ -2878,6 +3003,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;
@@ -2888,6 +3027,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 );
 
@@ -2907,6 +3048,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];
@@ -2922,7 +3070,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 );
@@ -2936,6 +3087,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;
 
@@ -2947,14 +3100,19 @@ 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 );
-      // [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 );
@@ -2989,6 +3147,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");