aboutsummaryrefslogtreecommitdiff
path: root/config.h
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-01-07 16:00:58 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-01-11 08:31:08 +0000
commita6fc8b5da4a3bfc9b1d3994797826518103879ac (patch)
tree7ee4333c53847900a895b566d5414ee375ba23fd /config.h
parentconfig: str_to_color(): use LOG_AND_NOTIFY(), not just LOG() (diff)
config: line-height, letter-spacing: values are in pt by default, but we allow px
If the value is specified without a unit, then the value is assumed to be in points, subject to DPI scaling. The value can optionally have a ‘px’ suffix, in which case the value is treated as a raw pixel count.
Diffstat (limited to 'config.h')
-rw-r--r--config.h14
1 files changed, 10 insertions, 4 deletions
diff --git a/config.h b/config.h
index 9b33b37f..e9bc310f 100644
--- a/config.h
+++ b/config.h
@@ -54,6 +54,12 @@ struct config_mouse_binding {
} pipe;
};
+/* If px == -1, neither px nor pt is valid. If px == 0, pt is valid, else px */
+union pt_or_px {
+ int16_t px;
+ float pt;
+};
+
struct config {
char *term;
char *shell;
@@ -85,12 +91,12 @@ struct config {
config_font_list_t fonts[4];
/* Custom font metrics (-1 = use real font metrics) */
- int16_t line_height;
- int16_t letter_spacing;
+ union pt_or_px line_height;
+ union pt_or_px letter_spacing;
/* Adjusted letter x/y offsets */
- int16_t horizontal_letter_offset;
- int16_t vertical_letter_offset;
+ union pt_or_px horizontal_letter_offset;
+ union pt_or_px vertical_letter_offset;
struct {
int lines;