From acecab1c8bcb414521867fce46d238ad48f4b621 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Wed, 11 Mar 2020 16:10:55 +0100 Subject: term: use logical DPI+scale factor when scaling fonts This fixes an issue where the fonts were rendered too small when the output had fractional scaling. For integral scaling, using the logical (scaled) DPI multiplied with the scaling factor results in the same final DPI value as if we had used the physical DPI. But for fractional scaling, this works around the fact that the compositor downscales the surface after we've rendered it. Closes #5 --- terminal.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) (limited to 'terminal.c') diff --git a/terminal.c b/terminal.c index 2a742268..f7219480 100644 --- a/terminal.c +++ b/terminal.c @@ -532,18 +532,39 @@ term_set_fonts(struct terminal *term, struct font *fonts[static 4]) static unsigned get_font_dpi(const struct terminal *term) { + /* + * Use output's DPI to scale font. This is to ensure the font has + * the same physical height (if measured by a ruler) regardless of + * monitor. + * + * Conceptually, we use the physical monitor specs to calculate + * the DPI, and we ignore the output's scaling factor. + * + * However, to deal with fractional scaling, where we're told to + * render at e.g. 2x, but are then downscaled by the compositor to + * e.g. 1.25, we use the scaled DPI value multiplied by the scale + * factor instead. + * + * For integral scaling factors the resulting DPI is the same as + * if we had used the physical DPI. + * + * For fractional scaling factors we'll get a DPI *larger* than + * the physical DPI, that ends up being right when later + * downscaled by the compositor. + */ + /* Use highest DPI from outputs we're mapped on */ unsigned dpi = 0; assert(term->window != NULL); tll_foreach(term->window->on_outputs, it) { - if (it->item->y_ppi > dpi) - dpi = it->item->y_ppi; + if (it->item->ppi.scaled.y > dpi) + dpi = it->item->ppi.scaled.y * term->scale; } /* If we're not mapped, use DPI from first monitor. Hopefully this is where we'll get mapped later... */ if (dpi == 0) { tll_foreach(term->wl->monitors, it) { - dpi = it->item.y_ppi; + dpi = it->item.ppi.scaled.y * term->scale; break; } } -- cgit v1.3