circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-10-09 03:34:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2026-07-03 19:00:06 +01:00
parent 929e6b5c9b b5a6d9bcab
commit 8e8fa3d10b
1 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
format.c
View File

@@ -4916,9 +4916,9 @@ format_window_name(struct format_expand_state *es, const char *fmt)
return (xstrdup("0")); return (xstrdup("0"));
} }
/* Add neighbor window variables to the format tree. */ /* Add neighbour window variables to the format tree. */
static void static void
format_add_window_neighbor(struct format_tree *nft, struct winlink *wl, format_add_window_neighbour(struct format_tree *nft, struct winlink *wl,
struct session *s, const char *prefix) struct session *s, const char *prefix)
{ {
struct options_entry *o; struct options_entry *o;
@@ -4951,20 +4951,21 @@ format_add_window_neighbor(struct format_tree *nft, struct winlink *wl,
static char * static char *
format_loop_windows(struct format_expand_state *es, const char *fmt) format_loop_windows(struct format_expand_state *es, const char *fmt)
{ {
struct sort_criteria *sc = &sort_crit; struct sort_criteria *sc = &sort_crit;
struct format_tree *ft = es->ft; struct format_tree *ft = es->ft;
struct client *c = ft->client; struct client *c = ft->client;
struct cmdq_item *item = ft->item; struct session *s = ft->s;
struct format_tree *nft; struct cmdq_item *item = ft->item;
struct format_expand_state next; struct format_tree *nft;
char *all, *active, *use, *expanded, *value; struct format_expand_state next;
struct evbuffer *buffer; char *all, *active, *use, *expanded, *value;
size_t size; struct evbuffer *buffer;
struct winlink *wl, **l; size_t size;
struct window *w; struct winlink *wl, **l;
int i, n; struct window *w;
int i, n;
if (ft->s == NULL) { if (s == NULL) {
format_log(es, "window loop but no session"); format_log(es, "window loop but no session");
return (NULL); return (NULL);
} }
@@ -4978,12 +4979,12 @@ format_loop_windows(struct format_expand_state *es, const char *fmt)
if (buffer == NULL) if (buffer == NULL)
fatalx("out of memory"); fatalx("out of memory");
l = sort_get_winlinks_session(ft->s, &n, sc); l = sort_get_winlinks_session(s, &n, sc);
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
wl = l[i]; wl = l[i];
w = wl->window; w = wl->window;
format_log(es, "window loop: %u @%u", wl->idx, w->id); format_log(es, "window loop: %u @%u", wl->idx, w->id);
if (active != NULL && wl == ft->s->curw) if (active != NULL && wl == s->curw)
use = active; use = active;
else else
use = all; use = all;
@@ -4991,17 +4992,17 @@ format_loop_windows(struct format_expand_state *es, const char *fmt)
ft->flags); ft->flags);
format_add(nft, "loop_index", "%d", i); format_add(nft, "loop_index", "%d", i);
format_add(nft, "loop_last_flag", "%d", i == n - 1); format_add(nft, "loop_last_flag", "%d", i == n - 1);
format_defaults(nft, ft->c, ft->s, wl, NULL); format_defaults(nft, ft->c, s, wl, NULL);
/* Add neighbor window data to the format tree. */ /* Add neighbour window data to the format tree. */
format_add(nft, "window_after_active", "%d", format_add(nft, "window_after_active", "%d",
i > 0 && l[i - 1] == ft->s->curw); i > 0 && l[i - 1] == s->curw);
format_add(nft, "window_before_active", "%d", format_add(nft, "window_before_active", "%d",
i + 1 < n && l[i + 1] == ft->s->curw); i + 1 < n && l[i + 1] == s->curw);
if (i + 1 < n) if (i + 1 < n)
format_add_window_neighbor(nft, l[i + 1], ft->s, "next"); format_add_window_neighbour(nft, l[i + 1], s, "next");
if (i > 0) if (i > 0)
format_add_window_neighbor(nft, l[i - 1], ft->s, "prev"); format_add_window_neighbour(nft, l[i - 1], s, "prev");
format_copy_state(&next, es, 0); format_copy_state(&next, es, 0);
next.ft = nft; next.ft = nft;