diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2020-03-13 17:48:15 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2020-03-13 17:48:15 +0000 |
| commit | 59a1204c5080099b1d1d42a80d8aff94936ff3fa (patch) | |
| tree | cd1ac1e135c1b81fbf21f64ce25fe7d2cd31f0ca /wayland.h | |
| parent | sixel: improve handling of images when reflowing the grids (diff) | |
| parent | changelog: mention fix for #5 (diff) | |
Merge branch 'scale-fonts-using-logical-dpi-plus-scale-factor'
Diffstat (limited to 'wayland.h')
| -rw-r--r-- | wayland.h | 37 |
1 files changed, 31 insertions, 6 deletions
@@ -24,14 +24,39 @@ struct monitor { int x; int y; - int width_mm; - int height_mm; + struct { + /* Physical size, in mm */ + struct { + int width; + int height; + } mm; + + /* Physical size, in pixels */ + struct { + int width; + int height; + } px_real; - int width_px; - int height_px; + /* Scaled size, in pixels */ + struct { + int width; + int height; + } px_scaled; + } dim; + + struct { + /* PPI, based on physical size */ + struct { + int x; + int y; + } real; - int x_ppi; - int y_ppi; + /* PPI, logical, based on scaled size */ + struct { + int x; + int y; + } scaled; + } ppi; int scale; float refresh; |
