fonts: use 'weight' and 'slant', not 'style' when loading fonts

This commit is contained in:
Daniel Eklöf 2019-11-19 17:35:02 +01:00
parent 7b55f90b5b
commit 3c8a87168a
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 6 additions and 6 deletions

6
main.c
View file

@ -67,9 +67,9 @@ initialize_fonts(const struct config *conf, struct font *fonts[4])
tll_push_back(font_names, it->item);
if ((fonts[0] = font_from_name(font_names, "")) == NULL ||
(fonts[1] = font_from_name(font_names, "style=bold")) == NULL ||
(fonts[2] = font_from_name(font_names, "style=italic")) == NULL ||
(fonts[3] = font_from_name(font_names, "style=bold italic")) == NULL)
(fonts[1] = font_from_name(font_names, "weight=bold")) == NULL ||
(fonts[2] = font_from_name(font_names, "slant=italic")) == NULL ||
(fonts[3] = font_from_name(font_names, "weight=bold:slant=italic")) == NULL)
{
tll_free(font_names);
return false;

View file

@ -368,9 +368,9 @@ initialize_fonts(struct terminal *term, const struct config *conf)
tll_push_back(font_names, it->item);
if ((term->fonts[0] = font_from_name(font_names, "")) == NULL ||
(term->fonts[1] = font_from_name(font_names, "style=bold")) == NULL ||
(term->fonts[2] = font_from_name(font_names, "style=italic")) == NULL ||
(term->fonts[3] = font_from_name(font_names, "style=bold italic")) == NULL)
(term->fonts[1] = font_from_name(font_names, "weight=bold")) == NULL ||
(term->fonts[2] = font_from_name(font_names, "slant=italic")) == NULL ||
(term->fonts[3] = font_from_name(font_names, "weight=bold:slant=italic")) == NULL)
{
tll_free(font_names);
return false;