static int
FontsOK (int n)
{
- extern Option historyOptions[], engoutOptions[], gamesOptions[];
+ extern Option historyOptions[], engoutOptions[], gamesOptions[], chatOptions[];
int i;
- ApplyFont(&mainOptions[W_WHITE], appData.clockFont);
- ApplyFont(&mainOptions[W_BLACK], appData.clockFont);
+ PopDown(TransientDlg); // Early popdown to prevent expose events frommasking each other
+ LockBoardSize(0);
+ DisplayBothClocks();
ApplyFont(&mainOptions[W_MESSG], NULL);
for(i=1; i<6; i++) ApplyFont(&mainOptions[W_BUTTON+i], NULL);
+ LockBoardSize(1);
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
DrawPosition(TRUE, NULL); // for coord font
- return 1;
+ return 0; // suppress normal popdown because already done
}
static Option fontOptions[] = {
- { 0, 0, 70, NULL, (void*) &appData.clockFont, "", NULL, TextBox, N_("Clocks:") },
+ { 0, 60, 200, NULL, (void*) &appData.clockFont, NULL, NULL, TextBox, N_("Clocks (requires restart):") },
{ 1, SAME_ROW, 0, NULL, (void*) &AdjustFont, NULL, NULL, Button, N_("+") },
{ 2, SAME_ROW, 0, NULL, (void*) &AdjustFont, NULL, NULL, Button, N_("-") },
{ 3, SAME_ROW, 0, NULL, (void*) &AdjustFont, NULL, NULL, Button, N_("B") },
{ 4, SAME_ROW, 0, NULL, (void*) &AdjustFont, NULL, NULL, Button, N_("I") },
- { 0, 0, 70, NULL, (void*) &appData.font, "", NULL, TextBox, N_("Message (above board):") },
+ { 666, SAME_ROW, 0, NULL, (void*) &AdjustFont, NULL, NULL, Button, N_("*") },
+ { 0, 60, 70, NULL, (void*) &appData.font, NULL, NULL, TextBox, N_("Message (above board):") },
{ 1, SAME_ROW, 0, NULL, (void*) &AdjustFont, NULL, NULL, Button, N_("+") },
{ 2, SAME_ROW, 0, NULL, (void*) &AdjustFont, NULL, NULL, Button, N_("-") },
{ 3, SAME_ROW, 0, NULL, (void*) &AdjustFont, NULL, NULL, Button, N_("B") },
{ 4, SAME_ROW, 0, NULL, (void*) &AdjustFont, NULL, NULL, Button, N_("I") },
- { 0, 0, 70, NULL, (void*) &appData.coordFont, "", NULL, TextBox, N_("Board coordinates:") },
+ { 666, SAME_ROW, 0, NULL, (void*) &AdjustFont, NULL, NULL, Button, N_("*") },
+ { 0, 60, 70, NULL, (void*) &appData.icsFont, NULL, NULL, TextBox, N_("ICS Chat/Console:") },
{ 1, SAME_ROW, 0, NULL, (void*) &AdjustFont, NULL, NULL, Button, N_("+") },
{ 2, SAME_ROW, 0, NULL, (void*) &AdjustFont, NULL, NULL, Button, N_("-") },
{ 3, SAME_ROW, 0, NULL, (void*) &AdjustFont, NULL, NULL, Button, N_("B") },
{ 4, SAME_ROW, 0, NULL, (void*) &AdjustFont, NULL, NULL, Button, N_("I") },
- { 0, 0, 70, NULL, (void*) &appData.tagsFont, "", NULL, TextBox, N_("Edit tags / book / engine list:") },
+ { 666, SAME_ROW, 0, NULL, (void*) &AdjustFont, NULL, NULL, Button, N_("*") },
+ { 0, 60, 70, NULL, (void*) &appData.tagsFont, NULL, NULL, TextBox, N_("Edit tags / book / engine list:") },
{ 1, SAME_ROW, 0, NULL, (void*) &AdjustFont, NULL, NULL, Button, N_("+") },
{ 2, SAME_ROW, 0, NULL, (void*) &AdjustFont, NULL, NULL, Button, N_("-") },
{ 3, SAME_ROW, 0, NULL, (void*) &AdjustFont, NULL, NULL, Button, N_("B") },
{ 4, SAME_ROW, 0, NULL, (void*) &AdjustFont, NULL, NULL, Button, N_("I") },
- { 0, 0, 70, NULL, (void*) &appData.commentFont, "", NULL, TextBox, N_("Edit comments:") },
+ { 666, SAME_ROW, 0, NULL, (void*) &AdjustFont, NULL, NULL, Button, N_("*") },
+ { 0, 60, 70, NULL, (void*) &appData.commentFont, NULL, NULL, TextBox, N_("Edit comments:") },
{ 1, SAME_ROW, 0, NULL, (void*) &AdjustFont, NULL, NULL, Button, N_("+") },
{ 2, SAME_ROW, 0, NULL, (void*) &AdjustFont, NULL, NULL, Button, N_("-") },
{ 3, SAME_ROW, 0, NULL, (void*) &AdjustFont, NULL, NULL, Button, N_("B") },
{ 4, SAME_ROW, 0, NULL, (void*) &AdjustFont, NULL, NULL, Button, N_("I") },
- { 0, 0, 70, NULL, (void*) &appData.historyFont, "", NULL, TextBox, N_("Move history / Engine Output:") },
+ { 666, SAME_ROW, 0, NULL, (void*) &AdjustFont, NULL, NULL, Button, N_("*") },
+ { 0, 60, 70, NULL, (void*) &appData.historyFont, NULL, NULL, TextBox, N_("Move history / Engine Output:") },
{ 1, SAME_ROW, 0, NULL, (void*) &AdjustFont, NULL, NULL, Button, N_("+") },
{ 2, SAME_ROW, 0, NULL, (void*) &AdjustFont, NULL, NULL, Button, N_("-") },
{ 3, SAME_ROW, 0, NULL, (void*) &AdjustFont, NULL, NULL, Button, N_("B") },
{ 4, SAME_ROW, 0, NULL, (void*) &AdjustFont, NULL, NULL, Button, N_("I") },
- { 0, 0, 70, NULL, (void*) &appData.gameListFont, "", NULL, TextBox, N_("Game list:") },
+ { 666, SAME_ROW, 0, NULL, (void*) &AdjustFont, NULL, NULL, Button, N_("*") },
+ { 0, 60, 70, NULL, (void*) &appData.gameListFont, NULL, NULL, TextBox, N_("Game list:") },
{ 1, SAME_ROW, 0, NULL, (void*) &AdjustFont, NULL, NULL, Button, N_("+") },
{ 2, SAME_ROW, 0, NULL, (void*) &AdjustFont, NULL, NULL, Button, N_("-") },
{ 3, SAME_ROW, 0, NULL, (void*) &AdjustFont, NULL, NULL, Button, N_("B") },
{ 4, SAME_ROW, 0, NULL, (void*) &AdjustFont, NULL, NULL, Button, N_("I") },
- { 0, 0, 0, NULL, NULL, NULL, NULL, Label, N_("Generic type-face names are Sans, Monospace and Serif") },
+ { 666, SAME_ROW, 0, NULL, (void*) &AdjustFont, NULL, NULL, Button, N_("*") },
+ { 0, 0, 0, NULL, NULL, NULL, NULL, Label, N_("\nThe * buttons will set the font to the one selected below:") },
+ { 0, 0, 0, NULL, NULL, NULL, NULL, Button, "fontsel" },
{ 0, 0, 0, NULL, (void*) &FontsOK, "", NULL, EndMark , "" }
};
static void
BreakUp (char *font)
{
- char *p = name;
+ char *p = name, *norm;
safeStrCpy(name, font, MSG_SIZ);
bold = StrCaseStr(name, "bold");
ital = StrCaseStr(name, "ital");
+ norm = StrCaseStr(name, "normal");
points = 0;
while(p && *p && !(points = atoi(p))) p = strchr(p+1, ' ');
if(points) p[*p == ' '] = 0;
if(bold) *bold = 0;
if(ital) *ital = 0;
+ if(norm) *norm = 0;
}
static void
{
if(bold) strcat(name, "Bold ");
if(ital) strcat(name, "Italic ");
- if(points) sprintf(name + strlen(name), " %d", points); else strcat(name, "%d");
+ if(!ital && !bold && strlen(name) < 2) strncpy(name, "Normal ", MSG_SIZ);
+ if(points) sprintf(name + strlen(name), "%d", points); else strcat(name, "%d");
}
static void
}
Collect();
SetWidgetText(&fontOptions[base], name, TransientDlg);
-// ApplyFont(&fontOptions[base], name);
+ ApplyFont(&fontOptions[base], name);
}
void
FontsProc ()
{
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[5*i], *(char**)fontOptions[5*i].target);
+ for(i=0; i<6; i++) ApplyFont(&fontOptions[6*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);
}