From afd3127d8902758ae50ced1b5cccd768d48c5fad Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Wed, 6 Feb 2019 07:36:06 +0000
Subject: [PATCH] Add -b to display-panes like run-shell, GitHub issue 1559.

---
 cmd-display-panes.c | 25 ++++++++++++++++++-------
 tmux.1              |  4 ++++
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/cmd-display-panes.c b/cmd-display-panes.c
index d5b3fb5c..1330ffac 100644
--- a/cmd-display-panes.c
+++ b/cmd-display-panes.c
@@ -37,8 +37,8 @@ const struct cmd_entry cmd_display_panes_entry = {
 	.name = "display-panes",
 	.alias = "displayp",
 
-	.args = { "d:t:", 0, 1 },
-	.usage = "[-d duration] " CMD_TARGET_CLIENT_USAGE " [template]",
+	.args = { "bd:t:", 0, 1 },
+	.usage = "[-b] [-d duration] " CMD_TARGET_CLIENT_USAGE " [template]",
 
 	.flags = CMD_AFTERHOOK,
 	.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]);
 	else
 		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')) {
 		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");
 	server_client_set_identify(c, delay);
 
+	if (args_has(args, 'b'))
+		return (CMD_RETURN_NORMAL);
 	return (CMD_RETURN_WAIT);
 }
 
@@ -115,15 +120,21 @@ cmd_display_panes_callback(struct client *c, struct window_pane *wp)
 		cmd_list_free(cmdlist);
 	}
 
-	if (new_item != NULL)
-		cmdq_insert_after(c->identify_callback_item, new_item);
+	if (new_item != NULL) {
+		if (c->identify_callback_item != NULL)
+			cmdq_insert_after(c->identify_callback_item, new_item);
+		else
+			cmdq_append(c, new_item);
+	}
 
 	free(cmd);
 	free(expanded);
 
 out:
-	c->identify_callback_item->flags &= ~CMDQ_WAITING;
-	c->identify_callback_item = NULL;
+	if (c->identify_callback_item != NULL) {
+		c->identify_callback_item->flags &= ~CMDQ_WAITING;
+		c->identify_callback_item = NULL;
+	}
 
 	free(c->identify_callback_data);
 	c->identify_callback_data = NULL;
diff --git a/tmux.1 b/tmux.1
index e3409a96..756ee964 100644
--- a/tmux.1
+++ b/tmux.1
@@ -1526,6 +1526,7 @@ first.
 This command works only if at least one client is attached.
 .It Xo
 .Ic display-panes
+.Op Fl b
 .Op Fl d Ar duration
 .Op Fl t Ar target-client
 .Op Ar template
@@ -1559,6 +1560,9 @@ substituted by the pane ID.
 The default
 .Ar template
 is "select-pane -t '%%'".
+With
+.Fl b ,
+other commands are not blocked from running until the indicator is closed.
 .It Xo Ic find-window
 .Op Fl CNTZ
 .Op Fl t Ar target-pane