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

wayland: calculate a single, scaled DPI value

Browse source 
Previously, we calculated the monitors horizontal and vertical PPI
values.

For font sizing, we used the vertical PPI value. It seems however,
that using the diagonal PPI value, i.e. diagonal_px / diagonal_inch,
gives more consistent results.

This is still a PPI value, but since it is intended to be used as a
FontConfig DPI value, name it 'dpi'.
This commit is contained in:
Daniel Eklöf 2020-07-26 07:41:57 +02:00
parent d675cf8720
commit 9601ed7cfb
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
wayland.c
View file

@ -294,11 +294,18 @@ output_update_ppi(struct monitor *mon)
int x_inches = mon->dim.mm.width * 0.03937008;
int y_inches = mon->dim.mm.height * 0.03937008;
mon->ppi.real.x = mon->dim.px_real.width / x_inches;
mon->ppi.real.y = mon->dim.px_real.height / y_inches;
mon->ppi.scaled.x = mon->dim.px_scaled.width / x_inches;
mon->ppi.scaled.y = mon->dim.px_scaled.height / y_inches;
float px_diag = sqrt(
pow(mon->dim.px_scaled.width, 2) +
pow(mon->dim.px_scaled.height, 2));
mon->dpi = px_diag / mon->inch * mon->scale;
}
static void
@ -343,6 +350,7 @@ output_scale(void *data, struct wl_output *wl_output, int32_t factor)
{
struct monitor *mon = data;
mon->scale = factor;
output_update_ppi(mon);
}
static const struct wl_output_listener output_listener = {
@ -1029,13 +1037,14 @@ wayl_init(const struct config *conf, struct fdm *fdm)
tll_foreach(wayl->monitors, it) {
LOG_INFO(
"%s: %dx%d+%dx%d@%dHz %s %.2f\" scale=%d PPI=%dx%d (physical) PPI=%dx%d (logical)",
"%s: %dx%d+%dx%d@%dHz %s %.2f\" scale=%d PPI=%dx%d (physical) PPI=%dx%d (logical), DPI=%.2f",
it->item.name, it->item.dim.px_real.width, it->item.dim.px_real.height,
it->item.x, it->item.y, (int)round(it->item.refresh),
it->item.model != NULL ? it->item.model : it->item.description,
it->item.inch, it->item.scale,
it->item.ppi.real.x, it->item.ppi.real.y,
it->item.ppi.scaled.x, it->item.ppi.scaled.y);
it->item.ppi.scaled.x, it->item.ppi.scaled.y,
it->item.dpi);
}
wayl->fd = wl_display_get_fd(wayl->display);

2
wayland.h
View file

@ -236,6 +236,8 @@ struct monitor {
} scaled;
} ppi;
float dpi;
int scale;
float refresh;
enum wl_output_subpixel subpixel;