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

Rename new-pane -B to -W since -B is best kept to match -B to

Browse Source 
display-popup.
This commit is contained in:
nicm
2026-06-10 16:03:14 +00:00
parent c019b3dad9
commit 2719549cf2
5 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cmd-split-window.c
View File

@@ -39,8 +39,8 @@ const struct cmd_entry cmd_new_pane_entry = {
.name = "new-pane", .name = "new-pane",
.alias = "newp", .alias = "newp",
.args = { "bBc:de:EfF:hIkl:Lm:p:PR:s:S:t:T:vx:X:y:Y:Z", 0, -1, NULL }, .args = { "bc:de:EfF:hIkl:Lm:p:PR:s:S:t:T:vWx:X:y:Y:Z", 0, -1, NULL },
.usage = "[-bdefhIklPvZ] [-c start-directory] [-e environment] " .usage = "[-bdefhIklPvWZ] [-c start-directory] [-e environment] "
"[-F format] [-l size] [-m message] [-p percentage] " "[-F format] [-l size] [-m message] [-p percentage] "
"[-s style] [-S active-border-style] " "[-s style] [-S active-border-style] "
"[-R inactive-border-style] [-T title] [-x width] [-y height] " "[-R inactive-border-style] [-T title] [-x width] [-y height] "
@@ -57,8 +57,8 @@ const struct cmd_entry cmd_split_window_entry = {
.name = "split-window", .name = "split-window",
.alias = "splitw", .alias = "splitw",
.args = { "bBc:de:EfF:hIkl:m:p:PR:s:S:t:T:vZ", 0, -1, NULL }, .args = { "bc:de:EfF:hIkl:m:p:PR:s:S:t:T:vWZ", 0, -1, NULL },
.usage = "[-bdefhIklPvZ] [-c start-directory] [-e environment] " .usage = "[-bdefhIklPvWZ] [-c start-directory] [-e environment] "
"[-F format] [-l size] [-m message] [-p percentage] " "[-F format] [-l size] [-m message] [-p percentage] "
"[-s style] [-S active-border-style] " "[-s style] [-S active-border-style] "
"[-R inactive-border-style] [-T title] " CMD_TARGET_PANE_USAGE " " "[-R inactive-border-style] [-T title] " CMD_TARGET_PANE_USAGE " "
@@ -246,13 +246,13 @@ cmd_split_window_exec(struct cmd *self, struct cmdq_item *item)
if (input) if (input)
return (CMD_RETURN_WAIT); return (CMD_RETURN_WAIT);
if (args_has(args, 'B')) { if (args_has(args, 'W')) {
/* /*
* With -B, block this command queue item until the pane's * With -W, block this command queue item until the pane's
* command exits; window_pane_block_finish will be called to * command exits; window_pane_wait_finish will be called to
* continue it. * continue it.
*/ */
new_wp->block_item = item; new_wp->wait_item = item;
return (CMD_RETURN_WAIT); return (CMD_RETURN_WAIT);
} }
return (CMD_RETURN_NORMAL); return (CMD_RETURN_NORMAL);

2
server.c
View File

@@ -491,7 +491,7 @@ server_child_exited(pid_t pid, int status)
log_debug("%%%u exited", wp->id); log_debug("%%%u exited", wp->id);
wp->flags |= PANE_EXITED; wp->flags |= PANE_EXITED;
window_pane_block_finish(wp); window_pane_wait_finish(wp);
if (window_pane_destroy_ready(wp)) if (window_pane_destroy_ready(wp))
server_destroy_pane(wp, 1); server_destroy_pane(wp, 1);

8
tmux.1
View File

@@ -3412,7 +3412,7 @@ but a different format may be specified with
.Fl F . .Fl F .
.Tg newp .Tg newp
.It Xo Ic new\-pane .It Xo Ic new\-pane
.Op Fl bBdefhIkPvZ .Op Fl bdefhIkPvWZ
.Op Fl c Ar start\-directory .Op Fl c Ar start\-directory
.Op Fl e Ar environment .Op Fl e Ar environment
.Op Fl F Ar format .Op Fl F Ar format
@@ -3488,13 +3488,13 @@ but also sets the
option for this pane to option for this pane to
.Ar message . .Ar message .
.Pp .Pp
.Fl B .Fl W
blocks until Waits until
.Ar shell\-command .Ar shell\-command
exits, then returns its exit status. exits, then returns its exit status.
For example: For example:
.Bd -literal -offset indent .Bd -literal -offset indent
$ tmux new-pane -B 'vi afile' $ tmux new-pane -W 'vi afile'
$ echo $? $ echo $?
0 0
.Ed .Ed

4
tmux.h
View File

@@ -1266,7 +1266,7 @@ struct window_pane {
char tty[TTY_NAME_MAX]; char tty[TTY_NAME_MAX];
int status; int status;
struct timeval dead_time; struct timeval dead_time;
struct cmdq_item *block_item; /* new-pane -B: waiting for pane exit */ struct cmdq_item *wait_item; /* new-pane -W: waiting for pane exit */
int fd; int fd;
struct bufferevent *event; struct bufferevent *event;
@@ -3383,7 +3383,7 @@ struct window *window_find_by_id(u_int);
void window_update_activity(struct window *); void window_update_activity(struct window *);
struct window *window_create(u_int, u_int, u_int, u_int); struct window *window_create(u_int, u_int, u_int, u_int);
void window_pane_set_event(struct window_pane *); void window_pane_set_event(struct window_pane *);
void window_pane_block_finish(struct window_pane *); void window_pane_wait_finish(struct window_pane *);
struct window_pane *window_get_active_at(struct window *, u_int, u_int); struct window_pane *window_get_active_at(struct window *, u_int, u_int);
struct window_pane *window_find_string(struct window *, const char *); struct window_pane *window_find_string(struct window *, const char *);
int window_has_floating_panes(struct window *); int window_has_floating_panes(struct window *);

10
window.c
View File

@@ -388,7 +388,7 @@ window_pane_destroy_ready(struct window_pane *wp)
* If a command queue item is blocked on this pane, wait for the * If a command queue item is blocked on this pane, wait for the
* child's exit status before destroying it. * child's exit status before destroying it.
*/ */
if (wp->block_item != NULL && (~wp->flags & PANE_STATUSREADY)) if (wp->wait_item != NULL && (~wp->flags & PANE_STATUSREADY))
return (0); return (0);
return (1); return (1);
} }
@@ -1086,15 +1086,15 @@ window_pane_create(struct window *w, u_int sx, u_int sy, u_int hlimit)
} }
void void
window_pane_block_finish(struct window_pane *wp) window_pane_wait_finish(struct window_pane *wp)
{ {
struct cmdq_item *item = wp->block_item; struct cmdq_item *item = wp->wait_item;
struct client *c; struct client *c;
int retval = 0; int retval = 0;
if (item == NULL) if (item == NULL)
return; return;
wp->block_item = NULL; wp->wait_item = NULL;
if (wp->flags & PANE_STATUSREADY) { if (wp->flags & PANE_STATUSREADY) {
if (WIFEXITED(wp->status)) if (WIFEXITED(wp->status))
@@ -1115,7 +1115,7 @@ window_pane_destroy(struct window_pane *wp)
struct window_pane_resize *r; struct window_pane_resize *r;
struct window_pane_resize *r1; struct window_pane_resize *r1;
window_pane_block_finish(wp); window_pane_wait_finish(wp);
window_pane_reset_mode_all(wp); window_pane_reset_mode_all(wp);
free(wp->searchstr); free(wp->searchstr);