Merge branch 'obsd-master'

3 files changed, 4 insertions, 14 deletions

diff --git a/grid.c b/grid.c
index f33bc98d..0cef412b 100644
--- a/grid.c
+++ b/grid.c
@@ -48,8 +48,6 @@ static const struct grid_cell_entry grid_cleared_entry = {
 	GRID_FLAG_CLEARED, { .data = { 0, 8, 8, ' ' } }
 };
 
-static void	grid_empty_line(struct grid *, u_int, u_int);
-
 /* Store cell in entry. */
 static void
 grid_store_cell(struct grid_cell_entry *gce, const struct grid_cell *gc,
@@ -454,7 +452,7 @@ grid_expand_line(struct grid *gd, u_int py, u_int sx, u_int bg)
 }
 
 /* Empty a line and set background colour if needed. */
-static void
+void
 grid_empty_line(struct grid *gd, u_int py, u_int bg)
 {
 	memset(&gd->linedata[py], 0, sizeof gd->linedata[py]);
diff --git a/screen.c b/screen.c
index 1f2f04b4..3eeb4409 100644
--- a/screen.c
+++ b/screen.c
@@ -313,7 +313,7 @@ screen_resize_y(struct screen *s, u_int sy)
 
 		/* Then fill the rest in with blanks. */
 		for (i = gd->hsize + sy - needed; i < gd->hsize + sy; i++)
-			memset(grid_get_line(gd, i), 0, sizeof(struct grid_line));
+			grid_empty_line(gd, i, 8);
 	}
 
 	/* Set the new size, and reset the scroll region. */
@@ -483,10 +483,7 @@ screen_select_cell(struct screen *s, struct grid_cell *dst,
 static void
 screen_reflow(struct screen *s, u_int new_x)
 {
-	u_int		cx = s->cx, cy = s->grid->hsize + s->cy, wx, wy;
-	struct timeval	start, tv;
-
-	gettimeofday(&start, NULL);
+	u_int	cx = s->cx, cy = s->grid->hsize + s->cy, wx, wy;
 
 	grid_wrap_position(s->grid, cx, cy, &wx, &wy);
 	log_debug("%s: cursor %u,%u is %u,%u", __func__, cx, cy, wx, wy);
@@ -503,12 +500,6 @@ screen_reflow(struct screen *s, u_int new_x)
 		s->cx = 0;
 		s->cy = 0;
 	}
-
-	gettimeofday(&tv, NULL);
-	timersub(&tv, &start, &tv);
-
-	log_debug("%s: reflow took %llu.%06u seconds", __func__,
-	    (unsigned long long)tv.tv_sec, (u_int)tv.tv_usec);
 }
 
 /*
diff --git a/tmux.h b/tmux.h
index 882d8107..13350a40 100644
--- a/tmux.h
+++ b/tmux.h
@@ -2314,6 +2314,7 @@ int	 attributes_fromstring(const char *);
 
 /* grid.c */
 extern const struct grid_cell grid_default_cell;
+void	 grid_empty_line(struct grid *, u_int, u_int);
 int	 grid_cells_equal(const struct grid_cell *, const struct grid_cell *);
 struct grid *grid_create(u_int, u_int, u_int);
 void	 grid_destroy(struct grid *);