aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-02-13 12:45:59 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-02-21 19:15:29 +0000
commitfb9e9513a59126831862a59ce9db2d2896299441 (patch)
treef395493817c72753bc1ec55070d2d867cd960cfa
parentterm: add an ‘id’ member to the the ‘row_uri_range’ struct (diff)
url-mode: multiple URL (parts) with the same ID is assigned a single key sequence
In case an URL is split up into multiple parts, those parts are now treated as a single URL when it comes to key assignment. Only the *first* URL part is actually assigned a key combo. The other parts are ignored. We still highlight them, but for all other purposes they are ignored.
-rw-r--r--render.c6
-rw-r--r--terminal.h1
-rw-r--r--url-mode.c33
3 files changed, 37 insertions, 3 deletions
diff --git a/render.c b/render.c
index aaa106a3..0f23fc4e 100644
--- a/render.c
+++ b/render.c
@@ -2531,6 +2531,12 @@ render_urls(struct terminal *term)
const wchar_t *key = url->key;
const size_t entered_key_len = wcslen(term->url_keys);
+ if (key == NULL) {
+ /* TODO: if we decide to use the .text field, we cannot
+ * just skip the entire jump label like this */
+ continue;
+ }
+
struct wl_surface *surf = it->item.surf.surf;
struct wl_subsurface *sub_surf = it->item.surf.sub;
diff --git a/terminal.h b/terminal.h
index 69c7c2ea..284dafa9 100644
--- a/terminal.h
+++ b/terminal.h
@@ -250,6 +250,7 @@ typedef tll(struct ptmx_buffer) ptmx_buffer_list_t;
enum url_action { URL_ACTION_COPY, URL_ACTION_LAUNCH };
struct url {
+ uint64_t id;
char *url;
wchar_t *text;
wchar_t *key;
diff --git a/url-mode.c b/url-mode.c
index 83421abf..57291e87 100644
--- a/url-mode.c
+++ b/url-mode.c
@@ -1,5 +1,6 @@
#include "url-mode.h"
+#include <stdlib.h>
#include <string.h>
#include <wctype.h>
@@ -135,6 +136,9 @@ urls_input(struct seat *seat, struct terminal *term, uint32_t key,
const struct url *match = NULL;
tll_foreach(term->urls, it) {
+ if (it->item.key == NULL)
+ continue;
+
const struct url *url = &it->item;
const size_t key_len = wcslen(it->item.key);
@@ -165,7 +169,8 @@ urls_input(struct seat *seat, struct terminal *term, uint32_t key,
IGNORE_WARNING("-Wpedantic")
static void
-auto_detected(const struct terminal *term, enum url_action action, url_list_t *urls)
+auto_detected(const struct terminal *term, enum url_action action,
+ url_list_t *urls)
{
static const wchar_t *const prots[] = {
L"http://",
@@ -335,6 +340,7 @@ auto_detected(const struct terminal *term, enum url_action action, url_list_t *u
tll_push_back(
*urls,
((struct url){
+ .id = (uint64_t)rand() << 32 | rand(),
.url = url_utf8,
.text = xwcsdup(L""),
.start = start,
@@ -376,6 +382,7 @@ osc8_uris(const struct terminal *term, enum url_action action, url_list_t *urls)
tll_push_back(
*urls,
((struct url){
+ .id = it->item.id,
.url = xstrdup(it->item.uri),
.text = xwcsdup(L""),
.start = start,
@@ -467,18 +474,38 @@ urls_assign_key_combos(const struct config *conf, url_list_t *urls)
if (count == 0)
return;
+ uint64_t seen_ids[count];
wchar_t *combos[count];
generate_key_combos(conf, count, combos);
size_t idx = 0;
- tll_foreach(*urls, it)
+ tll_foreach(*urls, it) {
+ bool id_already_seen = false;
+ for (size_t i = 0; i < idx; i++) {
+ if (it->item.id == seen_ids[i]) {
+ id_already_seen = true;
+ break;
+ }
+ }
+
+ if (id_already_seen)
+ continue;
+
+ seen_ids[idx] = it->item.id;
it->item.key = combos[idx++];
+ }
+
+ /* Free combos we didn’t use up */
+ for (size_t i = idx; i < count; i++)
+ free(combos[i]);
#if defined(_DEBUG) && LOG_ENABLE_DBG
tll_foreach(*urls, it) {
+ if (it->item.key == NULL)
+ continue;
+
char key[32];
wcstombs(key, it->item.key, sizeof(key) - 1);
-
LOG_DBG("URL: %s (%s)", it->item.url, key);
}
#endif