From cc43c1b7048d2cf1cedb48ca63ecde40e2d0dbf5 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Sun, 14 Feb 2021 13:42:37 +0100 Subject: urls: remove free-form ‘text’ member from URL struct MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- render.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'render.c') diff --git a/render.c b/render.c index 0f23fc4e..c9dfc1fc 100644 --- a/render.c +++ b/render.c @@ -2527,7 +2527,6 @@ render_urls(struct terminal *term) tll_foreach(win->urls, it) { const struct url *url = it->item.url; - const wchar_t *text = url->text; const wchar_t *key = url->key; const size_t entered_key_len = wcslen(term->url_keys); @@ -2563,22 +2562,13 @@ render_urls(struct terminal *term) continue; } - size_t text_len = wcslen(text); - size_t chars = wcslen(key) + (text_len > 0 ? 3 + text_len : 0); + size_t chars = wcslen(key); const size_t max_chars = 50; chars = min(chars, max_chars); wchar_t label[chars + 2]; - if (text_len == 0) - wcscpy(label, key); - else { - int count = swprintf(label, chars + 1, L"%ls - %ls", key, text); - if (count >= max_chars) { - label[max_chars] = L'…'; - label[max_chars + 1] = L'\0'; - } - } + wcscpy(label, key); for (size_t i = 0; i < wcslen(key); i++) label[i] = towupper(label[i]); -- cgit v1.3