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

config: add url.uri-characters

Browse source 
This option specifies the characters allowed in the auto-detected
URLs.

Any character not in this set constitutes an URL delimiter, and will
never be included in auto-detected URLs.

This option does not affect OSC-8 URLs.

Closes #654
This commit is contained in:
Daniel Eklöf 2021-08-09 18:25:36 +02:00
parent f9ba2a8c5c
commit 0c03e9a766
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
5 changed files with 119 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

35
config.c
View file

@ -364,6 +364,14 @@ done:
goto out;
}
static int
wccmp(const void *_a, const void *_b)
{
const wchar_t *a = _a;
const wchar_t *b = _b;
return *a - *b;
}
static bool
str_has_prefix(const char *str, const char *prefix)
{
@ -1213,6 +1221,24 @@ parse_section_url(const char *key, const char *value, struct config *conf,
free(copy);
}
else if (strcmp(key, "uri-characters") == 0) {
wchar_t *uri_characters;
if (!str_to_wchars(value, &uri_characters, conf, path, lineno,
"url", "uri-characters"))
{
return false;
}
free(conf->url.uri_characters);
qsort(
uri_characters,
wcslen(uri_characters),
sizeof(uri_characters[0]),
&wccmp);
conf->url.uri_characters = uri_characters;
}
else {
LOG_AND_NOTIFY_ERR("%s:%d: [url]: %s: invalid key", path, lineno, key);
return false;
@ -2842,6 +2868,7 @@ config_load(struct config *conf, const char *conf_path,
},
.url = {
.label_letters = xwcsdup(L"sadfjklewcmpgh"),
.uri_characters = xwcsdup(L"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_.,~:;/?#@!$&%*+=\"'()[]"),
.osc8_underline = OSC8_UNDERLINE_URL_MODE,
},
.can_shape_grapheme = fcft_caps & FCFT_CAPABILITY_GRAPHEME_SHAPING,
@ -2985,6 +3012,12 @@ config_load(struct config *conf, const char *conf_path,
conf->url.protocols[i] = xwcsdup(url_protocols[i]);
}
qsort(
conf->url.uri_characters,
wcslen(conf->url.uri_characters),
sizeof(conf->url.uri_characters[0]),
&wccmp);
tll_foreach(*initial_user_notifications, it) {
tll_push_back(conf->notifications, it->item);
tll_remove(*initial_user_notifications, it);
@ -3207,6 +3240,7 @@ config_clone(const struct config *old)
config_font_list_clone(&conf->csd.font, &old->csd.font);
conf->url.label_letters = xwcsdup(old->url.label_letters);
conf->url.uri_characters = xwcsdup(old->url.uri_characters);
spawn_template_clone(&conf->url.launch, &old->url.launch);
conf->url.protocols = xmalloc(
old->url.prot_count * sizeof(conf->url.protocols[0]));
@ -3274,6 +3308,7 @@ config_free(struct config conf)
for (size_t i = 0; i < conf.url.prot_count; i++)
free(conf.url.protocols[i]);
free(conf.url.protocols);
free(conf.url.uri_characters);
key_binding_list_free(&conf.bindings.key);
key_binding_list_free(&conf.bindings.search);