From bc86cd61c75f984633eb226692a30832c58efb17 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Tue, 26 Nov 2019 18:54:32 +0100 Subject: font: move metrics from terminal struct to font struct --- font.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'font.c') diff --git a/font.c b/font.c index 8f7d6f78..378fd415 100644 --- a/font.c +++ b/font.c @@ -245,6 +245,22 @@ from_font_set(FcPattern *pattern, FcFontSet *fonts, int start_idx, font->glyph_cache = calloc(cache_size, sizeof(font->glyph_cache[0])); } + double max_x_advance = ft_face->size->metrics.max_advance / 64.; + double height= ft_face->size->metrics.height / 64.; + double descent = ft_face->size->metrics.descender / 64.; + double ascent = ft_face->size->metrics.ascender / 64.; + + font->height = ceil(height * font->pixel_size_fixup); + font->descent = ceil(-descent * font->pixel_size_fixup); + font->ascent = ceil(ascent * font->pixel_size_fixup); + font->max_x_advance = ceil(max_x_advance * font->pixel_size_fixup); + + LOG_DBG("%s: size=%f, pixel-size=%f, dpi=%f, fixup-factor: %f, " + "line-height: %d, ascent: %d, descent: %d, x-advance: %d", + font->name, size, pixel_size, dpi, font->pixel_size_fixup, + font->height, font->ascent, font->descent, + font->max_x_advance); + underline_strikeout_metrics(font); return true; } -- cgit v1.3