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

style, consistent bool names, deprecate old config

Browse source
This commit is contained in:
Ryan Farley 2021-05-07 04:40:07 -05:00
parent 5d71ccc174
commit dc9751cbfe
3 changed files with 32 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

26
config.c
View file

@ -593,6 +593,32 @@ parse_section_main(const char *key, const char *value, struct config *conf,
} }
} }
else if (strcmp(key, "bell") == 0) {
LOG_WARN("deprecated: %s:%d: [default]: bell: set actions in section 'bell' instead", path, lineno);
const char fmt[] = "%s:%d \033[1mbell\033[21m, use section \033[1m[bell]\033[21m instead";
char *text = xasprintf(fmt, path, lineno);
struct user_notification deprecation = {
.kind = USER_NOTIFICATION_DEPRECATED,
.text = text,
};
tll_push_back(conf->notifications, deprecation);
if (strcmp(value, "set-urgency") == 0)
conf->bell.urgent = true;
else if (strcmp(value, "notify") == 0)
conf->bell.notify = true;
/* we do nothing by default, so none may be ignored */
else {
LOG_AND_NOTIFY_ERR(
"%s%d: [default]: bell: "
"expected either 'set-urgency', 'notify' or 'none'",
path, lineno);
return false;
}
}
else if (strcmp(key, "initial-window-mode") == 0) { else if (strcmp(key, "initial-window-mode") == 0) {
if (strcmp(value, "windowed") == 0) if (strcmp(value, "windowed") == 0)
conf->startup_mode = STARTUP_WINDOWED; conf->startup_mode = STARTUP_WINDOWED;

10
doc/foot.ini.5.scd
View file

@ -265,7 +265,7 @@ in this order:
# SECTION: bell # SECTION: bell
*urgent* *urgent*
When set to _true_, the margins will be painted in red When set to _yes_, the margins will be painted in red
whenever *BEL* is received while the window does *not* have whenever *BEL* is received while the window does *not* have
keyboard focus. Note that Wayland currently does not have an keyboard focus. Note that Wayland currently does not have an
_urgency_ hint like X11. The name *urgent* was chosen for _urgency_ hint like X11. The name *urgent* was chosen for
@ -278,13 +278,13 @@ in this order:
_Note_: expect this feature to be *replaced* with proper _Note_: expect this feature to be *replaced* with proper
compositor urgency support once/if that gets implemented. compositor urgency support once/if that gets implemented.
Default: _false_ Default: _no_
*notify* *notify*
When set to _true_, foot will emit a desktop notification using When set to _yes_, foot will emit a desktop notification using
the command specified in the *notify* option whenever *BEL* is the command specified in the *notify* option whenever *BEL* is
received and the window does *not* have keyboard focus. Default: received and the window does *not* have keyboard focus. Default:
_false_ _no_
*command* *command*
When set, foot will execute this command when *BEL* is received. When set, foot will execute this command when *BEL* is received.
@ -292,7 +292,7 @@ in this order:
*command-focused* *command-focused*
Whether to run the command on *BEL* even while focused. Default: Whether to run the command on *BEL* even while focused. Default:
_false_ _no_
# SECTION: scrollback # SECTION: scrollback

2
terminal.c
View file

@ -2641,7 +2641,7 @@ term_bell(struct terminal *term)
notify_notify(term, "Bell", "Bell in terminal"); notify_notify(term, "Bell", "Bell in terminal");
} }
if (term->conf->bell.command.argv && (!term->kbd_focus || term->conf->bell.command_focused)) { if ((term->conf->bell.command.argv != NULL) && (!term->kbd_focus || term->conf->bell.command_focused)) {
int devnull = open("/dev/null", O_RDONLY); int devnull = open("/dev/null", O_RDONLY);
spawn(term->reaper, NULL, term->conf->bell.command.argv, devnull, -1, -1); spawn(term->reaper, NULL, term->conf->bell.command.argv, devnull, -1, -1);