From 0198bb6bf3f1b3877ca8def6d198642a2a41d342 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicm@openbsd.org>
Date: Fri, 21 Aug 2009 07:29:37 +0000
Subject: [PATCH] Fix grid_expand_line so it actually works when the required
 size is bigger than 2 * the current size.

---
 grid.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/grid.c b/grid.c
index 31cc430b..b79e8843 100644
--- a/grid.c
+++ b/grid.c
@@ -189,19 +189,22 @@ grid_scroll_line(struct grid *gd)
 
 /* Expand line to fit to cell. */
 void
-grid_expand_line(struct grid *gd, u_int py, u_int sx)
+grid_expand_line(struct grid *gd, u_int py, u_int wantx)
 {
 	struct grid_line	*gl;
-	u_int			 xx;
+	u_int			 xx, sx;
 
 	gl = &gd->linedata[py];
-	if (sx <= gl->cellsize)
+	if (wantx <= gl->cellsize)
 		return;
 
 	if (gl->cellsize > gd->sx / 2)
 		sx = gd->sx;
-	else
-		sx = 1 + gl->cellsize * 2;
+	else {
+		sx = gl->cellsize + 1;
+		while (sx < wantx)
+			sx *= 2;
+	}
 	gl->celldata = xrealloc(gl->celldata, sx, sizeof *gl->celldata);
 	for (xx = gl->cellsize; xx < sx; xx++)
 		grid_put_cell(gd, xx, py, &grid_default_cell);