aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-02-21 19:10:24 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-02-21 19:15:33 +0000
commit11464a65de4d96f04b4abd5c32e6c092a81a7a76 (patch)
treed34e4e04f698e9169e1632de2f0cefd8482037e3
parentconfig: typo: osc8-underline=always means ALWAYS (diff)
url-mode: use the same key combo for all occurrences of an URL
-rw-r--r--url-mode.c30
1 files changed, 25 insertions, 5 deletions
diff --git a/url-mode.c b/url-mode.c
index a441aa86..554c17bf 100644
--- a/url-mode.c
+++ b/url-mode.c
@@ -519,10 +519,13 @@ urls_assign_key_combos(const struct config *conf, url_list_t *urls)
wchar_t *combos[count];
generate_key_combos(conf, count, combos);
- size_t idx = 0;
+ 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 < idx; i++) {
+
+ for (size_t i = 0; i < id_idx; i++) {
if (it->item.id == seen_ids[i]) {
id_already_seen = true;
break;
@@ -531,13 +534,30 @@ 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
+ * them; if so, re-use the *same* key combo.
+ */
+ bool url_already_seen = false;
+ tll_foreach(*urls, it2) {
+ if (&it->item == &it2->item)
+ break;
+
+ if (strcmp(it->item.url, it2->item.url) == 0) {
+ it->item.key = xwcsdup(it2->item.key);
+ url_already_seen = true;
+ break;
+ }
+ }
- seen_ids[idx] = it->item.id;
- it->item.key = combos[idx++];
+ if (!url_already_seen)
+ it->item.key = combos[combo_idx++];
}
/* Free combos we didn’t use up */
- for (size_t i = idx; i < count; i++)
+ for (size_t i = combo_idx; i < count; i++)
free(combos[i]);
#if defined(_DEBUG) && LOG_ENABLE_DBG