Sync OpenBSD patchset 142:

Each window now has a tree of layout cells associated with it. In this tree,
each node is either a horizontal or vertical cell containing a list of other
cells running from left-to-right or top-to-bottom, or a leaf cell which is
associated with a pane.

The major functional changes are:

- panes may now be split arbitrarily both horizontally (splitw -h, C-b %) and
  vertically (splitw -v, C-b ");
- panes may be resized both horizontally and vertically (resizep -L/-R/-U/-D,
  bound to C-b left/right/up/down and C-b M-left/right/up/down);
- layouts are now applied and then may be modified by resizing or splitting
  panes, rather than being fixed and reapplied when the window is resized or
  panes are added;
- manual-vertical layout is no longer necessary, and active-only layout is gone
  (but may return in future);
- the main-pane layouts now reduce the size of the main pane to fit all panes
  if possible.

Thanks to all who tested.

1 files changed, 10 insertions, 6 deletions

diff --git a/cmd-swap-pane.c b/cmd-swap-pane.c
index e3066ce7..76b18d07 100644
--- a/cmd-swap-pane.c
+++ b/cmd-swap-pane.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-swap-pane.c,v 1.8 2009-07-15 17:42:43 nicm Exp $ */
+/* $Id: cmd-swap-pane.c,v 1.9 2009-07-20 15:42:05 tcunha Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -157,6 +157,7 @@ cmd_swap_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
 	struct winlink			*wl;
 	struct window			*w;
 	struct window_pane		*tmp_wp, *src_wp, *dst_wp;
+	struct layout_cell		*lc;
 	u_int				 xx, yy;
 
 	if (data == NULL)
@@ -207,12 +208,15 @@ cmd_swap_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
 	else
 		TAILQ_INSERT_AFTER(&w->panes, tmp_wp, src_wp, entry);
 
+	lc = src_wp->layout_cell;
 	xx = src_wp->xoff;
 	yy = src_wp->yoff;
- 	src_wp->xoff = dst_wp->xoff;
- 	src_wp->yoff = dst_wp->yoff;
- 	dst_wp->xoff = xx;
- 	dst_wp->yoff = yy;
+	src_wp->layout_cell = dst_wp->layout_cell;
+	if (src_wp->layout_cell != NULL)
+		src_wp->layout_cell->wp = src_wp;
+	dst_wp->layout_cell = lc;
+	if (dst_wp->layout_cell != NULL)
+		dst_wp->layout_cell->wp = dst_wp;
 
 	xx = src_wp->sx;
 	yy = src_wp->sy;
@@ -224,8 +228,8 @@ cmd_swap_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
 		if (!window_pane_visible(tmp_wp))
 			tmp_wp = src_wp;
 		window_set_active_pane(w, tmp_wp);
-		layout_refresh(w, 0);
 	}
+	server_redraw_window(w);
 
 	return (0);
 }