From c5dbec9e856602e7b10a5e8f8e5f70585096ffb8 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicm@openbsd.org>
Date: Wed, 3 Jun 2009 07:51:24 +0000
Subject: [PATCH] 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.
---
 cmd-rotate-window.c | 13 ++++++++++++-
 cmd-swap-pane.c     | 11 ++++++++++-
 tmux.h              |  3 +--
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/cmd-rotate-window.c b/cmd-rotate-window.c
index 354e6942..b7ac341d 100644
--- a/cmd-rotate-window.c
+++ b/cmd-rotate-window.c
@@ -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)
diff --git a/cmd-swap-pane.c b/cmd-swap-pane.c
index 0a34d14d..e2f572dc 100644
--- a/cmd-swap-pane.c
+++ b/cmd-swap-pane.c
@@ -158,6 +158,7 @@ cmd_swap_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
 	struct window			*w;
 	struct window_pane		*tmp_wp, *src_wp, *dst_wp;
 	u_int				 xx, yy;
+	int				 flags;
 
 	if (data == NULL)
 		return (0);
@@ -209,10 +210,15 @@ cmd_swap_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
 
 	xx = src_wp->xoff;
 	yy = src_wp->yoff;
+	flags = src_wp->flags;
  	src_wp->xoff = dst_wp->xoff;
  	src_wp->yoff = dst_wp->yoff;
+	src_wp->flags &= ~PANE_HIDDEN;
+	src_wp->flags |= dst_wp->flags & PANE_HIDDEN;
  	dst_wp->xoff = xx;
  	dst_wp->yoff = yy;
+	dst_wp->flags &= ~PANE_HIDDEN;
+	dst_wp->flags |= flags & PANE_HIDDEN;
 
 	xx = src_wp->sx;
 	yy = src_wp->sy;
@@ -220,7 +226,10 @@ cmd_swap_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
 	window_pane_resize(dst_wp, xx, yy);
 
 	if (!data->flag_detached) {
-		window_set_active_pane(w, dst_wp);
+		tmp_wp = dst_wp;
+		if (tmp_wp->flags & PANE_HIDDEN)
+			tmp_wp = src_wp;
+		window_set_active_pane(w, tmp_wp);
 		layout_refresh(w, 0);
 	}
 
diff --git a/tmux.h b/tmux.h
index a2d5f0da..0c8e5929 100644
--- a/tmux.h
+++ b/tmux.h
@@ -589,8 +589,7 @@ struct window_pane {
 
 	int		 flags;
 #define PANE_HIDDEN 0x1
-#define PANE_RESTART 0x2
-#define PANE_REDRAW 0x4
+#define PANE_REDRAW 0x2
 
 	char		*cmd;
 	char		*cwd;