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

config: remove options that were deprecated in 1.8.x

Browse source 
* [main].bell
* [main].jump-label-letters
* [main].url-launch
* [main].osc8-underline
This commit is contained in:
Daniel Eklöf 2021-11-14 14:17:08 +01:00
parent 26515b7ab9
commit 0686f94b18
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 3 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -74,6 +74,9 @@
### Removed
* The bundled PKGBUILD.
* Deprecated `bell` option (replaced with `[bell]` section in 1.8.0).
* Deprecated `url-launch`, `jump-label-letters` and `osc8-underline`
options (moved to a dedicated `[url]` section in 1.8.0)
### Fixed

82
config.c
View file

@ -804,26 +804,6 @@ value_to_spawn_template(struct context *ctx,
return true;
}
static void
deprecated_url_option(struct config *conf,
const char *old_name, const char *new_name,
const char *path, unsigned lineno)
{
LOG_WARN(
"deprecated: %s:%d: [main].%s: use '%s' in section '[url]' instead",
path, lineno, old_name, new_name);
const char fmt[] =
"%s:%d: \033[1m%s\033[22m, use \033[1m%s\033[22m in the \033[1m[url]\033[22m section instead";
char *text = xasprintf(fmt, path, lineno, old_name, new_name);
struct user_notification deprecation = {
.kind = USER_NOTIFICATION_DEPRECATED,
.text = text,
};
tll_push_back(conf->notifications, deprecation);
}
static bool parse_config_file(
FILE *f, struct config *conf, const char *path, bool errors_are_fatal);
@ -833,8 +813,6 @@ parse_section_main(struct context *ctx)
struct config *conf = ctx->conf;
const char *key = ctx->key;
const char *value = ctx->value;
const char *path = ctx->path;
unsigned lineno = ctx->lineno;
bool errors_are_fatal = ctx->errors_are_fatal;
if (strcmp(key, "include") == 0) {
@ -946,39 +924,6 @@ parse_section_main(struct context *ctx)
return true;
}
else if (strcmp(key, "bell") == 0) {
LOG_WARN(
"deprecated: %s:%d: [main].bell: "
"set actions in section '[bell]' instead", path, lineno);
const char fmt[] =
"%s:%d: \033[1mbell\033[22m, use \033[1murgent\033[22m in "
"the \033[1m[bell]\033[22m section instead";
struct user_notification deprecation = {
.kind = USER_NOTIFICATION_DEPRECATED,
.text = xasprintf(fmt, path, lineno),
};
tll_push_back(conf->notifications, deprecation);
int bell;
if (!value_to_enum(
ctx,
(const char *[]){"set-urgency", "notify", "none", NULL},
&bell))
{
return false;
}
switch (bell) {
case 0: conf->bell.urgent = true; return true;
case 1: conf->bell.notify = true; return true;
case 2: memset(&conf->bell, 0, sizeof(conf->bell)); return true;
}
UNREACHABLE();
}
else if (strcmp(key, "initial-window-mode") == 0) {
_Static_assert(sizeof(conf->startup_mode) == sizeof(int),
"enum is not 32-bit");
@ -1046,26 +991,12 @@ parse_section_main(struct context *ctx)
else if (strcmp(key, "word-delimiters") == 0)
return value_to_wchars(ctx, &conf->word_delimiters);
else if (strcmp(key, "jump-label-letters") == 0) {
deprecated_url_option(
conf, "jump-label-letters", "label-letters", path, lineno);
return value_to_wchars(ctx, &conf->url.label_letters);
}
else if (strcmp(key, "notify") == 0)
return value_to_spawn_template(ctx, &conf->notify);
else if (strcmp(key, "notify-focus-inhibit") == 0)
return value_to_bool(ctx, &conf->notify_focus_inhibit);
else if (strcmp(key, "url-launch") == 0) {
deprecated_url_option(
conf, "url-launch", "launch", path, lineno);
return value_to_spawn_template(ctx, &conf->url.launch);
}
else if (strcmp(key, "selection-target") == 0) {
_Static_assert(sizeof(conf->selection_target) == sizeof(int),
"enum is not 32-bit");
@ -1076,19 +1007,6 @@ parse_section_main(struct context *ctx)
(int *)&conf->selection_target);
}
else if (strcmp(key, "osc8-underline") == 0) {
deprecated_url_option(
conf, "osc8-underline", "osc8-underline", path, lineno);
_Static_assert(sizeof(conf->url.osc8_underline) == sizeof(int),
"enum is not 32-bit");
return value_to_enum(
ctx,
(const char *[]){"url-mode", "always", NULL},
(int *)&conf->url.osc8_underline);
}
else if (strcmp(key, "box-drawings-uses-font-glyphs") == 0)
return value_to_bool(ctx, &conf->box_drawings_uses_font_glyphs);