aboutsummaryrefslogtreecommitdiff
path: root/font.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2019-11-26 17:54:32 +0000
committerDaniel Eklöf <daniel@ekloef.se>2019-11-26 18:02:35 +0000
commitbc86cd61c75f984633eb226692a30832c58efb17 (patch)
tree7acacdfbf567e52d5331bf7710557195d6800980 /font.c
parentfont: cleanup and return error when failing to load font file (diff)
font: move metrics from terminal struct to font struct
Diffstat (limited to 'font.c')
-rw-r--r--font.c16
1 files changed, 16 insertions, 0 deletions
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;
}