/*\r
* woptions.c -- Options dialog box routines for WinBoard\r
*\r
- * Copyright 2000, 2009, 2010 Free Software Foundation, Inc.\r
+ * Copyright 2000, 2009, 2010, 2011 Free Software Foundation, Inc.\r
*\r
* Enhancements Copyright 2005 Alessandro Scotti\r
*\r
VOID SetSaveOptionEnables(HWND hDlg);\r
VOID SetTimeControlEnables(HWND hDlg);\r
\r
+char *\r
+InterpretFileName(char *buf, char *homeDir)\r
+{ // [HGM] file name relative to homeDir. (Taken out of SafeOptionsDialog, because it is generally useful)\r
+ char *result = NULL;\r
+ if ((isalpha(buf[0]) && buf[1] == ':') ||\r
+ (buf[0] == '\\' && buf[1] == '\\')) {\r
+ return strdup(buf);\r
+ } else {\r
+ char buf2[MSG_SIZ], buf3[MSG_SIZ];\r
+ char *dummy;\r
+ GetCurrentDirectory(MSG_SIZ, buf3);\r
+ SetCurrentDirectory(homeDir);\r
+ if (GetFullPathName(buf, MSG_SIZ, buf2, &dummy)) {\r
+ result = strdup(buf2);\r
+ } else {\r
+ result = strdup(buf);\r
+ }\r
+ SetCurrentDirectory(buf3);\r
+ }\r
+ return result;\r
+}\r
+\r
/*---------------------------------------------------------------------------*\\r
*\r
* General Options Dialog functions\r
CHECK_BOX(OPT_ExtraInfoInMoveHistory, appData.showEvalInMoveHistory);\r
CHECK_BOX(OPT_HighlightMoveArrow, appData.highlightMoveWithArrow);\r
CHECK_BOX(OPT_AutoLogo, appData.autoLogo); // [HGM] logo\r
+ CHECK_BOX(OPT_SmartMove, appData.oneClick); // [HGM] one-click\r
\r
#undef CHECK_BOX\r
\r
appData.testLegality = IS_CHECKED(OPT_TestLegality);\r
appData.highlightMoveWithArrow=IS_CHECKED(OPT_HighlightMoveArrow);\r
appData.autoLogo =IS_CHECKED(OPT_AutoLogo); // [HGM] logo\r
+ appData.oneClick =IS_CHECKED(OPT_SmartMove); // [HGM] one-click\r
\r
#undef IS_CHECKED\r
\r
LRESULT CALLBACK\r
BoardOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)\r
{\r
- static Boolean mono, white, flip;\r
+ static Boolean mono, white, flip, fonts, bitmaps;\r
static BoardSize size;\r
static COLORREF lsc, dsc, wpc, bpc, hsc, phc;\r
static HBITMAP pieces[3];\r
if (appData.upsideDown)\r
CheckDlgButton(hDlg, OPT_UpsideDown, TRUE);\r
\r
+ if (appData.useBitmaps)\r
+ CheckDlgButton(hDlg, OPT_Bitmaps, TRUE);\r
+\r
+ if (appData.useFont)\r
+ CheckDlgButton(hDlg, OPT_PieceFont, TRUE);\r
+\r
pieces[0] = DoLoadBitmap(hInst, "n", SAMPLE_SQ_SIZE, "s");\r
pieces[1] = DoLoadBitmap(hInst, "n", SAMPLE_SQ_SIZE, "w");\r
pieces[2] = DoLoadBitmap(hInst, "n", SAMPLE_SQ_SIZE, "o");\r
white= appData.allWhite;\r
flip = appData.upsideDown;\r
size = boardSize;\r
+ bitmaps = appData.useBitmaps;\r
+ fonts = appData.useFont;\r
\r
SetBoardOptionEnables(hDlg);\r
return TRUE;\r
ChangeBoardSize(size);\r
}\r
\r
+ if (bitmaps && !appData.useBitmaps) InitTextures();\r
+\r
if ((mono != appData.monoMode) ||\r
(lsc != lightSquareColor) ||\r
(dsc != darkSquareColor) ||\r
(hsc != highlightSquareColor) ||\r
(flip != appData.upsideDown) ||\r
(white != appData.allWhite) ||\r
+ (fonts != appData.useFont) ||\r
+ (bitmaps != appData.useBitmaps) ||\r
(phc != premoveHighlightColor)) {\r
\r
lightSquareColor = lsc;\r
appData.monoMode = mono;\r
appData.allWhite = white;\r
appData.upsideDown = flip;\r
+ appData.useFont = fonts;\r
+ appData.useBitmaps = bitmaps;\r
\r
InitDrawingColors();\r
InitDrawingSizes(boardSize, 0);\r
\r
case OPT_AllWhite:\r
white = !white;\r
- SetBoardOptionEnables(hDlg);\r
break;\r
\r
case OPT_UpsideDown:\r
flip = !flip;\r
- SetBoardOptionEnables(hDlg);\r
+ break;\r
+\r
+ case OPT_Bitmaps:\r
+ bitmaps = !bitmaps;\r
+ break;\r
+\r
+ case OPT_PieceFont:\r
+ fonts = !fonts;\r
break;\r
}\r
break;\r
FreeProcInstance(lpProc);\r
}\r
\r
+int radioButton[] = {\r
+ OPT_VariantNormal,\r
+ -1, // Loadable\r
+ OPT_VariantWildcastle,\r
+ OPT_VariantNocastle,\r
+ OPT_VariantFRC,\r
+ OPT_VariantBughouse,\r
+ OPT_VariantCrazyhouse,\r
+ OPT_VariantLosers,\r
+ OPT_VariantSuicide,\r
+ OPT_VariantGiveaway,\r
+ OPT_VariantTwoKings,\r
+ -1, //Kriegspiel\r
+ OPT_VariantAtomic,\r
+ OPT_Variant3Check,\r
+ OPT_VariantShatranj,\r
+ -1,\r
+ -1,\r
+ -1,\r
+ -1,\r
+ -1,\r
+ -1,\r
+ -1,\r
+ -1,\r
+ OPT_VariantShogi,\r
+ OPT_VariantXiangqi,\r
+ OPT_VariantCourier,\r
+ OPT_VariantGothic,\r
+ OPT_VariantCapablanca,\r
+ OPT_VariantKnightmate,\r
+ OPT_VariantFairy, \r
+ OPT_VariantCylinder,\r
+ OPT_VariantFalcon,\r
+ OPT_VariantCRC,\r
+ OPT_VariantBerolina,\r
+ OPT_VariantJanus,\r
+ OPT_VariantSuper,\r
+ OPT_VariantGreat,\r
+ -1, // Twilight,\r
+ OPT_VariantMakruk,\r
+ OPT_VariantSChess,\r
+ OPT_VariantGrand,\r
+ OPT_VariantSpartan, // Spartan\r
+ -2 // sentinel\r
+};\r
+\r
VariantClass\r
VariantWhichRadio(HWND hDlg)\r
{\r
- return (IsDlgButtonChecked(hDlg, OPT_VariantFairy) ? VariantFairy :\r
- (IsDlgButtonChecked(hDlg, OPT_VariantGothic) ? VariantGothic :\r
- (IsDlgButtonChecked(hDlg, OPT_VariantCrazyhouse) ? VariantCrazyhouse :\r
- (IsDlgButtonChecked(hDlg, OPT_VariantBughouse) ? VariantBughouse :\r
- (IsDlgButtonChecked(hDlg, OPT_VariantCourier) ? VariantCourier :\r
- (IsDlgButtonChecked(hDlg, OPT_VariantShatranj) ? VariantShatranj :\r
- (IsDlgButtonChecked(hDlg, OPT_VariantShogi) ? VariantShogi :\r
- (IsDlgButtonChecked(hDlg, OPT_VariantXiangqi) ? VariantXiangqi :\r
- (IsDlgButtonChecked(hDlg, OPT_VariantCapablanca) ? VariantCapablanca :\r
- (IsDlgButtonChecked(hDlg, OPT_VariantTwoKings) ? VariantTwoKings :\r
- (IsDlgButtonChecked(hDlg, OPT_VariantKnightmate) ? VariantKnightmate :\r
- (IsDlgButtonChecked(hDlg, OPT_VariantLosers) ? VariantLosers :\r
- (IsDlgButtonChecked(hDlg, OPT_VariantSuicide) ? VariantSuicide :\r
- (IsDlgButtonChecked(hDlg, OPT_VariantAtomic) ? VariantAtomic :\r
- (IsDlgButtonChecked(hDlg, OPT_VariantShatranj) ? VariantShatranj :\r
- (IsDlgButtonChecked(hDlg, OPT_VariantFRC) ? VariantFischeRandom :\r
- (IsDlgButtonChecked(hDlg, OPT_VariantCylinder) ? VariantCylinder :\r
- (IsDlgButtonChecked(hDlg, OPT_VariantFalcon) ? VariantFalcon :\r
- (IsDlgButtonChecked(hDlg, OPT_VariantCRC) ? VariantCapaRandom :\r
- (IsDlgButtonChecked(hDlg, OPT_VariantSuper) ? VariantSuper :\r
- (IsDlgButtonChecked(hDlg, OPT_VariantBerolina) ? VariantBerolina :\r
- (IsDlgButtonChecked(hDlg, OPT_VariantJanus) ? VariantJanus :\r
- (IsDlgButtonChecked(hDlg, OPT_VariantWildcastle) ? VariantWildCastle :\r
- (IsDlgButtonChecked(hDlg, OPT_VariantNocastle) ? VariantNoCastle :\r
- (IsDlgButtonChecked(hDlg, OPT_Variant3Check) ? Variant3Check :\r
- (IsDlgButtonChecked(hDlg, OPT_VariantGreat) ? VariantGreat :\r
- (IsDlgButtonChecked(hDlg, OPT_VariantGiveaway) ? VariantGiveaway :\r
- (IsDlgButtonChecked(hDlg, OPT_VariantTwilight) ? VariantTwilight :\r
- (IsDlgButtonChecked(hDlg, OPT_VariantMakruk) ? VariantMakruk :\r
- (IsDlgButtonChecked(hDlg, OPT_VariantSChess) ? VariantSChess :\r
- VariantNormal ))))))))))))))))))))))))))))));\r
+ int i=0, j;\r
+ while((j = radioButton[i++]) != -2) {\r
+ if(j == -1) continue; // no menu button\r
+ if(IsDlgButtonChecked(hDlg, j) &&\r
+ (appData.noChessProgram || strstr(first.variants, VariantName(i-1)))) return (VariantClass) i-1;\r
+ }\r
+ return gameInfo.variant; // If no button checked, keep old\r
+}\r
+\r
+void\r
+VariantShowRadio(HWND hDlg)\r
+{\r
+ int i=0, j;\r
+ CheckDlgButton(hDlg, radioButton[gameInfo.variant], TRUE);\r
+ while((j = radioButton[i++]) != -2) {\r
+ if(j == -1) continue; // no menu button\r
+ EnableWindow(GetDlgItem(hDlg, j), appData.noChessProgram || strstr(first.variants, VariantName(i-1)));\r
+ }\r
}\r
\r
LRESULT CALLBACK\r
/* Center the dialog over the application window */\r
CenterWindow (hDlg, GetWindow (hDlg, GW_OWNER));\r
Translate(hDlg, DLG_NewVariant);\r
+\r
/* Initialize the dialog items */\r
- switch (gameInfo.variant) {\r
- case VariantNormal:\r
- CheckDlgButton(hDlg, OPT_VariantNormal, TRUE);\r
- break;\r
- case VariantCrazyhouse:\r
- CheckDlgButton(hDlg, OPT_VariantCrazyhouse, TRUE);\r
- break;\r
- case VariantBughouse:\r
- CheckDlgButton(hDlg, OPT_VariantBughouse, TRUE);\r
- break;\r
- case VariantShogi:\r
- CheckDlgButton(hDlg, OPT_VariantShogi, TRUE);\r
- break;\r
- case VariantXiangqi:\r
- CheckDlgButton(hDlg, OPT_VariantXiangqi, TRUE);\r
- break;\r
- case VariantCapablanca:\r
- CheckDlgButton(hDlg, OPT_VariantCapablanca, TRUE);\r
- break;\r
- case VariantGothic:\r
- CheckDlgButton(hDlg, OPT_VariantGothic, TRUE);\r
- break;\r
- case VariantCourier:\r
- CheckDlgButton(hDlg, OPT_VariantCourier, TRUE);\r
- break;\r
- case VariantKnightmate:\r
- CheckDlgButton(hDlg, OPT_VariantKnightmate, TRUE);\r
- break;\r
- case VariantTwoKings:\r
- CheckDlgButton(hDlg, OPT_VariantTwoKings, TRUE);\r
- break;\r
- case VariantFairy:\r
- CheckDlgButton(hDlg, OPT_VariantFairy, TRUE);\r
- break;\r
- case VariantAtomic:\r
- CheckDlgButton(hDlg, OPT_VariantAtomic, TRUE);\r
- break;\r
- case VariantSuicide:\r
- CheckDlgButton(hDlg, OPT_VariantSuicide, TRUE);\r
- break;\r
- case VariantLosers:\r
- CheckDlgButton(hDlg, OPT_VariantLosers, TRUE);\r
- break;\r
- case VariantShatranj:\r
- CheckDlgButton(hDlg, OPT_VariantShatranj, TRUE);\r
- break;\r
- case VariantFischeRandom:\r
- CheckDlgButton(hDlg, OPT_VariantFRC, TRUE);\r
- break;\r
- case VariantCapaRandom:\r
- CheckDlgButton(hDlg, OPT_VariantCRC, TRUE);\r
- break;\r
- case VariantFalcon:\r
- CheckDlgButton(hDlg, OPT_VariantFalcon, TRUE);\r
- break;\r
- case VariantCylinder:\r
- CheckDlgButton(hDlg, OPT_VariantCylinder, TRUE);\r
- break;\r
- case Variant3Check:\r
- CheckDlgButton(hDlg, OPT_Variant3Check, TRUE);\r
- break;\r
- case VariantSuper:\r
- CheckDlgButton(hDlg, OPT_VariantSuper, TRUE);\r
- break;\r
- case VariantBerolina:\r
- CheckDlgButton(hDlg, OPT_VariantBerolina, TRUE);\r
- break;\r
- case VariantJanus:\r
- CheckDlgButton(hDlg, OPT_VariantJanus, TRUE);\r
- break;\r
- case VariantWildCastle:\r
- CheckDlgButton(hDlg, OPT_VariantWildcastle, TRUE);\r
- break;\r
- case VariantNoCastle:\r
- CheckDlgButton(hDlg, OPT_VariantNocastle, TRUE);\r
- break;\r
- case VariantGreat:\r
- CheckDlgButton(hDlg, OPT_VariantGreat, TRUE);\r
- break;\r
- case VariantGiveaway:\r
- CheckDlgButton(hDlg, OPT_VariantGiveaway, TRUE);\r
- break;\r
- case VariantTwilight:\r
- CheckDlgButton(hDlg, OPT_VariantTwilight, TRUE);\r
- break;\r
- case VariantMakruk:\r
- CheckDlgButton(hDlg, OPT_VariantMakruk, TRUE);\r
- break;\r
- case VariantSChess:\r
- CheckDlgButton(hDlg, OPT_VariantSChess, TRUE);\r
- break;\r
- default: ;\r
- }\r
+ VariantShowRadio(hDlg);\r
\r
SetDlgItemInt( hDlg, IDC_Files, -1, TRUE );\r
SendDlgItemMessage( hDlg, IDC_Files, EM_SETSEL, 0, -1 );\r
*\r
\*---------------------------------------------------------------------------*/\r
\r
+char *string; // sorry\r
+\r
VOID\r
SetSampleFontText(HWND hwnd, int id, const MyFont *mf)\r
{\r
mf->mfp.pointSize, mf->mfp.faceName,\r
mf->mfp.bold ? " bold" : "",\r
mf->mfp.italic ? " italic" : "");\r
+ if(id != OPT_SamplePieceFont)\r
SetDlgItemText(hwnd, id, buf);\r
+ else SetDlgItemText(hwnd, id, string);\r
\r
hControl = GetDlgItem(hwnd, id);\r
hdc = GetDC(hControl);\r
\r
/* format the text in the rich edit control */\r
SendMessage(hControl, EM_SETCHARFORMAT, SCF_ALL, (LPARAM) &cf);\r
+ if(id != OPT_SamplePieceFont)\r
SendMessage(hControl, EM_SETRECT, (WPARAM)0, (LPARAM) &rectFormat);\r
\r
/* clean up */\r
LRESULT CALLBACK\r
FontOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)\r
{\r
- static MyFont workFont[NUM_FONTS];\r
+ static MyFont workFont[NUM_FONTS+1];\r
static BOOL firstPaint;\r
+ static char pieceText[] = "ABCDEFGHIJKLMNOPQRSTUVWXZabcdefghijklmnopqrstuvwxyz";\r
int i;\r
RECT rect;\r
\r
/* copy the current font settings into a working copy */\r
for (i=0; i < NUM_FONTS; i++)\r
CopyFont(&workFont[i], font[boardSize][i]);\r
+ strncpy(workFont[NUM_FONTS].mfp.faceName, appData.renderPiecesWithFont, sizeof(workFont[NUM_FONTS].mfp.faceName));\r
+ workFont[NUM_FONTS].mfp.pointSize = 16.;\r
+ workFont[NUM_FONTS].mfp.charset = DEFAULT_CHARSET;\r
\r
Translate(hDlg, DLG_Fonts);\r
if (!appData.icsActive)\r
SetSampleFontText(hDlg, OPT_SampleCommentsFont, &workFont[COMMENT_FONT]);\r
SetSampleFontText(hDlg, OPT_SampleConsoleFont, &workFont[CONSOLE_FONT]);\r
SetSampleFontText(hDlg, OPT_SampleMoveHistoryFont, &workFont[MOVEHISTORY_FONT]);\r
+ SetSampleFontText(hDlg, OPT_SampleGameListFont, &workFont[GAMELIST_FONT]);\r
+ string = appData.fontToPieceTable;\r
+ SetSampleFontText(hDlg, OPT_SamplePieceFont, &workFont[NUM_FONTS]);\r
firstPaint = FALSE;\r
}\r
break;\r
for (i=0; i < NUM_FONTS; i++)\r
CopyFont(font[boardSize][i], &workFont[i]);\r
\r
+ { // Make new piece-to-char table\r
+ char buf[MSG_SIZ];\r
+ GetDlgItemText(hDlg, OPT_SamplePieceFont, buf, MSG_SIZ);\r
+ ASSIGN(appData.fontToPieceTable, buf);\r
+ }\r
+ ASSIGN(appData.renderPiecesWithFont, workFont[NUM_FONTS].mfp.faceName); // piece font\r
+\r
/* a sad necessity due to the original design of having a separate\r
* console font, tags font, and comment font for each board size. IMHO\r
* these fonts should not be dependent on the current board size. I'm\r
CopyFont(font[i][CONSOLE_FONT], &workFont[CONSOLE_FONT]);\r
CopyFont(font[i][COMMENT_FONT], &workFont[COMMENT_FONT]);\r
CopyFont(font[i][MOVEHISTORY_FONT], &workFont[MOVEHISTORY_FONT]);\r
+ CopyFont(font[i][GAMELIST_FONT], &workFont[GAMELIST_FONT]);\r
}\r
/* end sad necessity */\r
\r
SetSampleFontText(hDlg, OPT_SampleMoveHistoryFont, &workFont[MOVEHISTORY_FONT]);\r
break;\r
\r
+ case OPT_ChooseGameListFont:\r
+ MyCreateFont(hDlg, &workFont[GAMELIST_FONT]);\r
+ SetSampleFontText(hDlg, OPT_SampleGameListFont, &workFont[GAMELIST_FONT]);\r
+ break;\r
+\r
+ case OPT_ChoosePieceFont:\r
+ MyCreateFont(hDlg, &workFont[NUM_FONTS]);\r
+ string = pieceText;\r
+ SetSampleFontText(hDlg, OPT_SamplePieceFont, &workFont[NUM_FONTS]);\r
+ break;\r
+\r
case OPT_DefaultFonts:\r
for (i=0; i<NUM_FONTS; i++) {\r
DeleteObject(&workFont[i].hf);\r
SetSampleFontText(hDlg, OPT_SampleCommentsFont, &workFont[COMMENT_FONT]);\r
SetSampleFontText(hDlg, OPT_SampleConsoleFont, &workFont[CONSOLE_FONT]);\r
SetSampleFontText(hDlg, OPT_SampleMoveHistoryFont, &workFont[MOVEHISTORY_FONT]);\r
+ SetSampleFontText(hDlg, OPT_SampleGameListFont, &workFont[GAMELIST_FONT]);\r
break;\r
}\r
}\r
if (cd->label == NULL) goto cant_parse;\r
return;\r
cant_parse:\r
- ExitArgError(_("Can't parse com port settings"), arg);\r
+ ExitArgError(_("Can't parse com port settings"), arg, TRUE);\r
}\r
\r
\r
*\r
\*---------------------------------------------------------------------------*/\r
\r
+int\r
+LoadOptionsWhichRadio(HWND hDlg)\r
+{\r
+ return (IsDlgButtonChecked(hDlg, OPT_Exact) ? 1 :\r
+ (IsDlgButtonChecked(hDlg, OPT_Subset) ? 2 :\r
+ (IsDlgButtonChecked(hDlg, OPT_Struct) ? 3 :\r
+ (IsDlgButtonChecked(hDlg, OPT_Material) ? 4 :\r
+ (IsDlgButtonChecked(hDlg, OPT_Range) ? 5 :\r
+ (IsDlgButtonChecked(hDlg, OPT_Difference) ? 6 : -1))))));\r
+}\r
+\r
VOID\r
SetLoadOptionEnables(HWND hDlg)\r
{\r
{\r
char buf[MSG_SIZ];\r
float fnumber;\r
+ int ok;\r
\r
switch (message) {\r
case WM_INITDIALOG: /* message: initialize dialog box */\r
CheckDlgButton(hDlg, OPT_Autostep, FALSE);\r
}\r
SetLoadOptionEnables(hDlg);\r
+ SetDlgItemInt(hDlg, OPT_elo1, appData.eloThreshold1, FALSE);\r
+ SetDlgItemInt(hDlg, OPT_elo2, appData.eloThreshold2, FALSE);\r
+ SetDlgItemInt(hDlg, OPT_date, appData.dateThreshold, FALSE);\r
+ SetDlgItemInt(hDlg, OPT_Stretch, appData.stretch, FALSE);\r
+ CheckDlgButton(hDlg, OPT_Reversed, appData.ignoreColors);\r
+ CheckDlgButton(hDlg, OPT_Mirror, appData.findMirror);\r
+ switch (appData.searchMode) {\r
+ case 1:\r
+ CheckDlgButton(hDlg, OPT_Exact, TRUE);\r
+ break;\r
+ case 2:\r
+ CheckDlgButton(hDlg, OPT_Subset, TRUE);\r
+ break;\r
+ case 3:\r
+ CheckDlgButton(hDlg, OPT_Struct, TRUE);\r
+ break;\r
+ case 4:\r
+ CheckDlgButton(hDlg, OPT_Material, TRUE);\r
+ break;\r
+ case 5:\r
+ CheckDlgButton(hDlg, OPT_Range, TRUE);\r
+ break;\r
+ case 6:\r
+ CheckDlgButton(hDlg, OPT_Difference, TRUE);\r
+ break;\r
+ }\r
return TRUE;\r
\r
case WM_COMMAND: /* message: received a command */\r
} else {\r
appData.timeDelay = (float) -1.0;\r
}\r
+ appData.eloThreshold1 = GetDlgItemInt(hDlg, OPT_elo1, &ok, FALSE);\r
+ appData.eloThreshold2 = GetDlgItemInt(hDlg, OPT_elo2, &ok, FALSE);\r
+ appData.dateThreshold = GetDlgItemInt(hDlg, OPT_date, &ok, FALSE);\r
+ appData.stretch = GetDlgItemInt(hDlg, OPT_Stretch, &ok, FALSE);\r
+ appData.searchMode = LoadOptionsWhichRadio(hDlg);\r
+ appData.ignoreColors = IsDlgButtonChecked(hDlg, OPT_Reversed);\r
+ appData.findMirror = IsDlgButtonChecked(hDlg, OPT_Mirror);\r
EndDialog(hDlg, TRUE);\r
return TRUE;\r
\r
if (IsDlgButtonChecked(hDlg, OPT_Autosave)) {\r
appData.autoSaveGames = TRUE;\r
if (IsDlgButtonChecked(hDlg, OPT_AVPrompt)) {\r
- appData.saveGameFile = "";\r
+ ASSIGN(appData.saveGameFile, ""); // [HGM] make sure value is ALWAYS in allocated memory\r
} else /*if (IsDlgButtonChecked(hDlg, OPT_AVToFile))*/ {\r
GetDlgItemText(hDlg, OPT_AVFilename, buf, MSG_SIZ);\r
if (*buf == NULLCHAR) {\r
_("Option Error"), MB_OK|MB_ICONEXCLAMATION);\r
return FALSE;\r
}\r
- if ((isalpha(buf[0]) && buf[1] == ':') ||\r
- (buf[0] == '\\' && buf[1] == '\\')) {\r
- appData.saveGameFile = strdup(buf);\r
- } else {\r
- char buf2[MSG_SIZ], buf3[MSG_SIZ];\r
- char *dummy;\r
- GetCurrentDirectory(MSG_SIZ, buf3);\r
- SetCurrentDirectory(installDir);\r
- if (GetFullPathName(buf, MSG_SIZ, buf2, &dummy)) {\r
- appData.saveGameFile = strdup(buf2);\r
- } else {\r
- appData.saveGameFile = strdup(buf);\r
- }\r
- SetCurrentDirectory(buf3);\r
- }\r
+ FREE(appData.saveGameFile);\r
+ appData.saveGameFile = InterpretFileName(buf, homeDir);\r
}\r
} else {\r
appData.autoSaveGames = FALSE;\r
- appData.saveGameFile = "";\r
+ ASSIGN(appData.saveGameFile, "");\r
}\r
appData.oldSaveStyle = IsDlgButtonChecked(hDlg, OPT_Old);\r
appData.saveOutOfBookInfo = IsDlgButtonChecked( hDlg, OPT_OutOfBookInfo );\r
* UCI Options Dialog functions\r
*\r
\*---------------------------------------------------------------------------*/\r
-static BOOL BrowseForFolder( const char * title, char * path )\r
+BOOL BrowseForFolder( const char * title, char * path )\r
{\r
BOOL result = FALSE;\r
BROWSEINFO bi;\r
projects / xboard.git / blobdiff