nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-04-20 12:38:06 -05:00
Code Issues Projects Releases Wiki Activity

Robert de Bath's patch: be much more careful about font heights and

Browse Source 
widths, including underline mode and OEM/ANSI size mismatch.

[originally from svn r405]
This commit is contained in:
Simon Tatham 2000-03-11 14:15:24 +00:00
parent 6ce983dc28
commit dbc12bdd58
1 changed files with 90 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

129
window.c
View File

@ -501,11 +501,13 @@ static void init_palette(void) {
*/ */
static void init_fonts(void) { static void init_fonts(void) {
TEXTMETRIC tm; TEXTMETRIC tm;
int i, j; int i;
int widths[5]; int fsize[5];
HDC hdc; HDC hdc;
int fw_dontcare, fw_bold; int fw_dontcare, fw_bold;
int firstchar = ' ';
font_messup:
for (i=0; i<8; i++) for (i=0; i<8; i++)
fonts[i] = NULL; fonts[i] = NULL;
@ -517,83 +519,132 @@ static void init_fonts(void) {
fw_bold = FW_BOLD; fw_bold = FW_BOLD;
} }
hdc = GetDC(hwnd);
font_height = cfg.fontheight;
font_width = 0;
#define f(i,c,w,u) \ #define f(i,c,w,u) \
fonts[i] = CreateFont (cfg.fontheight, 0, 0, 0, w, FALSE, u, FALSE, \ fonts[i] = CreateFont (font_height, font_width, 0, 0, w, FALSE, u, FALSE, \
c, OUT_DEFAULT_PRECIS, \ c, OUT_DEFAULT_PRECIS, \
CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, \ CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, \
FIXED_PITCH | FF_DONTCARE, cfg.font) FIXED_PITCH | FF_DONTCARE, cfg.font)
if (cfg.vtmode != VT_OEMONLY) { if (cfg.vtmode != VT_OEMONLY) {
f(FONT_NORMAL, cfg.fontcharset, fw_dontcare, FALSE); f(FONT_NORMAL, cfg.fontcharset, fw_dontcare, FALSE);
SelectObject (hdc, fonts[FONT_NORMAL]);
GetTextMetrics(hdc, &tm);
font_height = tm.tmHeight;
font_width = tm.tmAveCharWidth;
f(FONT_UNDERLINE, cfg.fontcharset, fw_dontcare, TRUE); f(FONT_UNDERLINE, cfg.fontcharset, fw_dontcare, TRUE);
}
if (cfg.vtmode == VT_OEMANSI || cfg.vtmode == VT_OEMONLY) { if (bold_mode == BOLD_FONT) {
f(FONT_OEM, OEM_CHARSET, fw_dontcare, FALSE);
f(FONT_OEMUND, OEM_CHARSET, fw_dontcare, TRUE);
}
if (bold_mode == BOLD_FONT) {
if (cfg.vtmode != VT_OEMONLY) {
f(FONT_BOLD, cfg.fontcharset, fw_bold, FALSE); f(FONT_BOLD, cfg.fontcharset, fw_bold, FALSE);
f(FONT_BOLDUND, cfg.fontcharset, fw_bold, TRUE); f(FONT_BOLDUND, cfg.fontcharset, fw_bold, TRUE);
} }
if (cfg.vtmode == VT_OEMANSI || cfg.vtmode == VT_OEMONLY) {
f(FONT_OEMBOLD, OEM_CHARSET, fw_bold, FALSE); if (cfg.vtmode == VT_OEMANSI) {
f(FONT_OEMBOLDUND, OEM_CHARSET, fw_bold, TRUE); f(FONT_OEM, OEM_CHARSET, fw_dontcare, FALSE);
f(FONT_OEMUND, OEM_CHARSET, fw_dontcare, TRUE);
if (bold_mode == BOLD_FONT) {
f(FONT_OEMBOLD, OEM_CHARSET, fw_bold, FALSE);
f(FONT_OEMBOLDUND, OEM_CHARSET, fw_bold, TRUE);
}
}
}
else
{
f(FONT_OEM, cfg.fontcharset, fw_dontcare, FALSE);
SelectObject (hdc, fonts[FONT_OEM]);
GetTextMetrics(hdc, &tm);
font_height = tm.tmHeight;
font_width = tm.tmAveCharWidth;
f(FONT_OEMUND, cfg.fontcharset, fw_dontcare, TRUE);
if (bold_mode == BOLD_FONT) {
f(FONT_BOLD, cfg.fontcharset, fw_bold, FALSE);
f(FONT_BOLDUND, cfg.fontcharset, fw_bold, TRUE);
} }
} else {
fonts[FONT_BOLD] = fonts[FONT_BOLDUND] = NULL;
fonts[FONT_OEMBOLD] = fonts[FONT_OEMBOLDUND] = NULL;
} }
#undef f #undef f
hdc = GetDC(hwnd); descent = tm.tmAscent + 1;
if (descent >= font_height)
descent = font_height - 1;
firstchar = tm.tmFirstChar;
if (cfg.vtmode == VT_OEMONLY) if( cfg.vtmode == VT_XWINDOWS && firstchar >= ' ' )
j = 4; cfg.vtmode = VT_POORMAN;
else
j = 0;
for (i=0; i<(cfg.vtmode == VT_OEMANSI ? 5 : 4); i++) { for (i=0; i<8; i++) {
if (fonts[i+j]) { if (fonts[i]) {
SelectObject (hdc, fonts[i+j]); SelectObject (hdc, fonts[i]);
GetTextMetrics(hdc, &tm); GetTextMetrics(hdc, &tm);
if (i == 0 || i == 4) { fsize[i] = tm.tmAveCharWidth + 256 * tm.tmHeight;
font_height = tm.tmHeight;
font_width = tm.tmAveCharWidth;
descent = tm.tmAscent + 1;
if (descent >= font_height)
descent = font_height - 1;
}
widths[i] = tm.tmAveCharWidth;
} }
} }
ReleaseDC (hwnd, hdc); ReleaseDC (hwnd, hdc);
if (widths[FONT_UNDERLINE] != widths[FONT_NORMAL] || if (fsize[FONT_UNDERLINE] != fsize[FONT_NORMAL] ||
(bold_mode == BOLD_FONT && (bold_mode == BOLD_FONT &&
widths[FONT_BOLDUND] != widths[FONT_BOLD])) { fsize[FONT_BOLDUND] != fsize[FONT_BOLD])) {
und_mode = UND_LINE; und_mode = UND_LINE;
DeleteObject (fonts[FONT_UNDERLINE]); DeleteObject (fonts[FONT_UNDERLINE]);
if (bold_mode == BOLD_FONT) if (bold_mode == BOLD_FONT)
DeleteObject (fonts[FONT_BOLDUND]); DeleteObject (fonts[FONT_BOLDUND]);
#if 0
MessageBox(NULL, "Disabling underline font",
"Font Size Mismatch", MB_ICONINFORMATION | MB_OK);
#endif
} }
if (bold_mode == BOLD_FONT && if (bold_mode == BOLD_FONT &&
widths[FONT_BOLD] != widths[FONT_NORMAL]) { fsize[FONT_BOLD] != fsize[FONT_NORMAL]) {
bold_mode = BOLD_SHADOW; bold_mode = BOLD_SHADOW;
DeleteObject (fonts[FONT_BOLD]); DeleteObject (fonts[FONT_BOLD]);
if (und_mode == UND_FONT) if (und_mode == UND_FONT)
DeleteObject (fonts[FONT_BOLDUND]); DeleteObject (fonts[FONT_BOLDUND]);
#if 0
MessageBox(NULL, "Disabling bold font",
"Font Size Mismatch", MB_ICONINFORMATION | MB_OK);
#endif
} }
if (cfg.vtmode == VT_OEMANSI && widths[FONT_OEM] != widths[FONT_NORMAL]) { if (cfg.vtmode == VT_OEMANSI && fsize[FONT_OEM] != fsize[FONT_NORMAL] ) {
MessageBox(NULL, "The OEM and ANSI versions of this font are\n" if( cfg.fontcharset == OEM_CHARSET )
{
MessageBox(NULL, "The OEM and ANSI versions of this font are\n"
"different sizes. Using OEM-only mode instead", "different sizes. Using OEM-only mode instead",
"Font Size Mismatch", MB_ICONINFORMATION | MB_OK); "Font Size Mismatch", MB_ICONINFORMATION | MB_OK);
cfg.vtmode = VT_OEMONLY; cfg.vtmode = VT_OEMONLY;
for (i=0; i<4; i++) }
else if( firstchar < ' ' )
{
MessageBox(NULL, "The OEM and ANSI versions of this font are\n"
"different sizes. Using XTerm mode instead",
"Font Size Mismatch", MB_ICONINFORMATION | MB_OK);
cfg.vtmode = VT_XWINDOWS;
}
else
{
MessageBox(NULL, "The OEM and ANSI versions of this font are\n"
"different sizes. Using ISO8859-1 mode instead",
"Font Size Mismatch", MB_ICONINFORMATION | MB_OK);
cfg.vtmode = VT_POORMAN;
}
for (i=0; i<8; i++)
if (fonts[i]) if (fonts[i])
DeleteObject (fonts[i]); DeleteObject (fonts[i]);
goto font_messup;
} }
} }