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

wayland: use fp math all the way when calculating DPI

Browse source 
This fixes an FPE when the monitor’s physical width/height is so small
that the conversion from mm to inch resulted in inches being zero.
This commit is contained in:
Daniel Eklöf 2022-11-04 17:42:52 +01:00
parent fa9beae3a6
commit 2910ca354c
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -94,10 +94,12 @@
* Background transparency being applied to the text "behind" the * Background transparency being applied to the text "behind" the
cursor. Only applies to block cursor using inversed fg/bg cursor. Only applies to block cursor using inversed fg/bg
colors. ([#1205][1205]). colors. ([#1205][1205]).
* Crash when monitor’s physical size is "too small" ([#1209][1209]).
[1173]: https://codeberg.org/dnkl/foot/issues/1173 [1173]: https://codeberg.org/dnkl/foot/issues/1173
[1190]: https://codeberg.org/dnkl/foot/issues/1190 [1190]: https://codeberg.org/dnkl/foot/issues/1190
[1205]: https://codeberg.org/dnkl/foot/issues/1205 [1205]: https://codeberg.org/dnkl/foot/issues/1205
[1209]: https://codeberg.org/dnkl/foot/issues/1209
### Security ### Security

6
wayland.c
View file

@ -370,8 +370,8 @@ output_update_ppi(struct monitor *mon)
if (mon->dim.mm.width <= 0 || mon->dim.mm.height <= 0) if (mon->dim.mm.width <= 0 || mon->dim.mm.height <= 0)
return; return;
int x_inches = mon->dim.mm.width * 0.03937008; double x_inches = mon->dim.mm.width * 0.03937008;
int y_inches = mon->dim.mm.height * 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.x = mon->dim.px_real.width / x_inches;
mon->ppi.real.y = mon->dim.px_real.height / y_inches; mon->ppi.real.y = mon->dim.px_real.height / y_inches;
@ -407,7 +407,7 @@ output_update_ppi(struct monitor *mon)
mon->ppi.scaled.x = scaled_width / x_inches; mon->ppi.scaled.x = scaled_width / x_inches;
mon->ppi.scaled.y = scaled_height / y_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; mon->dpi = px_diag / mon->inch * mon->scale;
} }