mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-03-16 05:34:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

term: factor out common font changing code

Browse source
This commit is contained in:
Daniel Eklöf 2020-02-08 18:23:08 +01:00
parent fd5782d6e6
commit 1dfd121c44
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 20 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

42
terminal.c
View file

@ -1111,6 +1111,24 @@ term_reset(struct terminal *term, bool hard)
term_damage_all(term); term_damage_all(term);
} }
static void
term_set_fonts(struct terminal *term, struct font *fonts[static 4])
{
for (size_t i = 0; i < 4; i++) {
assert(fonts[i] != NULL);
font_destroy(term->fonts[i]);
term->fonts[i] = fonts[i];
}
term->cell_width = term->fonts[0]->space_x_advance > 0
? term->fonts[0]->space_x_advance : term->fonts[0]->max_x_advance;
term->cell_height = term->fonts[0]->height;
LOG_INFO("cell width=%d, height=%d", term->cell_width, term->cell_height);
render_resize_force(term, term->width, term->height);
}
static void static void
term_font_size_adjust(struct terminal *term, double amount) term_font_size_adjust(struct terminal *term, double amount)
{ {
@ -1129,17 +1147,7 @@ term_font_size_adjust(struct terminal *term, double amount)
return; return;
} }
for (size_t i = 0; i < 4; i++) { term_set_fonts(term, fonts);
font_destroy(term->fonts[i]);
term->fonts[i] = fonts[i];
}
term->cell_width = term->fonts[0]->space_x_advance > 0
? term->fonts[0]->space_x_advance : term->fonts[0]->max_x_advance;
term->cell_height = term->fonts[0]->height;
LOG_INFO("cell width=%d, height=%d", term->cell_width, term->cell_height);
render_resize_force(term, term->width, term->height);
} }
void void
@ -1161,17 +1169,7 @@ term_font_size_reset(struct terminal *term)
if (!initialize_fonts(term, term->conf, fonts)) if (!initialize_fonts(term, term->conf, fonts))
return; return;
for (size_t i = 0; i < 4; i++) { term_set_fonts(term, fonts);
font_destroy(term->fonts[i]);
term->fonts[i] = fonts[i];
}
term->cell_width = term->fonts[0]->space_x_advance > 0
? term->fonts[0]->space_x_advance : term->fonts[0]->max_x_advance;
term->cell_height = term->fonts[0]->height;
LOG_INFO("cell width=%d, height=%d", term->cell_width, term->cell_height);
render_resize_force(term, term->width, term->height);
} }
void void