aboutsummaryrefslogtreecommitdiff
path: root/url-mode.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2022-08-30 15:48:04 +0000
committerDaniel Eklöf <daniel@ekloef.se>2022-08-30 15:55:14 +0000
commitc753cf8f45e466165d64a173497ca1f6a3efd4a1 (patch)
treef44313b4aeb5e457b9dbcdf2f1fcb1d8370ad92c /url-mode.c
parentMerge branch 'grid-reflow-viewport-crash-regression' (diff)
url-mode: connect osc-8 links only when both ID and URI matches
Before this, two OSC-8 links with a matching ID would be connected even if their URIs weren’t the same. This is against the spec: The same id is only used for connecting character cells whose URIs is also the same. Character cells pointing to different URIs should never be underlined together when hovering over. https://gist.github.com/egmontkob/eb114294efbcd5adb1944c9f3cb5feda#hover-underlining-and-the-id-parameter
Diffstat (limited to 'url-mode.c')
-rw-r--r--url-mode.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/url-mode.c b/url-mode.c
index 538b60f0..6fa16623 100644
--- a/url-mode.c
+++ b/url-mode.c
@@ -677,18 +677,23 @@ urls_assign_key_combos(const struct config *conf, url_list_t *urls)
if (count == 0)
return;
- uint64_t seen_ids[count];
char32_t *combos[count];
generate_key_combos(conf, count, combos);
size_t combo_idx = 0;
- size_t id_idx = 0;
tll_foreach(*urls, it) {
bool id_already_seen = false;
- for (size_t i = 0; i < id_idx; i++) {
- if (it->item.id == seen_ids[i]) {
+ /* Look for already processed URLs where both the URI and the
+ * ID matches */
+ tll_foreach(*urls, it2) {
+ if (&it->item == &it2->item)
+ break;
+
+ if (it->item.id == it2->item.id &&
+ strcmp(it->item.url, it2->item.url) == 0)
+ {
id_already_seen = true;
break;
}
@@ -696,7 +701,6 @@ urls_assign_key_combos(const struct config *conf, url_list_t *urls)
if (id_already_seen)
continue;
- seen_ids[id_idx++] = it->item.id;
/*
* Scan previous URLs, and check if *this* URL matches any of
@@ -730,7 +734,7 @@ urls_assign_key_combos(const struct config *conf, url_list_t *urls)
char *key = ac32tombs(it->item.key);
xassert(key != NULL);
- LOG_DBG("URL: %s (%s)", it->item.url, key);
+ LOG_DBG("URL: %s (key=%s, id=%"PRIu64")", it->item.url, key, it->item.id);
free(key);
}
#endif