===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/layout-set.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- src/usr.bin/tmux/layout-set.c	2016/01/19 15:59:12	1.14
+++ src/usr.bin/tmux/layout-set.c	2016/08/03 09:07:02	1.15
@@ -1,4 +1,4 @@
-/* $OpenBSD: layout-set.c,v 1.14 2016/01/19 15:59:12 nicm Exp $ */
+/* $OpenBSD: layout-set.c,v 1.15 2016/08/03 09:07:02 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -155,7 +155,8 @@
 	/* Allocate any remaining space. */
 	if (w->sx > xoff - 1) {
 		lc = TAILQ_LAST(&lc->cells, layout_cells);
-		layout_resize_adjust(lc, LAYOUT_LEFTRIGHT, w->sx - (xoff - 1));
+		layout_resize_adjust(w, lc, LAYOUT_LEFTRIGHT,
+		    w->sx - (xoff - 1));
 	}
 
 	/* Fix cell offsets. */
@@ -208,7 +209,8 @@
 	/* Allocate any remaining space. */
 	if (w->sy > yoff - 1) {
 		lc = TAILQ_LAST(&lc->cells, layout_cells);
-		layout_resize_adjust(lc, LAYOUT_TOPBOTTOM, w->sy - (yoff - 1));
+		layout_resize_adjust(w, lc, LAYOUT_TOPBOTTOM,
+		    w->sy - (yoff - 1));
 	}
 
 	/* Fix cell offsets. */
@@ -322,14 +324,16 @@
 		if (w->sx <= used)
 			continue;
 		lcchild = TAILQ_LAST(&lcrow->cells, layout_cells);
-		layout_resize_adjust(lcchild, LAYOUT_LEFTRIGHT, w->sx - used);
+		layout_resize_adjust(w, lcchild, LAYOUT_LEFTRIGHT,
+		    w->sx - used);
 	}
 
 	/* Adjust the last row height to fit if necessary. */
 	used = mainheight + (rows * height) + rows - 1;
 	if (w->sy > used) {
 		lcrow = TAILQ_LAST(&lc->cells, layout_cells);
-		layout_resize_adjust(lcrow, LAYOUT_TOPBOTTOM, w->sy - used);
+		layout_resize_adjust(w, lcrow, LAYOUT_TOPBOTTOM,
+		    w->sy - used);
 	}
 
 	/* Fix cell offsets. */
@@ -443,14 +447,16 @@
 		if (w->sy <= used)
 			continue;
 		lcchild = TAILQ_LAST(&lccolumn->cells, layout_cells);
-		layout_resize_adjust(lcchild, LAYOUT_TOPBOTTOM, w->sy - used);
+		layout_resize_adjust(w, lcchild, LAYOUT_TOPBOTTOM,
+		    w->sy - used);
 	}
 
 	/* Adjust the last column width to fit if necessary. */
 	used = mainwidth + (columns * width) + columns - 1;
 	if (w->sx > used) {
 		lccolumn = TAILQ_LAST(&lc->cells, layout_cells);
-		layout_resize_adjust(lccolumn, LAYOUT_LEFTRIGHT, w->sx - used);
+		layout_resize_adjust(w, lccolumn, LAYOUT_LEFTRIGHT,
+		    w->sx - used);
 	}
 
 	/* Fix cell offsets. */
@@ -543,14 +549,16 @@
 		if (w->sx <= used)
 			continue;
 		lcchild = TAILQ_LAST(&lcrow->cells, layout_cells);
-		layout_resize_adjust(lcchild, LAYOUT_LEFTRIGHT, w->sx - used);
+		layout_resize_adjust(w, lcchild, LAYOUT_LEFTRIGHT,
+		    w->sx - used);
 	}
 
 	/* Adjust the last row height to fit if necessary. */
 	used = (rows * height) + rows - 1;
 	if (w->sy > used) {
 		lcrow = TAILQ_LAST(&lc->cells, layout_cells);
-		layout_resize_adjust(lcrow, LAYOUT_TOPBOTTOM, w->sy - used);
+		layout_resize_adjust(w, lcrow, LAYOUT_TOPBOTTOM,
+		    w->sy - used);
 	}
 
 	/* Fix cell offsets. */