X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=dialogs.c;h=8624ff4cd4b8e658c8f0f67dd0f5dcb09ce1955a;hb=f7f09e5d0b183a416c4069f2c28f865c680045c7;hp=0c1abf1beb5c333b5cdf2def91dbef49da9ab66b;hpb=88a788118a6c2a024d3a3dc42105ca0335f6812f;p=xboard.git

diff --git a/dialogs.c b/dialogs.c
index 0c1abf1..8624ff4 100644
--- a/dialogs.c
+++ b/dialogs.c
@@ -625,9 +625,9 @@ CommonOptionsOK (int n)
 static Option commonEngineOptions[] = {
 { 0,  0,    0, NULL, (void*) &appData.ponderNextMove, "", NULL, CheckBox, N_("Ponder Next Move") },
 { 0,  0, 1000, NULL, (void*) &appData.smpCores, "", NULL, Spin, N_("Maximum Number of CPUs per Engine:") },
-{ 0,  0,    0, NULL, (void*) &appData.polyglotDir, "", NULL, PathName, N_("Polygot Directory:") },
+{ 0,  0,    0, NULL, (void*) &appData.polyglotDir, NULL, NULL, PathName, N_("Polygot Directory:") },
 { 0,  0,16000, NULL, (void*) &appData.defaultHashSize, "", NULL, Spin, N_("Hash-Table Size (MB):") },
-{ 0,  0,    0, NULL, (void*) &egtPath, "", NULL, PathName, N_("EGTB Path:") },
+{ 0,  0,    0, NULL, (void*) &egtPath, NULL, NULL, PathName, N_("EGTB Path:") },
 { 0,  0, 1000, NULL, (void*) &appData.defaultCacheSizeEGTB, "", NULL, Spin, N_("EGTB Cache Size (MB):") },
 { 0,  0,    0, NULL, (void*) &appData.usePolyglotBook, "", NULL, CheckBox, N_("Use GUI Book") },
 { 0,  0,    0, NULL, (void*) &appData.polyglotBook, ".bin", NULL, FileName, N_("Opening-Book Filename:") },
@@ -1223,7 +1223,7 @@ NewMove ()
     addToBookFlag = !addToBookFlag;
 }
 
-static Option tagsOptions[] = {
+Option tagsOptions[] = {
 {   0,   0,   0, NULL, NULL, NULL, NULL, Label,  NULL },
 { 200, T_VSCRL | T_FILL | T_WRAP | T_TOP, 200, NULL, (void*) &tagsText, NULL, (char **) &TagsClick, TextBox, "", &appData.tagsFont },
 {   0,   0, 100, NULL, (void*) &NewMove,    NULL, NULL, Button, N_("add next move") },
@@ -1627,30 +1627,35 @@ static void AdjustFont P((int n));
 static char *oldFont[7];
 
 static int
+NewFont (int n, int fnr, char *font)
+{   // figure out if font changed, and if so, store it in the fonts table as a side effect
+    if(!strcmp(oldFont[n], font)) return 0; // not changed
+    ASSIGN(fontTable[fnr][initialSquareSize], font);
+    fontIsSet[fnr] = fontValid[fnr][initialSquareSize] = True;
+    return 1; // changed
+}
+
+static int
 FontsOK (int n)
 {
-    extern Option historyOptions[], engoutOptions[], gamesOptions[], chatOptions[];
     int i;
     PopDown(TransientDlg); // Early popdown to prevent expose events frommasking each other
     LockBoardSize(0);
-    if(strcmp(oldFont[0], appData.clockFont)) fontIsSet[CLOCK_FONT] = 1, DisplayBothClocks();
-    if(strcmp(oldFont[1], appData.font)) {
-	fontIsSet[MESSAGE_FONT] = 1;
+    if(NewFont(0, CLOCK_FONT,   appData.clockFont)) DisplayBothClocks();
+    if(NewFont(1, MESSAGE_FONT, appData.font)) {
 	ApplyFont(&mainOptions[W_MESSG], NULL);
 	for(i=1; i<6; i++) ApplyFont(&mainOptions[W_BUTTON+i], NULL);
     }
     LockBoardSize(1); // unlock
-    if(strcmp(oldFont[3], appData.tagsFont)) fontIsSet[EDITTAGS_FONT] = 1, ApplyFont(&tagsOptions[1], NULL);
-    if(strcmp(oldFont[4], appData.commentFont)) fontIsSet[COMMENT_FONT] = 1, ApplyFont(&commentOptions[0], NULL);
-    if(strcmp(oldFont[5], appData.historyFont)) {
-	fontIsSet[MOVEHISTORY_FONT] = 1;
+    if(NewFont(3, EDITTAGS_FONT,    appData.tagsFont))    ApplyFont(&tagsOptions[1], NULL);
+    if(NewFont(4, COMMENT_FONT,     appData.commentFont)) ApplyFont(&commentOptions[0], NULL);
+    if(NewFont(5, MOVEHISTORY_FONT, appData.historyFont)) {
 	ApplyFont(&historyOptions[0], NULL);
 	ApplyFont(&engoutOptions[5], NULL);
 	ApplyFont(&engoutOptions[12], NULL);
     }
-    if(strcmp(oldFont[6], appData.gameListFont)) fontIsSet[GAMELIST_FONT] = 1, ApplyFont(&gamesOptions[0], NULL);
-    if(strcmp(oldFont[2], appData.icsFont)) {
-	fontIsSet[CONSOLE_FONT] = 1;
+    if(NewFont(6, GAMELIST_FONT, appData.gameListFont)) ApplyFont(&gamesOptions[0], NULL);
+    if(NewFont(2, CONSOLE_FONT,  appData.icsFont)) {
 	ApplyFont(&chatOptions[11], appData.icsFont);
 	AppendColorized(&chatOptions[6], NULL, 0); // kludge to replace font tag
     }
@@ -3308,10 +3313,14 @@ DirSelProc (int n, int sel)
 void
 StartDir (char *filter, char *newName)
 {
-    static char *gamesDir, *trnDir, *imgDir, *bookDir;
+    static char *gamesDir, *trnDir, *imgDir, *bookDir, *dirDir;
     static char curDir[MSG_SIZ];
     char **res = NULL;
     if(!filter || !*filter) return;
+    if(strstr(filter, "dir")) {
+	res = &dirDir;
+	if(!dirDir) dirDir= strdup(dataDir);
+    } else
     if(strstr(filter, "pgn")) res = &gamesDir; else
     if(strstr(filter, "bin")) res = &bookDir; else
     if(strstr(filter, "png")) res = &imgDir; else
@@ -3324,7 +3333,9 @@ StartDir (char *filter, char *newName)
 		ASSIGN(*res, newName);
 		for(p=*res; q=strchr(p, '/');) p = q + 1; *p = NULLCHAR;
 	    }
-	    if(*curDir) chdir(curDir);
+	}
+	if(*curDir) {
+	    chdir(curDir);
 	    *curDir = NULLCHAR;
 	} else {
 	    getcwd(curDir, MSG_SIZ);