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

Merge branch 'url-mode-off-by-one'

Browse source
This commit is contained in:
Daniel Eklöf 2021-06-02 08:11:20 +02:00
commit 363aeea2df
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -147,6 +147,8 @@
around (https://codeberg.org/dnkl/foot/issues/552).
* Selection incorrectly wrapping rows ending with an explicit newline
(https://codeberg.org/dnkl/foot/issues/565).
* Off-by-one error in markup of auto-detected URLs when the URL ends
in the right-most column.
### Security

16
url-mode.c
View file

@ -320,14 +320,16 @@ auto_detected(const struct terminal *term, enum url_action action,
break;
}
if (c >= term->cols - 1 && row->linebreak)
if (c >= term->cols - 1 && row->linebreak) {
/*
* Endpoint is inclusive, and we’ll be subtracting
* 1 from the column when emitting the URL.
*/
c++;
emit_url = true;
}
if (emit_url) {
/* Heuristic to remove trailing characters that
* are valid URL characters, but typically not at
* the end of the URL */
bool done = false;
struct coord end = {c, r};
if (--end.col < 0) {
@ -335,6 +337,10 @@ auto_detected(const struct terminal *term, enum url_action action,
end.col = term->cols - 1;
}
/* Heuristic to remove trailing characters that
* are valid URL characters, but typically not at
* the end of the URL */
bool done = false;
do {
switch (url[len - 1]) {
case L'.': case L',': case L':': case L';': case L'?':