circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-06-22 11:16:57 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into floating_panes

Browse Source
This commit is contained in:
Dane Jensen
2026-06-19 11:31:46 -07:00
parent 584cafa284 e7c29d0ceb
commit c04236052c
14 changed files with 483 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
format.c
View File

@@ -1856,15 +1856,6 @@ format_cb_keypad_flag(struct format_tree *ft)
return (NULL);
}
/* Callback for loop_last_flag. */
static void *
format_cb_loop_last_flag(struct format_tree *ft)
{
if (ft->flags & FORMAT_LAST)
return (xstrdup("1"));
return (xstrdup("0"));
}
/* Callback for mouse_all_flag. */
static void *
format_cb_mouse_all_flag(struct format_tree *ft)
@@ -3363,9 +3354,6 @@ static const struct format_table_entry format_table[] = {
{ "last_window_index", FORMAT_TABLE_STRING,
format_cb_last_window_index
},
{ "loop_last_flag", FORMAT_TABLE_STRING,
format_cb_loop_last_flag
},
{ "mouse_all_flag", FORMAT_TABLE_STRING,
format_cb_mouse_all_flag
},
@@ -4703,7 +4691,7 @@ format_loop_sessions(struct format_expand_state *es, const char *fmt)
struct evbuffer *buffer;
size_t size;
struct session *s, **l;
int i, n, last = 0;
int i, n;
if (format_choose(es, fmt, &all, &active, 0) != 0) {
all = xstrdup(fmt);
@@ -4724,9 +4712,9 @@ format_loop_sessions(struct format_expand_state *es, const char *fmt)
use = active;
else
use = all;
if (i == n - 1)
last = FORMAT_LAST;
nft = format_create(c, item, FORMAT_NONE, ft->flags|last);
nft = format_create(c, item, FORMAT_NONE, ft->flags);
format_add(nft, "loop_index", "%d", i);
format_add(nft, "loop_last_flag", "%d", i == n - 1);
format_defaults(nft, ft->c, s, NULL, NULL);
format_copy_state(&next, es, 0);
next.ft = nft;
@@ -4818,7 +4806,7 @@ format_loop_windows(struct format_expand_state *es, const char *fmt)
size_t size;
struct winlink *wl, **l;
struct window *w;
int i, n, last = 0;
int i, n;
if (ft->s == NULL) {
format_log(es, "window loop but no session");
@@ -4843,10 +4831,10 @@ format_loop_windows(struct format_expand_state *es, const char *fmt)
use = active;
else
use = all;
if (i == n - 1)
last = FORMAT_LAST;
nft = format_create(c, item, FORMAT_WINDOW|w->id,
ft->flags|last);
ft->flags);
format_add(nft, "loop_index", "%d", i);
format_add(nft, "loop_last_flag", "%d", i == n - 1);
format_defaults(nft, ft->c, ft->s, wl, NULL);
/* Add neighbor window data to the format tree. */
@@ -4893,7 +4881,7 @@ format_loop_panes(struct format_expand_state *es, const char *fmt)
struct evbuffer *buffer;
size_t size;
struct window_pane *wp, **l;
int i, n, last = 0;
int i, n;
if (ft->w == NULL) {
format_log(es, "pane loop but no window");
@@ -4917,10 +4905,10 @@ format_loop_panes(struct format_expand_state *es, const char *fmt)
use = active;
else
use = all;
if (i == n - 1)
last = FORMAT_LAST;
nft = format_create(c, item, FORMAT_PANE|wp->id,
ft->flags|last);
ft->flags);
format_add(nft, "loop_index", "%d", i);
format_add(nft, "loop_last_flag", "%d", i == n - 1);
format_defaults(nft, ft->c, ft->s, ft->wl, wp);
format_copy_state(&next, es, 0);
next.ft = nft;
@@ -4955,7 +4943,7 @@ format_loop_clients(struct format_expand_state *es, const char *fmt)
char *expanded, *value;
struct evbuffer *buffer;
size_t size;
int i, n, last = 0;
int i, n;
buffer = evbuffer_new();
if (buffer == NULL)
@@ -4965,9 +4953,9 @@ format_loop_clients(struct format_expand_state *es, const char *fmt)
for (i = 0; i < n; i++) {
c = l[i];
format_log(es, "client loop: %s", c->name);
if (i == n - 1)
last = FORMAT_LAST;
nft = format_create(c, item, 0, ft->flags|last);
nft = format_create(c, item, 0, ft->flags);
format_add(nft, "loop_index", "%d", i);
format_add(nft, "loop_last_flag", "%d", i == n - 1);
format_defaults(nft, c, ft->s, ft->wl, ft->wp);
format_copy_state(&next, es, 0);
next.ft = nft;