aboutsummaryrefslogtreecommitdiff
path: root/config.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-04-30 18:31:47 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-04-30 18:36:16 +0000
commit7ce767ab87ca915b2ac4023cc95dbda81fe87abd (patch)
tree517f2e52ff5d626429b0f478b927bfb27028348e /config.c
parentMerge branch 'bsu-esu-logging' (diff)
config: add ‘beam-thickness’ option
* Rename cursor.style value ‘bar’ to ‘beam’. ‘bar’ remains recognized, but should eventually be deprecated and then removed. * Add ‘cursor.beam-thickness’ option, a pt-or-px value specifying the thickness of the beam cursor. Defaults to 1.5pt. * Rename (and export) pt_or_px_as_pixels() to term_pt_or_px_as_pixels() * Change term_pt_or_px_as_pixels() to round point values instead of truncating them.
Diffstat (limited to 'config.c')
-rw-r--r--config.c15
1 files changed, 12 insertions, 3 deletions
diff --git a/config.c b/config.c
index 3aed1e7d..f5446107 100644
--- a/config.c
+++ b/config.c
@@ -941,13 +941,14 @@ parse_section_cursor(const char *key, const char *value, struct config *conf,
if (strcmp(key, "style") == 0) {
if (strcmp(value, "block") == 0)
conf->cursor.style = CURSOR_BLOCK;
- else if (strcmp(value, "bar") == 0)
- conf->cursor.style = CURSOR_BAR;
+ else if (strcmp(value, "beam") == 0 || strcmp(value, "bar") == 0)
+ conf->cursor.style = CURSOR_BEAM;
else if (strcmp(value, "underline") == 0)
conf->cursor.style = CURSOR_UNDERLINE;
else {
- LOG_AND_NOTIFY_ERR("%s:%d: invalid 'style': %s", path, lineno, value);
+ LOG_AND_NOTIFY_ERR("%s:%d: style: one of block, beam or underline",
+ path, lineno);
return false;
}
}
@@ -967,6 +968,13 @@ parse_section_cursor(const char *key, const char *value, struct config *conf,
conf->cursor.color.cursor |= 1u << 31;
}
+ else if (strcmp(key, "beam-thickness") == 0) {
+ if (!str_to_pt_or_px(
+ value, &conf->cursor.beam_thickness,
+ conf, path, lineno, "cursor", "beam-thickness"))
+ return false;
+ }
+
else {
LOG_AND_NOTIFY_ERR("%s:%d: [cursor]: %s: invalid key", path, lineno, key);
return false;
@@ -2261,6 +2269,7 @@ config_load(struct config *conf, const char *conf_path,
.text = 0,
.cursor = 0,
},
+ .beam_thickness = {.pt = 1.5},
},
.mouse = {
.hide_when_typing = false,