From bf4b02cea2f4483c07de16e5d408adf3421c8c4f Mon Sep 17 00:00:00 2001 From: Tiago Cunha Date: Wed, 30 May 2012 13:49:45 +0000 Subject: Sync OpenBSD patchset 1130: Add pane title to choose-window template and use the right index for the pane, from Romain Francoise. --- cmd-choose-window.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'cmd-choose-window.c') diff --git a/cmd-choose-window.c b/cmd-choose-window.c index b4ac3305..78fdacae 100644 --- a/cmd-choose-window.c +++ b/cmd-choose-window.c @@ -72,7 +72,7 @@ cmd_choose_window_exec(struct cmd *self, struct cmd_ctx *ctx) return (0); if ((template = args_get(args, 'F')) == NULL) - template = DEFAULT_WINDOW_TEMPLATE; + template = DEFAULT_WINDOW_TEMPLATE " \"#{pane_title}\""; cur = idx = 0; RB_FOREACH(wm, winlinks, &s->windows) { @@ -84,9 +84,10 @@ cmd_choose_window_exec(struct cmd *self, struct cmd_ctx *ctx) format_add(ft, "line", "%u", idx); format_session(ft, s); format_winlink(ft, s, wm); + format_window_pane(ft, wm->window->active); line = format_expand(ft, template); - window_choose_add(wl->window->active, idx, "%s", line); + window_choose_add(wl->window->active, wm->idx, "%s", line); xfree(line); format_free(ft); -- cgit v1.2.3