aboutsummaryrefslogtreecommitdiff
path: root/main.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2019-07-28 10:09:22 +0000
committerDaniel Eklöf <daniel@ekloef.se>2019-07-28 10:09:22 +0000
commitcb02c9cf416815c5d55254d3c81647b28ca0aa47 (patch)
tree8ae0eafee7802438b8a60199f55f167df19349b4 /main.c
parentrender: poc: use freetype to render glyphs (diff)
font: load FreeType face, and set it's pixel sizes
Diffstat (limited to 'main.c')
-rw-r--r--main.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/main.c b/main.c
index 8248e28a..31de1b58 100644
--- a/main.c
+++ b/main.c
@@ -409,20 +409,19 @@ main(int argc, char *const *argv)
thrd_t keyboard_repeater_id;
thrd_create(&keyboard_repeater_id, &keyboard_repeater, &term);
- term.fonts[0].font = font_from_name(conf.font);
- if (term.fonts[0].font == NULL)
+ if (!font_from_name(conf.font, &term.fonts[0]))
goto out;
{
char fname[1024];
snprintf(fname, sizeof(fname), "%s:style=bold", conf.font);
- term.fonts[1].font = font_from_name(fname);
+ font_from_name(fname, &term.fonts[1]);
snprintf(fname, sizeof(fname), "%s:style=italic", conf.font);
- term.fonts[2].font = font_from_name(fname);
+ font_from_name(fname, &term.fonts[2]);
snprintf(fname, sizeof(fname), "%s:style=bold italic", conf.font);
- term.fonts[3].font = font_from_name(fname);
+ font_from_name(fname, &term.fonts[3]);
}
/* Underline position and size */
@@ -924,6 +923,9 @@ out:
for (size_t j = 0; j < 256; j++)
cairo_glyph_free(f->glyph_cache[j].glyphs);
+
+ if (f->face != NULL)
+ FT_Done_Face(f->face);
}
if (term.flash.fd != -1)