aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-02-14 13:18:11 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-02-21 19:15:31 +0000
commit06a9ffa7632abf201b0ea0270bb5058af4fc4a6b (patch)
tree7280dcfd13e641526278628bf663df830a81d848
parenturls: remove free-form ‘text’ member from URL struct (diff)
urls: add key binding that toggles whether URLs are displayed on jump-label
By default, the URL isn’t shown on the jump-label. For auto-detect URLs, doing so is virtually always useless, as the URL is already visible in the grid. For OSC-8 URLs however, the URL is often _not_ visible in the grid. Many times, seeing the URL is still not needed (if you’re doing ‘ls --hyperlink’, you already know what the URIs are). But it is still useful to have a way to show the URLs. This patch adds a new key binding action that can be used in url-mode to toggle the URL on and off in the jump label. It is bound to ctrl+t by default.
-rw-r--r--config.c2
-rw-r--r--doc/foot.ini.5.scd14
-rw-r--r--foot.ini1
-rw-r--r--render.c21
-rw-r--r--terminal.h1
-rw-r--r--url-mode.c6
-rw-r--r--wayland.h1
7 files changed, 44 insertions, 2 deletions
diff --git a/config.c b/config.c
index 9ec6960f..3b09b882 100644
--- a/config.c
+++ b/config.c
@@ -119,6 +119,7 @@ static_assert(ALEN(search_binding_action_map) == BIND_ACTION_SEARCH_COUNT,
static const char *const url_binding_action_map[] = {
[BIND_ACTION_URL_NONE] = NULL,
[BIND_ACTION_URL_CANCEL] = "cancel",
+ [BIND_ACTION_URL_TOGGLE_URL_ON_JUMP_LABEL] = "toggle-url-visible",
};
static_assert(ALEN(url_binding_action_map) == BIND_ACTION_URL_COUNT,
@@ -2107,6 +2108,7 @@ add_default_url_bindings(struct config *conf)
add_binding(BIND_ACTION_URL_CANCEL, ctrl, XKB_KEY_g);
add_binding(BIND_ACTION_URL_CANCEL, ctrl, XKB_KEY_d);
add_binding(BIND_ACTION_URL_CANCEL, none, XKB_KEY_Escape);
+ add_binding(BIND_ACTION_URL_TOGGLE_URL_ON_JUMP_LABEL, ctrl, XKB_KEY_t);
#undef add_binding
}
diff --git a/doc/foot.ini.5.scd b/doc/foot.ini.5.scd
index 0d25fe12..6c1938a2 100644
--- a/doc/foot.ini.5.scd
+++ b/doc/foot.ini.5.scd
@@ -610,6 +610,20 @@ mode. The syntax is exactly the same as the regular **key-bindings**.
Exits URL mode without opening an URL. Default: _Control+g
Control+d Escape_.
+*toggle-url-visible*
+ By default, the jump label only shows the key sequence required to
+ activate it. This is fine as long as the URL is visible in the
+ original text.
+
+ But with e.g. OSC-8 URLs (the terminal version of HTML anchors,
+ i.e. "links"), the text on the screen can be something completey
+ different than the URL.
+
+ This action toggles between showing and hiding the URL on the jump
+ label.
+
+ Default: _Control+t_
+
# SECTION: mouse-bindings
diff --git a/foot.ini b/foot.ini
index 5a5256c4..216ef45d 100644
--- a/foot.ini
+++ b/foot.ini
@@ -125,6 +125,7 @@
[url-bindings]
# cancel=Control+g Control+d Escape
+# toggle-url-visible=Control+t
[mouse-bindings]
# primary-paste=BTN_MIDDLE
diff --git a/render.c b/render.c
index c9dfc1fc..1db813bc 100644
--- a/render.c
+++ b/render.c
@@ -2525,6 +2525,8 @@ render_urls(struct terminal *term)
+ term->grid->num_rows) & (term->grid->num_rows - 1);
const int view_end = view_start + term->rows - 1;
+ const bool show_url = term->urls_show_uri_on_jump_label;
+
tll_foreach(win->urls, it) {
const struct url *url = it->item.url;
const wchar_t *key = url->key;
@@ -2562,13 +2564,28 @@ render_urls(struct terminal *term)
continue;
}
- size_t chars = wcslen(key);
+ const size_t key_len = wcslen(key);
+
+ size_t url_len = mbstowcs(NULL, url->url, 0);
+ if (url_len == (size_t)-1)
+ url_len = 0;
+
+ wchar_t url_wchars[url_len + 1];
+ mbstowcs(url_wchars, url->url, url_len + 1);
+
+ size_t chars = key_len + (show_url ? (2 + url_len) : 0);
const size_t max_chars = 50;
chars = min(chars, max_chars);
wchar_t label[chars + 2];
- wcscpy(label, key);
+ label[chars] = L'…';
+ label[chars + 1] = L'\0';
+
+ if (show_url)
+ swprintf(label, chars + 1, L"%ls: %ls", key, url_wchars);
+ else
+ wcsncpy(label, key, chars + 1);
for (size_t i = 0; i < wcslen(key); i++)
label[i] = towupper(label[i]);
diff --git a/terminal.h b/terminal.h
index cc37bcac..7d6d0616 100644
--- a/terminal.h
+++ b/terminal.h
@@ -539,6 +539,7 @@ struct terminal {
url_list_t urls;
wchar_t url_keys[5];
+ bool urls_show_uri_on_jump_label;
#if defined(FOOT_IME_ENABLED) && FOOT_IME_ENABLED
struct {
diff --git a/url-mode.c b/url-mode.c
index 44f9bb19..09e170e6 100644
--- a/url-mode.c
+++ b/url-mode.c
@@ -30,6 +30,11 @@ execute_binding(struct seat *seat, struct terminal *term,
urls_reset(term);
return true;
+ case BIND_ACTION_URL_TOGGLE_URL_ON_JUMP_LABEL:
+ term->urls_show_uri_on_jump_label = !term->urls_show_uri_on_jump_label;
+ render_refresh_urls(term);
+ return true;
+
case BIND_ACTION_URL_COUNT:
return false;
@@ -613,6 +618,7 @@ urls_reset(struct terminal *term)
tll_remove(term->urls, it);
}
+ term->urls_show_uri_on_jump_label = false;
memset(term->url_keys, 0, sizeof(term->url_keys));
render_refresh(term);
}
diff --git a/wayland.h b/wayland.h
index b2d7c64f..7aecaee0 100644
--- a/wayland.h
+++ b/wayland.h
@@ -82,6 +82,7 @@ enum bind_action_search {
enum bind_action_url {
BIND_ACTION_URL_NONE,
BIND_ACTION_URL_CANCEL,
+ BIND_ACTION_URL_TOGGLE_URL_ON_JUMP_LABEL,
BIND_ACTION_URL_COUNT,
};