diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2024-11-14 20:05:32 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2024-11-14 20:05:32 +0000 |
| commit | 81bdbc6691312aa6e471635f22087900fbd75183 (patch) | |
| tree | 3d6d34af970079f8ec3eeca7987b01412c50d75c /app/xterm/fontutils.c | |
| parent | 81ba6498d90fcd57f48c93269a2df870398f5d15 (diff) | |
Update to xterm 395. Tested by tb@, jsg@ and others.
Diffstat (limited to 'app/xterm/fontutils.c')
| -rw-r--r-- | app/xterm/fontutils.c | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/app/xterm/fontutils.c b/app/xterm/fontutils.c index 61467177e..fdcdef7be 100644 --- a/app/xterm/fontutils.c +++ b/app/xterm/fontutils.c @@ -1,4 +1,4 @@ -/* $XTermId: fontutils.c,v 1.783 2024/07/10 15:48:26 tom Exp $ */ +/* $XTermId: fontutils.c,v 1.786 2024/09/30 07:35:30 tom Exp $ */ /* * Copyright 1998-2023,2024 by Thomas E. Dickey @@ -1250,8 +1250,9 @@ reportXPerChar(XFontStruct *fs) fillXCharStruct(&max_bounds, -32768); fillXCharStruct(&min_bounds, 32767); + TRACE2(("\t\tCells: %d..%d\n", first_char, last_char)); for (ch = first_char; ch < last_char; ++ch) { - XCharStruct *item = cs + ch; + XCharStruct *item = cs + ch - first_char; ++total; if (!CI_NONEXISTCHAR(item)) { ++valid; @@ -1267,6 +1268,15 @@ reportXPerChar(XFontStruct *fs) MAX_BOUNDS(width); MAX_BOUNDS(ascent); MAX_BOUNDS(descent); + TRACE2(("\t\t\t%d: cell [%d .. %d] wide %d high %d / %d\n", + ch, + item->lbearing, + item->rbearing, + item->width, + item->ascent, + item->descent)); + } else { + TRACE(("\t\t\t%d: cell missing\n", ch)); } } ReportFonts("\t\tPer-character: %d/%d\n", valid, total); @@ -3872,7 +3882,7 @@ xtermMissingChar(unsigned ch, XTermFonts * font) if (ch < 256) #endif { - CI_GET_CHAR_INFO_1D(fs, E2A(ch), pc); + CI_GET_CHAR_INFO_1D(fs, ch, pc); } } #if OPT_WIDE_CHARS @@ -4449,7 +4459,7 @@ markXftOpened(XtermWidget xw, XTermXftFonts *which, int n, unsigned wc) } static char ** -xftData2List(XtermWidget xw, XTermXftFonts *fontData) +xftData2List(XtermWidget xw, const XTermXftFonts *fontData) { TScreen *screen = TScreenOf(xw); VTFontList *lists = &xw->work.fonts.xft; @@ -5998,7 +6008,7 @@ getMyXftFont(XtermWidget xw, int which, int fontnum) } const char * -whichXftFonts(XtermWidget xw, XTermXftFonts *data) +whichXftFonts(XtermWidget xw, const XTermXftFonts *data) { TScreen *screen = TScreenOf(xw); const char *result = "?"; @@ -6075,7 +6085,7 @@ whichFontEnum(VTFontEnum value) } const char * -whichFontList(XtermWidget xw, VTFontList * value) +whichFontList(XtermWidget xw, const VTFontList * value) { const char *result = "?"; if (value == &(xw->work.fonts.x11)) |