aboutsummaryrefslogtreecommitdiff
path: root/terminal.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-03-13 17:48:15 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-03-13 17:48:15 +0000
commit59a1204c5080099b1d1d42a80d8aff94936ff3fa (patch)
treecd1ac1e135c1b81fbf21f64ce25fe7d2cd31f0ca /terminal.c
parentsixel: improve handling of images when reflowing the grids (diff)
parentchangelog: mention fix for #5 (diff)
Merge branch 'scale-fonts-using-logical-dpi-plus-scale-factor'
Diffstat (limited to 'terminal.c')
-rw-r--r--terminal.c27
1 files changed, 24 insertions, 3 deletions
diff --git a/terminal.c b/terminal.c
index 35e145a7..17233690 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;
}
}