aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2022-11-04 16:45:43 +0000
committerDaniel Eklöf <daniel@ekloef.se>2022-11-04 16:49:01 +0000
commit42c6af091440e89be9c0d8895a1c5ff1caac5427 (patch)
tree42cdaf7055e212bfcfab4c432efaf6f3f3ccd64a
parentwayland: use fp math all the way when calculating DPI (diff)
wayland: force monitor DPI to 96 when it’s unreasonably high
If an output has a bogus physical width or height, the DPI can become so high that the cell width/height is too large for pixman_image_fill_rectangles(), resulting in a crash in pixman_fill(). Since it doesn’t make any sense to use a DPI that is obviously bogus, don’t. Force it 96 instead.
-rw-r--r--CHANGELOG.md1
-rw-r--r--wayland.c8
2 files changed, 9 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9c41f21a..f4089b37 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -64,6 +64,7 @@
("permanently reset") instead of `2` ("reset") for DEC private
modes that are known but unsupported.
* Set `PWD` environment variable in the slave process ([#1179][1179]).
+* DPI is now forced to 96 when found to be unreasonably high.
[1166]: https://codeberg.org/dnkl/foot/issues/1166
[1179]: https://codeberg.org/dnkl/foot/issues/1179
diff --git a/wayland.c b/wayland.c
index 974dfb39..e48d59aa 100644
--- a/wayland.c
+++ b/wayland.c
@@ -409,6 +409,14 @@ output_update_ppi(struct monitor *mon)
double px_diag = sqrt(pow(scaled_width, 2) + pow(scaled_height, 2));
mon->dpi = px_diag / mon->inch * mon->scale;
+
+ if (mon->dpi > 1000) {
+ if (mon->name != NULL) {
+ LOG_WARN("%s: DPI=%f is unreasonable, using 96 instead",
+ mon->name, mon->dpi);
+ }
+ mon->dpi = 96;
+ }
}
static void