circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-01-07 08:18:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2019-02-06 08:02:37 +00:00
commit c42e89a598
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
cmd-display-panes.c
View File

@ -37,8 +37,8 @@ const struct cmd_entry cmd_display_panes_entry = {
.name = "display-panes", .name = "display-panes",
.alias = "displayp", .alias = "displayp",
.args = { "d:t:", 0, 1 }, .args = { "bd:t:", 0, 1 },
.usage = "[-d duration] " CMD_TARGET_CLIENT_USAGE " [template]", .usage = "[-b] [-d duration] " CMD_TARGET_CLIENT_USAGE " [template]",
.flags = CMD_AFTERHOOK, .flags = CMD_AFTERHOOK,
.exec = cmd_display_panes_exec .exec = cmd_display_panes_exec
@ -65,7 +65,10 @@ cmd_display_panes_exec(struct cmd *self, struct cmdq_item *item)
c->identify_callback_data = xstrdup(args->argv[0]); c->identify_callback_data = xstrdup(args->argv[0]);
else else
c->identify_callback_data = xstrdup("select-pane -t '%%'"); c->identify_callback_data = xstrdup("select-pane -t '%%'");
c->identify_callback_item = item; if (args_has(args, 'b'))
c->identify_callback_item = NULL;
else
c->identify_callback_item = item;
if (args_has(args, 'd')) { if (args_has(args, 'd')) {
delay = args_strtonum(args, 'd', 0, UINT_MAX, &cause); delay = args_strtonum(args, 'd', 0, UINT_MAX, &cause);
@ -78,6 +81,8 @@ cmd_display_panes_exec(struct cmd *self, struct cmdq_item *item)
delay = options_get_number(s->options, "display-panes-time"); delay = options_get_number(s->options, "display-panes-time");
server_client_set_identify(c, delay); server_client_set_identify(c, delay);
if (args_has(args, 'b'))
return (CMD_RETURN_NORMAL);
return (CMD_RETURN_WAIT); return (CMD_RETURN_WAIT);
} }
@ -115,15 +120,21 @@ cmd_display_panes_callback(struct client *c, struct window_pane *wp)
cmd_list_free(cmdlist); cmd_list_free(cmdlist);
} }
if (new_item != NULL) if (new_item != NULL) {
cmdq_insert_after(c->identify_callback_item, new_item); if (c->identify_callback_item != NULL)
cmdq_insert_after(c->identify_callback_item, new_item);
else
cmdq_append(c, new_item);
}
free(cmd); free(cmd);
free(expanded); free(expanded);
out: out:
c->identify_callback_item->flags &= ~CMDQ_WAITING; if (c->identify_callback_item != NULL) {
c->identify_callback_item = NULL; c->identify_callback_item->flags &= ~CMDQ_WAITING;
c->identify_callback_item = NULL;
}
free(c->identify_callback_data); free(c->identify_callback_data);
c->identify_callback_data = NULL; c->identify_callback_data = NULL;

4
tmux.1
View File

@ -1569,6 +1569,7 @@ first.
This command works only if at least one client is attached. This command works only if at least one client is attached.
.It Xo .It Xo
.Ic display-panes .Ic display-panes
.Op Fl b
.Op Fl d Ar duration .Op Fl d Ar duration
.Op Fl t Ar target-client .Op Fl t Ar target-client
.Op Ar template .Op Ar template
@ -1602,6 +1603,9 @@ substituted by the pane ID.
The default The default
.Ar template .Ar template
is "select-pane -t '%%'". is "select-pane -t '%%'".
With
.Fl b ,
other commands are not blocked from running until the indicator is closed.
.It Xo Ic find-window .It Xo Ic find-window
.Op Fl CNTZ .Op Fl CNTZ
.Op Fl t Ar target-pane .Op Fl t Ar target-pane