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") },
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;
- DisplayBothClocks();
- ApplyFont(&mainOptions[W_MESSG], NULL);
- for(i=1; i<6; i++) ApplyFont(&mainOptions[W_BUTTON+i], NULL);
- ApplyFont(&tagsOptions[1], NULL);
- ApplyFont(&historyOptions[0], NULL);
- ApplyFont(&engoutOptions[5], NULL);
- ApplyFont(&engoutOptions[12], NULL);
- ApplyFont(&gamesOptions[0], NULL);
- ApplyFont(&chatOptions[11], appData.icsFont);
- AppendColorized(&chatOptions[6], NULL, 0); // kludge to replace font tag
+ PopDown(TransientDlg); // Early popdown to prevent expose events frommasking each other
+ LockBoardSize(0);
+ 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(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(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
+ }
DrawPosition(TRUE, NULL); // for coord font
- return 1;
+ return 0; // suppress normal popdown because already done
}
static Option fontOptions[] = {
int i;
if(strstr(appData.font, "-*-")) { DisplayNote(_("This only works in the GTK build")); return; }
GenericPopUp(fontOptions, _("Fonts"), TransientDlg, BoardWindow, MODAL, 0);
- for(i=0; i<6; i++) ApplyFont(&fontOptions[6*i], *(char**)fontOptions[6*i].target);
+ for(i=0; i<7; i++) {
+ ApplyFont(&fontOptions[6*i], *(char**)fontOptions[6*i].target);
+ ASSIGN(oldFont[i], *(char**)fontOptions[6*i].target);
+ }
}
//------------------------------------------------------ Time Control -----------------------------------
len = strlen(buf);
for(len=3; buf[len] && buf[len] != '(' && buf[len] != ':' && buf[len] != '.' && buf[len] != '?' && buf[len] != '\n'; len++);
buf[len] = NULLCHAR;
- while(buf[--len] == ' ') buf[len] = NULLCHAR;
+ while(buf[--len] == ' ') buf[len] = NULLCHAR; len++;
snprintf(title, MSG_SIZ, "Help on '%s'", buf+3);
while((line = ReadLine(f))) {
- if(!strncmp(line, buf, ++len) || !strncmp(line, ".SS ", 4) && !strncmp(line+4, buf+3, len-3)
+ if(!strncmp(line, buf, len) || !strncmp(line, ".SS ", 4) && !strncmp(line+4, buf+3, len-3)
|| !strncmp(line, ".IX Item \"", 10) && !strncmp(line+10, buf+3, len-3)) {
while((line = ReadLine(f)) && (cnt == 0 || strncmp(line, ".B ", 3) && strncmp(line, ".SS ", 4) && strncmp(line, ".IX ", 4))) {
if(!*line) { *p++ = '\n'; *p++ = '\n'; q = p; continue; }
return;
}
}
- snprintf(text, MSG_SIZ, "No help on '%s'\n", buf+3);
+ snprintf(text, MSG_SIZ, "No help available on '%s'\n", buf+3);
DisplayNote(text);
}