mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-04-07 08:21:02 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

main: calculate *all* font metrics from the FreeType face

Browse source
This commit is contained in:
Daniel Eklöf 2019-07-28 12:39:56 +02:00
parent 27dca15caf
commit c399c329b6
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 25 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

27
main.c
View file

@ -428,10 +428,10 @@ main(int argc, char *const *argv)
for (size_t i = 0; i < sizeof(term.fonts) / sizeof(term.fonts[0]); i++) { for (size_t i = 0; i < sizeof(term.fonts) / sizeof(term.fonts[0]); i++) {
struct font *f = &term.fonts[i]; struct font *f = &term.fonts[i];
if (f->font == NULL) if (f->face == NULL)
continue; continue;
FT_Face ft_face = cairo_ft_scaled_font_lock_face(f->font); FT_Face ft_face = f->face;
double x_scale = ft_face->size->metrics.x_scale / 65526.; double x_scale = ft_face->size->metrics.x_scale / 65526.;
double height = ft_face->size->metrics.height / 64; double height = ft_face->size->metrics.height / 64;
@ -464,18 +464,27 @@ main(int argc, char *const *argv)
LOG_DBG("strikeout: pos=%f, thick=%f", LOG_DBG("strikeout: pos=%f, thick=%f",
f->strikeout.position, f->strikeout.thickness); f->strikeout.position, f->strikeout.thickness);
cairo_ft_scaled_font_unlock_face(f->font);
} }
cairo_scaled_font_extents(term.fonts[0].font, &term.fextents); {
FT_Face ft_face = term.fonts[0].face;
int max_x_advance = ft_face->size->metrics.max_advance / 64;
int height = ft_face->size->metrics.height / 64;
int descent = ft_face->size->metrics.descender / 64;
int ascent = ft_face->size->metrics.ascender / 64;
term.fextents.height = height;
term.fextents.descent = -descent;
term.fextents.ascent = ascent;
term.fextents.max_x_advance = max_x_advance;
LOG_WARN("metrics: height: %d, descent: %d, ascent: %d, x-advance: %d",
height, descent, ascent, max_x_advance);
}
term.cell_width = (int)ceil(term.fextents.max_x_advance); term.cell_width = (int)ceil(term.fextents.max_x_advance);
term.cell_height = (int)ceil(term.fextents.height); term.cell_height = (int)ceil(term.fextents.height);
LOG_DBG("font: height: %.2f, x-advance: %.2f",
term.fextents.height, term.fextents.max_x_advance);
assert(term.fextents.max_y_advance == 0);
/* Glyph cache */ /* Glyph cache */
for (size_t i = 0; i < sizeof(term.fonts) / sizeof(term.fonts[0]); i++) { for (size_t i = 0; i < sizeof(term.fonts) / sizeof(term.fonts[0]); i++) {
struct font *f = &term.fonts[i]; struct font *f = &term.fonts[i];

8
terminal.h
View file

@ -325,7 +325,13 @@ struct terminal {
struct grid *grid; struct grid *grid;
struct font fonts[4]; struct font fonts[4];
cairo_font_extents_t fextents; //cairo_font_extents_t fextents;
struct {
int height;
int descent;
int ascent;
int max_x_advance;
} fextents;
struct wayland wl; struct wayland wl;
struct { struct {