aboutsummaryrefslogtreecommitdiff
path: root/config.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2024-04-11 13:26:50 +0000
committerDaniel Eklöf <daniel@ekloef.se>2024-04-11 13:26:50 +0000
commit385fc0078fc4aefbdc51275a450493d750e6c071 (patch)
tree83b5cbf909b8a324124bbfc1cfc08a2d26f7369e /config.c
parentmeson: bump version to 1.17.0 (diff)
parentconfig: add new key-binding 'quit', unbound by default (diff)
Merge branch 'master' into releases/1.17
Diffstat (limited to 'config.c')
-rw-r--r--config.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/config.c b/config.c
index d2b75180..d63934b3 100644
--- a/config.c
+++ b/config.c
@@ -119,6 +119,7 @@ static const char *const binding_action_map[] = {
[BIND_ACTION_PROMPT_PREV] = "prompt-prev",
[BIND_ACTION_PROMPT_NEXT] = "prompt-next",
[BIND_ACTION_UNICODE_INPUT] = "unicode-input",
+ [BIND_ACTION_QUIT] = "quit",
/* Mouse-specific actions */
[BIND_ACTION_SCROLLBACK_UP_MOUSE] = "scrollback-up-mouse",
@@ -1383,6 +1384,16 @@ parse_section_cursor(struct context *ctx)
(int *)&conf->cursor.style);
}
+ else if (streq(key, "unfocused-style")) {
+ _Static_assert(sizeof(conf->cursor.unfocused_style) == sizeof(int),
+ "enum is not 32-bit");
+
+ return value_to_enum(
+ ctx,
+ (const char *[]){"unchanged", "hollow", "none", NULL},
+ (int *)&conf->cursor.unfocused_style);
+ }
+
else if (streq(key, "blink"))
return value_to_bool(ctx, &conf->cursor.blink);
@@ -3090,6 +3101,7 @@ config_load(struct config *conf, const char *conf_path,
.cursor = {
.style = CURSOR_BLOCK,
+ .unfocused_style = CURSOR_UNFOCUSED_HOLLOW,
.blink = false,
.color = {
.text = 0,