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

119
url-mode.c
View file

@ -206,7 +206,13 @@ urls_input(struct seat *seat, struct terminal *term, uint32_t key,
}
}
IGNORE_WARNING("-Wpedantic")
static int
wccmp(const void *_a, const void *_b)
{
const wchar_t *a = _a;
const wchar_t *b = _b;
return *a - *b;
}
static void
auto_detected(const struct terminal *term, enum url_action action,
@ -214,6 +220,14 @@ auto_detected(const struct terminal *term, enum url_action action,
{
const struct config *conf = term->conf;
const wchar_t *uri_characters = conf->url.uri_characters;
if (uri_characters == NULL)
return;
const size_t uri_characters_count = wcslen(uri_characters);
if (uri_characters_count == 0)
return;
size_t max_prot_len = conf->url.max_prot_len;
wchar_t proto_chars[max_prot_len];
struct coord proto_start[max_prot_len];
@ -230,6 +244,7 @@ auto_detected(const struct terminal *term, enum url_action action,
ssize_t parenthesis = 0;
ssize_t brackets = 0;
ssize_t ltgts = 0;
for (int r = 0; r < term->rows; r++) {
const struct row *row = grid_row_in_view(term->grid, r);
@ -267,57 +282,73 @@ auto_detected(const struct terminal *term, enum url_action action,
wcsncpy(url, proto, prot_len);
len = prot_len;
parenthesis = brackets = 0;
parenthesis = brackets = ltgts = 0;
break;
}
}
break;
case STATE_URL: {
// static const wchar_t allowed[] =
// L"abcdefghijklmnopqrstuvwxyz0123456789-._~:/?#[]@!$&'()*+,;=";
// static const wchar_t unwise[] = L"{}|\\^[]`";
// static const wchar_t reserved[] = L";/?:@&=+$,";
const wchar_t *match = bsearch(
&wc,
uri_characters,
uri_characters_count,
sizeof(uri_characters[0]),
&wccmp);
bool emit_url = false;
switch (wc) {
case L'a'...L'z':
case L'A'...L'Z':
case L'0'...L'9':
case L'-': case L'.': case L'_': case L'~': case L':':
case L'/': case L'?': case L'#': case L'@': case L'!':
case L'$': case L'&': case L'\'': case L'*': case L'+':
case L',': case L';': case L'=': case L'"': case L'%':
url[len++] = wc;
break;
case L'(':
parenthesis++;
url[len++] = wc;
break;
case L'[':
brackets++;
url[len++] = wc;
break;
case L')':
if (--parenthesis < 0)
emit_url = true;
else
url[len++] = wc;
break;
case L']':
if (--brackets < 0)
emit_url = true;
else
url[len++] = wc;
break;
default:
if (match == NULL) {
/*
* Character is not a valid URI character. Emit
* the URL we’ve collected so far, *without*
* including _this_ character.
*/
emit_url = true;
break;
} else {
xassert(*match == wc);
switch (wc) {
default:
url[len++] = wc;
break;
case L'(':
parenthesis++;
url[len++] = wc;
break;
case L'[':
brackets++;
url[len++] = wc;
break;
case L'<':
ltgts++;
url[len++] = wc;
break;
case L')':
if (--parenthesis < 0)
emit_url = true;
else
url[len++] = wc;
break;
case L']':
if (--brackets < 0)
emit_url = true;
else
url[len++] = wc;
break;
case L'>':
if (--ltgts < 0)
emit_url = true;
else
url[len++] = wc;
break;
}
}
if (c >= term->cols - 1 && row->linebreak) {
@ -382,7 +413,7 @@ auto_detected(const struct terminal *term, enum url_action action,
state = STATE_PROTOCOL;
len = 0;
parenthesis = brackets = 0;
parenthesis = brackets = ltgts = 0;
}
break;
}
@ -391,8 +422,6 @@ auto_detected(const struct terminal *term, enum url_action action,
}
}
UNIGNORE_WARNINGS
static void
osc8_uris(const struct terminal *term, enum url_action action, url_list_t *urls)
{