aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2022-11-22 08:34:53 +0000
committerDaniel Eklöf <daniel@ekloef.se>2022-11-22 08:34:53 +0000
commit4d2b8a993f565061386599a09f25358274700897 (patch)
tree42cdaf7055e212bfcfab4c432efaf6f3f3ccd64a
parentadded modus themes (diff)
parentwayland: force monitor DPI to 96 when it’s unreasonably high (diff)
Merge branch 'fp-calc-dpi'
Closes #1209
-rw-r--r--CHANGELOG.md3
-rw-r--r--wayland.c14
2 files changed, 14 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3546d92e..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
@@ -94,10 +95,12 @@
* Background transparency being applied to the text "behind" the
cursor. Only applies to block cursor using inversed fg/bg
colors. ([#1205][1205]).
+* Crash when monitor’s physical size is "too small" ([#1209][1209]).
[1173]: https://codeberg.org/dnkl/foot/issues/1173
[1190]: https://codeberg.org/dnkl/foot/issues/1190
[1205]: https://codeberg.org/dnkl/foot/issues/1205
+[1209]: https://codeberg.org/dnkl/foot/issues/1209
### Security
diff --git a/wayland.c b/wayland.c
index fb103ad1..e48d59aa 100644
--- a/wayland.c
+++ b/wayland.c
@@ -370,8 +370,8 @@ output_update_ppi(struct monitor *mon)
if (mon->dim.mm.width <= 0 || mon->dim.mm.height <= 0)
return;
- int x_inches = mon->dim.mm.width * 0.03937008;
- int y_inches = mon->dim.mm.height * 0.03937008;
+ double x_inches = mon->dim.mm.width * 0.03937008;
+ double 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;
@@ -407,8 +407,16 @@ output_update_ppi(struct monitor *mon)
mon->ppi.scaled.x = scaled_width / x_inches;
mon->ppi.scaled.y = scaled_height / y_inches;
- float px_diag = sqrt(pow(scaled_width, 2) + pow(scaled_height, 2));
+ 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