diff options
| author |   nicm <nicm@openbsd.org> | 2009-06-03 07:51:24 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2009-06-03 07:51:24 +0000 |
| commit | 90387070db774fb6c0fcd7c6ba21b787c826e1e6 (patch) | |
| tree | ef1fbd2d633d2013ee1b9e22487e1656e660bbc5 /usr.bin/tmux/cmd-rotate-window.c | |
| parent | Import acpi power resource driver. This is needed for suspend/resume logic. (diff) | |
| download | wireguard-openbsd-90387070db774fb6c0fcd7c6ba21b787c826e1e6.tar.xz wireguard-openbsd-90387070db774fb6c0fcd7c6ba21b787c826e1e6.zip | |
When swapping pane positions, swap the PANE_HIDDEN flag as well, otherwise tmux
crashes when trying to find the new active pane.
While here, nuke an unused pane flag.
Fixes PR 6160, reported by and a slightly different version of diff tested by
ralf.horstmann at gmx.de.
Diffstat (limited to 'usr.bin/tmux/cmd-rotate-window.c')
| -rw-r--r-- | usr.bin/tmux/cmd-rotate-window.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/usr.bin/tmux/cmd-rotate-window.c b/usr.bin/tmux/cmd-rotate-window.c index abe78fdd62b..8efa9a53c54 100644 --- a/usr.bin/tmux/cmd-rotate-window.c +++ b/usr.bin/tmux/cmd-rotate-window.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-rotate-window.c,v 1.1 2009/06/01 22:58:49 nicm Exp $ */ +/* $OpenBSD: cmd-rotate-window.c,v 1.2 2009/06/03 07:51:24 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net> @@ -60,6 +60,7 @@ cmd_rotate_window_exec(struct cmd *self, struct cmd_ctx *ctx) struct window *w; struct window_pane *wp, *wp2; u_int sx, sy, xoff, yoff; + int flags; if ((wl = cmd_find_window(ctx, data->target, NULL)) == NULL) return (-1); @@ -71,14 +72,19 @@ cmd_rotate_window_exec(struct cmd *self, struct cmd_ctx *ctx) TAILQ_INSERT_HEAD(&w->panes, wp, entry); xoff = wp->xoff; yoff = wp->yoff; - sx = wp->sx; sy = wp->sy; + sx = wp->sx; sy = wp->sy; + flags = w->flags; TAILQ_FOREACH(wp, &w->panes, entry) { if ((wp2 = TAILQ_NEXT(wp, entry)) == NULL) break; wp->xoff = wp2->xoff; wp->yoff = wp2->yoff; + wp->flags &= ~PANE_HIDDEN; + wp->flags |= wp2->flags & PANE_HIDDEN; window_pane_resize(wp, wp2->sx, wp2->sy); } wp->xoff = xoff; wp->yoff = yoff; + wp->flags &= ~PANE_HIDDEN; + wp->flags |= flags & PANE_HIDDEN; window_pane_resize(wp, sx, sy); if ((wp = TAILQ_PREV(w->active, window_panes, entry)) == NULL) @@ -91,13 +97,18 @@ cmd_rotate_window_exec(struct cmd *self, struct cmd_ctx *ctx) xoff = wp->xoff; yoff = wp->yoff; sx = wp->sx; sy = wp->sy; + flags = w->flags; TAILQ_FOREACH_REVERSE(wp, &w->panes, window_panes, entry) { if ((wp2 = TAILQ_PREV(wp, window_panes, entry)) == NULL) break; wp->xoff = wp2->xoff; wp->yoff = wp2->yoff; + wp->flags &= ~PANE_HIDDEN; + wp->flags |= wp2->flags & PANE_HIDDEN; window_pane_resize(wp, wp2->sx, wp2->sy); } wp->xoff = xoff; wp->yoff = yoff; + wp->flags &= ~PANE_HIDDEN; + wp->flags |= flags & PANE_HIDDEN; window_pane_resize(wp, sx, sy); if ((wp = TAILQ_NEXT(w->active, entry)) == NULL) |