aboutsummaryrefslogtreecommitdiff
path: root/terminal.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2023-06-26 15:55:04 +0000
committerDaniel Eklöf <daniel@ekloef.se>2023-06-29 13:38:23 +0000
commit64b6b5d2a7b81bcad3f0a50a6c1556fd7300c171 (patch)
treed6e3a7911d71b08ec8ac71a0e0f100d91a4c9fd0 /terminal.c
parentchangelog: mention the newly added support for fractional-scaling-v1 (diff)
config: dpi-aware: remove ‘auto’ value, and default to ‘no’
We now default to scaling fonts using the scaling factor, not monitor DPI. The ‘auto’ value for dpi-aware has been removed. Documentation (man pages and README) have been updated to reflect the new default.
Diffstat (limited to 'terminal.c')
-rw-r--r--terminal.c38
1 files changed, 1 insertions, 37 deletions
diff --git a/terminal.c b/terminal.c
index 825e1550..090cbb20 100644
--- a/terminal.c
+++ b/terminal.c
@@ -912,42 +912,6 @@ get_font_subpixel(const struct terminal *term)
return FCFT_SUBPIXEL_DEFAULT;
}
-static bool
-term_font_size_by_dpi(const struct terminal *term)
-{
- switch (term->conf->dpi_aware) {
- case DPI_AWARE_YES: return true;
- case DPI_AWARE_NO: return false;
-
- case DPI_AWARE_AUTO:
- /*
- * Scale using DPI if all monitors have a scaling factor or 1.
- *
- * The idea is this: if a user, with multiple monitors, have
- * enabled scaling on at least one monitor, then he/she has
- * most likely done so to match the size of his/hers other
- * monitors.
- *
- * I.e. if the user has one monitor with a scaling factor of
- * one, and another with a scaling factor of two, he/she
- * expects things to be twice as large on the second
- * monitor.
- *
- * If we (foot) scale using DPI on the first monitor, and
- * using the scaling factor on the second monitor, foot will
- * *not* look twice as big on the second monitor.
- */
- tll_foreach(term->wl->monitors, it) {
- const struct monitor *mon = &it->item;
- if (mon->scale > 1)
- return false;
- }
- return true;
- }
-
- BUG("unhandled DPI awareness value");
-}
-
int
term_pt_or_px_as_pixels(const struct terminal *term,
const struct pt_or_px *pt_or_px)
@@ -2158,7 +2122,7 @@ term_font_dpi_changed(struct terminal *term, int old_scale)
xassert(term->scale > 0);
bool was_scaled_using_dpi = term->font_is_sized_by_dpi;
- bool will_scale_using_dpi = term_font_size_by_dpi(term);
+ bool will_scale_using_dpi = term->conf->dpi_aware;
bool need_font_reload =
was_scaled_using_dpi != will_scale_using_dpi ||