From 2afc6782361d0deaa443234466775b1121feec8f Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Thu, 13 May 2021 11:10:51 +0200 Subject: term: get rid of term->font_scale, use term->scale only MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We only needed term->font_scale to be able to detect scaling factor changes (term->font_scale != term->scale). But, we already have the old scaling factor in all places where term_font_dpi_changed() is called, so let’s pass the old scaling factor as an argument instead. --- terminal.c | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) (limited to 'terminal.c') diff --git a/terminal.c b/terminal.c index 7fd6f551..4a39b659 100644 --- a/terminal.c +++ b/terminal.c @@ -769,22 +769,16 @@ get_font_subpixel(const struct terminal *term) } static bool -font_size_by_dpi_for_scale(const struct terminal *term, int new_scale) +font_sized_by_dpi(const struct terminal *term, int scale) { return term->conf->dpi_aware == DPI_AWARE_YES || - (term->conf->dpi_aware == DPI_AWARE_AUTO && new_scale <= 1); + (term->conf->dpi_aware == DPI_AWARE_AUTO && scale <= 1); } static bool -font_sized_by_dpi(const struct terminal *term) +font_sized_by_scale(const struct terminal *term, int scale) { - return font_size_by_dpi_for_scale(term, term->font_scale); -} - -static bool -font_sized_by_scale(const struct terminal *term) -{ - return !font_sized_by_dpi(term); + return !font_sized_by_dpi(term, scale); } @@ -824,7 +818,8 @@ reload_fonts(struct terminal *term) bool use_px_size = term->font_sizes[i][j].px_size > 0; char size[64]; - const int scale = font_sized_by_scale(term) ? term->scale : 1; + const int scale = + font_sized_by_scale(term, term->scale) ? term->scale : 1; if (use_px_size) snprintf(size, sizeof(size), ":pixelsize=%d", @@ -860,7 +855,7 @@ reload_fonts(struct terminal *term) const size_t count_bold_italic = custom_bold_italic ? counts[3] : counts[0]; const char **names_bold_italic = (const char **)(custom_bold_italic ? names[3] : names[0]); - const bool use_dpi = font_sized_by_dpi(term); + const bool use_dpi = font_sized_by_dpi(term, term->scale); char *attrs[4] = {NULL}; int attr_len[4] = {-1, -1, -1, -1}; /* -1, so that +1 (below) results in 0 */ @@ -1043,7 +1038,6 @@ term_init(const struct config *conf, struct fdm *fdm, struct reaper *reaper, xmalloc(sizeof(term->font_sizes[3][0]) * tll_length(conf->fonts[3])), }, .font_dpi = 0., - .font_scale = 0, .font_subpixel = (conf->colors.alpha == 0xffff /* Can't do subpixel rendering on transparent background */ ? FCFT_SUBPIXEL_DEFAULT : FCFT_SUBPIXEL_NONE), @@ -1169,7 +1163,7 @@ term_init(const struct config *conf, struct fdm *fdm, struct reaper *reaper, goto err; /* Load fonts */ - if (!term_font_dpi_changed(term)) + if (!term_font_dpi_changed(term, 0)) goto err; term->font_subpixel = get_font_subpixel(term); @@ -1770,19 +1764,19 @@ term_font_size_reset(struct terminal *term) } bool -term_font_dpi_changed(struct terminal *term) +term_font_dpi_changed(struct terminal *term, int old_scale) { float dpi = get_font_dpi(term); xassert(term->scale > 0); - bool was_scaled_using_dpi = font_sized_by_dpi(term); - bool will_scale_using_dpi = font_size_by_dpi_for_scale(term, term->scale); + bool was_scaled_using_dpi = font_sized_by_dpi(term, old_scale); + bool will_scale_using_dpi = font_sized_by_dpi(term, term->scale); bool need_font_reload = was_scaled_using_dpi != will_scale_using_dpi || (will_scale_using_dpi ? term->font_dpi != dpi - : term->font_scale != term->scale); + : old_scale != term->scale); if (need_font_reload) { LOG_DBG("DPI/scale change: DPI-awareness=%s, " @@ -1795,7 +1789,6 @@ term_font_dpi_changed(struct terminal *term) } term->font_dpi = dpi; - term->font_scale = term->scale; if (!need_font_reload) return true; -- cgit v1.3