aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2025-10-04 07:24:47 +0000
committerDaniel Eklöf <daniel@ekloef.se>2025-10-04 07:24:47 +0000
commit80951ab7a6b3bcc4dd3c30a5454bf648d3d9ed93 (patch)
tree175afcc2961b0258a2af374d3eecc015bf237c1b
parentRevert "term: erase: use erase_line() whenever a range corresponds to a full line" (diff)
term: osc8: tag *all* cells in a multi-column character as an URI
When we print a character to the grid, we must also update its OSC-8 state if an OSC-8 URI is currently active. For double-width characters, this was only being done for the first cell. This causes the labels in URL mode to be off, as the link was effectively chopped up into multiple pieces. Closes #2179
-rw-r--r--CHANGELOG.md7
-rw-r--r--terminal.c8
2 files changed, 12 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3144a125..2b0a7247 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -72,6 +72,13 @@
### Deprecated
### Removed
### Fixed
+
+* URL labels misplaces when URL contains double-width characters
+ ([#2179][2179]).
+
+[2179]: https://codeberg.org/dnkl/foot/issues/2179
+
+
### Security
### Contributors
diff --git a/terminal.c b/terminal.c
index 421a3e65..60506d07 100644
--- a/terminal.c
+++ b/terminal.c
@@ -4005,9 +4005,11 @@ term_print(struct terminal *term, char32_t wc, int width, bool insert_mode_disab
cell->wc = term->vt.last_printed = wc;
cell->attrs = term->vt.attrs;
- if (term->vt.osc8.uri != NULL) {
- grid_row_uri_range_put(
- row, col, term->vt.osc8.uri, term->vt.osc8.id);
+ if (unlikely(term->vt.osc8.uri != NULL)) {
+ for (int i = 0; i < width && (col + i) < term->cols; i++) {
+ grid_row_uri_range_put(
+ row, col + i, term->vt.osc8.uri, term->vt.osc8.id);
+ }
switch (term->conf->url.osc8_underline) {
case OSC8_UNDERLINE_ALWAYS: