diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2021-08-11 16:24:25 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2021-08-11 16:24:25 +0000 |
| commit | 2b14e285126ccc1bdc53ecb3a86c6ed035eec65f (patch) | |
| tree | fadb7ea9a145571872aaa4c9cf63566547279700 /config.c | |
| parent | meson: require meson >= 0.54 (diff) | |
| parent | changelog: url.uri-characters (diff) | |
Merge branch 'uri-characters'
Closes #654
Diffstat (limited to 'config.c')
| -rw-r--r-- | config.c | 35 |
1 files changed, 35 insertions, 0 deletions
@@ -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); |
