aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorK4 <k4@noreply.codeberg.org>2026-08-25 12:03:58 +0000
committerDaniel Eklöf <daniel@ekloef.se>2026-09-02 07:18:21 +0000
commitde649b6137ec1c5f7f684ef44e48d9a881a2744f (patch)
tree83a070b7471270bbce49bf2b77444fc770035591
parentchangelog: selection-override-modifiers fixes (diff)
term: wrap url related fields into a struct
-rw-r--r--csi.c2
-rw-r--r--input.c8
-rw-r--r--render.c14
-rw-r--r--terminal.h15
-rw-r--r--url-mode.c58
-rw-r--r--url-mode.h2
6 files changed, 50 insertions, 49 deletions
diff --git a/csi.c b/csi.c
index fe65dbf1..c1738cf7 100644
--- a/csi.c
+++ b/csi.c
@@ -591,7 +591,7 @@ decset_decrst(struct terminal *term, unsigned param, bool enable)
term_ime_enable(term);
else {
term_ime_disable(term);
- term->ime_reenable_after_url_mode = false;
+ term->url.ime_reenable_after_url_mode = false;
}
break;
diff --git a/input.c b/input.c
index e11b86db..9d768876 100644
--- a/input.c
+++ b/input.c
@@ -358,8 +358,8 @@ execute_binding(struct seat *seat, struct terminal *term,
action == BIND_ACTION_SHOW_URLS_LAUNCH ? URL_ACTION_LAUNCH :
URL_ACTION_PERSISTENT;
- urls_collect(term, url_action, &term->conf->url.preg, true, &term->urls);
- urls_assign_key_combos(term->conf, &term->urls);
+ urls_collect(term, url_action, &term->conf->url.preg, true, &term->url.list);
+ urls_assign_key_combos(term->conf, &term->url.list);
urls_render(term, &term->conf->url.launch);
return true;
}
@@ -480,8 +480,8 @@ execute_binding(struct seat *seat, struct terminal *term,
return true;
}
- urls_collect(term, url_action, &regex->preg, false, &term->urls);
- urls_assign_key_combos(term->conf, &term->urls);
+ urls_collect(term, url_action, &regex->preg, false, &term->url.list);
+ urls_assign_key_combos(term->conf, &term->url.list);
urls_render(term, &regex->launch);
return true;
}
diff --git a/render.c b/render.c
index b729ef40..2bc44146 100644
--- a/render.c
+++ b/render.c
@@ -4082,7 +4082,7 @@ 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;
+ const bool show_url = term->url.show_uri_on_jump_label;
/*
* There can potentially be a lot of URLs.
@@ -4126,7 +4126,7 @@ render_urls(struct terminal *term)
tll_foreach(win->urls, it) {
const struct url *url = it->item.url;
const char32_t *key = url->key;
- const size_t entered_key_len = c32len(term->url_keys);
+ const size_t entered_key_len = c32len(term->url.keys);
if (key == NULL) {
/* TODO: if we decide to use the .text field, we cannot
@@ -4151,7 +4151,7 @@ render_urls(struct terminal *term)
hide = true;
if (c32len(key) <= entered_key_len)
hide = true;
- if (c32ncasecmp(term->url_keys, key, entered_key_len) != 0)
+ if (c32ncasecmp(term->url.keys, key, entered_key_len) != 0)
hide = true;
if (hide) {
@@ -4330,8 +4330,8 @@ frame_callback(void *data, struct wl_callback *wl_callback, uint32_t callback_da
struct grid *original_grid = term->grid;
if (urls_mode_is_active(term)) {
- xassert(term->url_grid_snapshot != NULL);
- term->grid = term->url_grid_snapshot;
+ xassert(term->url.grid_snapshot != NULL);
+ term->grid = term->url.grid_snapshot;
}
if (csd && term->window->csd_mode == CSD_YES) {
@@ -5173,8 +5173,8 @@ fdm_hook_refresh_pending_terminals(struct fdm *fdm, void *data)
if (term->window->frame_callback == NULL) {
struct grid *original_grid = term->grid;
if (urls_mode_is_active(term)) {
- xassert(term->url_grid_snapshot != NULL);
- term->grid = term->url_grid_snapshot;
+ xassert(term->url.grid_snapshot != NULL);
+ term->grid = term->url.grid_snapshot;
}
if (csd && term->window->csd_mode == CSD_YES) {
diff --git a/terminal.h b/terminal.h
index 0cac1e3b..32145cac 100644
--- a/terminal.h
+++ b/terminal.h
@@ -793,13 +793,14 @@ struct terminal {
unsigned max_height; /* Maximum image height, in pixels */
} sixel;
- /* TODO: wrap in a struct */
- url_list_t urls;
- char32_t url_keys[5];
- bool urls_show_uri_on_jump_label;
- struct grid *url_grid_snapshot;
- bool ime_reenable_after_url_mode;
- const struct config_spawn_template *url_launch;
+ struct {
+ url_list_t list;
+ char32_t keys[5];
+ bool show_uri_on_jump_label;
+ struct grid *grid_snapshot;
+ bool ime_reenable_after_url_mode;
+ const struct config_spawn_template *launch;
+ } url;
#if defined(FOOT_IME_ENABLED) && FOOT_IME_ENABLED
bool ime_enabled;
diff --git a/url-mode.c b/url-mode.c
index 45fdaf7a..d3e1fbbf 100644
--- a/url-mode.c
+++ b/url-mode.c
@@ -41,7 +41,7 @@ execute_binding(struct seat *seat, struct terminal *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;
+ term->url.show_uri_on_jump_label = !term->url.show_uri_on_jump_label;
render_refresh_urls(term);
return true;
@@ -67,11 +67,11 @@ spawn_url_launcher_with_token(struct terminal *term,
return false;
}
- xassert(term->url_launch != NULL);
+ xassert(term->url.launch != NULL);
bool ret = false;
if (spawn_expand_template(
- term->url_launch, 2,
+ term->url.launch, 2,
(const char *[]){"url", "match"},
(const char *[]){url, url},
&argc, &argv))
@@ -108,7 +108,7 @@ static bool
spawn_url_launcher(struct seat *seat, struct terminal *term, const char *url,
uint32_t serial)
{
- xassert(term->url_launch != NULL);
+ xassert(term->url.launch != NULL);
struct spawn_activation_context *ctx = xmalloc(sizeof(*ctx));
*ctx = (struct spawn_activation_context){
@@ -240,11 +240,11 @@ urls_input(struct seat *seat, struct terminal *term,
}
}
- size_t seq_len = c32len(term->url_keys);
+ size_t seq_len = c32len(term->url.keys);
if (sym == XKB_KEY_BackSpace) {
if (seq_len > 0) {
- term->url_keys[seq_len - 1] = U'\0';
+ term->url.keys[seq_len - 1] = U'\0';
render_refresh_urls(term);
}
@@ -265,7 +265,7 @@ urls_input(struct seat *seat, struct terminal *term,
bool is_valid = false;
const struct url *match = NULL;
- tll_foreach(term->urls, it) {
+ tll_foreach(term->url.list, it) {
if (it->item.key == NULL)
continue;
@@ -273,7 +273,7 @@ urls_input(struct seat *seat, struct terminal *term,
const size_t key_len = c32len(it->item.key);
if (key_len >= seq_len + 1 &&
- c32ncasecmp(url->key, term->url_keys, seq_len) == 0 &&
+ c32ncasecmp(url->key, term->url.keys, seq_len) == 0 &&
toc32lower(url->key[seq_len]) == toc32lower(wc))
{
is_valid = true;
@@ -296,15 +296,15 @@ urls_input(struct seat *seat, struct terminal *term,
break;
case URL_ACTION_PERSISTENT:
- term->url_keys[0] = U'\0';
+ term->url.keys[0] = U'\0';
render_refresh_urls(term);
break;
}
}
else if (is_valid) {
- xassert(seq_len + 1 <= ALEN(term->url_keys));
- term->url_keys[seq_len] = wc;
+ xassert(seq_len + 1 <= ALEN(term->url.keys));
+ term->url.keys[seq_len] = wc;
render_refresh_urls(term);
}
}
@@ -554,7 +554,7 @@ void
urls_collect(const struct terminal *term, enum url_action action,
const regex_t *preg, bool osc8, url_list_t *urls)
{
- xassert(tll_length(term->urls) == 0);
+ xassert(tll_length(term->url.list) == 0);
if (osc8)
osc8_uris(term, action, urls);
regex_detected(term, action, preg, urls);
@@ -690,7 +690,7 @@ tag_cells_for_url(struct terminal *term, const struct url *url, bool value)
if (url->url_mode_dont_change_url_attr)
return;
- struct grid *grid = term->url_grid_snapshot;
+ struct grid *grid = term->url.grid_snapshot;
xassert(grid != NULL);
const struct coord *start = &url->range.start;
@@ -732,12 +732,12 @@ urls_render(struct terminal *term, const struct config_spawn_template *launch)
{
struct wl_window *win = term->window;
- if (tll_length(win->term->urls) == 0)
+ if (tll_length(win->term->url.list) == 0)
return;
/* Disable IME while in URL-mode */
if (term_ime_is_enabled(term)) {
- term->ime_reenable_after_url_mode = true;
+ term->url.ime_reenable_after_url_mode = true;
term_ime_disable(term);
}
@@ -761,13 +761,13 @@ urls_render(struct terminal *term, const struct config_spawn_template *launch)
term_damage_view(term);
/* Snapshot the current grid */
- term->url_grid_snapshot = grid_snapshot(term->grid);
+ term->url.grid_snapshot = grid_snapshot(term->grid);
/* Remember which launcher to use */
- term->url_launch = launch;
+ term->url.launch = launch;
xassert(tll_length(win->urls) == 0);
- tll_foreach(win->term->urls, it) {
+ tll_foreach(win->term->url.list, it) {
struct wl_url url = {.url = &it->item};
wayl_win_subsurface_new(win, &url.surf, false);
@@ -789,14 +789,14 @@ url_destroy(struct url *url)
void
urls_reset(struct terminal *term)
{
- if (likely(tll_length(term->urls) == 0)) {
- xassert(term->url_grid_snapshot == NULL);
+ if (likely(tll_length(term->url.list) == 0)) {
+ xassert(term->url.grid_snapshot == NULL);
return;
}
- grid_free(term->url_grid_snapshot);
- free(term->url_grid_snapshot);
- term->url_grid_snapshot = NULL;
+ grid_free(term->url.grid_snapshot);
+ free(term->url.grid_snapshot);
+ term->url.grid_snapshot = NULL;
/*
* Make sure "last cursor" doesn't point to a row in the just
@@ -815,17 +815,17 @@ urls_reset(struct terminal *term)
}
}
- tll_foreach(term->urls, it) {
+ tll_foreach(term->url.list, it) {
url_destroy(&it->item);
- tll_remove(term->urls, it);
+ tll_remove(term->url.list, it);
}
- term->urls_show_uri_on_jump_label = false;
- memset(term->url_keys, 0, sizeof(term->url_keys));
+ term->url.show_uri_on_jump_label = false;
+ memset(term->url.keys, 0, sizeof(term->url.keys));
/* Re-enable IME, if it was enabled before we entered URL-mode */
- if (term->ime_reenable_after_url_mode) {
- term->ime_reenable_after_url_mode = false;
+ if (term->url.ime_reenable_after_url_mode) {
+ term->url.ime_reenable_after_url_mode = false;
term_ime_enable(term);
}
diff --git a/url-mode.h b/url-mode.h
index 758cd92f..530d7fe5 100644
--- a/url-mode.h
+++ b/url-mode.h
@@ -10,7 +10,7 @@
static inline bool urls_mode_is_active(const struct terminal *term)
{
- return tll_length(term->urls) > 0;
+ return tll_length(term->url.list) > 0;
}
void urls_collect(