summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2015-09-17 14:11:56 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2015-09-17 14:11:56 +0000
commit0521c7daa6153cab29766f394c49b3f0bdbe6195 (patch)
treeef383c83330a5721b595150bcaf3ba98ca9962bd /usr.bin
parent85dc362845730fb00bd9a94714803e218ee3e8da (diff)
Redraw both src and dst sessions in break-pane.
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/tmux/cmd-break-pane.c36
1 files changed, 21 insertions, 15 deletions
diff --git a/usr.bin/tmux/cmd-break-pane.c b/usr.bin/tmux/cmd-break-pane.c
index 51f4415003b..22655a904bb 100644
--- a/usr.bin/tmux/cmd-break-pane.c
+++ b/usr.bin/tmux/cmd-break-pane.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-break-pane.c,v 1.27 2015/06/17 19:56:08 nicm Exp $ */
+/* $OpenBSD: cmd-break-pane.c,v 1.28 2015/09/17 14:11:55 nicm Exp $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -43,7 +43,8 @@ cmd_break_pane_exec(struct cmd *self, struct cmd_q *cmdq)
{
struct args *args = self->args;
struct winlink *wl;
- struct session *s;
+ struct session *src_s;
+ struct session *dst_s;
struct window_pane *wp;
struct window *w;
char *name;
@@ -53,28 +54,28 @@ cmd_break_pane_exec(struct cmd *self, struct cmd_q *cmdq)
const char *template;
char *cp;
- if ((wl = cmd_find_pane(cmdq, args_get(args, 's'), &s, &wp)) == NULL)
+ wl = cmd_find_pane(cmdq, args_get(args, 's'), &src_s, &wp);
+ if (wl == NULL)
return (CMD_RETURN_ERROR);
- if ((idx = cmd_find_index(cmdq, args_get(args, 't'), &s)) == -2)
+ if ((idx = cmd_find_index(cmdq, args_get(args, 't'), &dst_s)) == -2)
return (CMD_RETURN_ERROR);
- if (idx != -1 && winlink_find_by_index(&s->windows, idx) != NULL) {
+ if (idx != -1 && winlink_find_by_index(&dst_s->windows, idx) != NULL) {
cmdq_error(cmdq, "index %d already in use", idx);
return (CMD_RETURN_ERROR);
}
+ w = wl->window;
- if (window_count_panes(wl->window) == 1) {
+ if (window_count_panes(w) == 1) {
cmdq_error(cmdq, "can't break with only one pane");
return (CMD_RETURN_ERROR);
}
-
- w = wl->window;
server_unzoom_window(w);
TAILQ_REMOVE(&w->panes, wp, entry);
window_lost_pane(w, wp);
layout_close_pane(wp);
- w = wp->window = window_create1(s->sx, s->sy);
+ w = wp->window = window_create1(dst_s->sx, dst_s->sy);
TAILQ_INSERT_HEAD(&w->panes, wp, entry);
w->active = wp;
name = default_window_name(w);
@@ -83,20 +84,25 @@ cmd_break_pane_exec(struct cmd *self, struct cmd_q *cmdq)
layout_init(w, wp);
if (idx == -1)
- idx = -1 - options_get_number(&s->options, "base-index");
- wl = session_attach(s, w, idx, &cause); /* can't fail */
+ idx = -1 - options_get_number(&dst_s->options, "base-index");
+ wl = session_attach(dst_s, w, idx, &cause); /* can't fail */
if (!args_has(self->args, 'd'))
- session_select(s, wl->idx);
+ session_select(dst_s, wl->idx);
- server_redraw_session(s);
- server_status_session_group(s);
+ server_redraw_session(src_s);
+ if (src_s != dst_s)
+ server_redraw_session(dst_s);
+ server_status_session_group(src_s);
+ if (src_s != dst_s)
+ server_status_session_group(dst_s);
if (args_has(args, 'P')) {
if ((template = args_get(args, 'F')) == NULL)
template = BREAK_PANE_TEMPLATE;
ft = format_create();
- format_defaults(ft, cmd_find_client(cmdq, NULL, 1), s, wl, wp);
+ format_defaults(ft, cmd_find_client(cmdq, NULL, 1), dst_s, wl,
+ wp);
cp = format_expand(ft, template);
cmdq_print(cmdq, "%s", cp);