diff options
| -rw-r--r-- | usr.bin/tmux/grid.c | 6 | ||||
| -rw-r--r-- | usr.bin/tmux/screen.c | 15 | ||||
| -rw-r--r-- | usr.bin/tmux/tmux.h | 3 |
3 files changed, 7 insertions, 17 deletions
diff --git a/usr.bin/tmux/grid.c b/usr.bin/tmux/grid.c index aad957bdfd0..7ffd383a7df 100644 --- a/usr.bin/tmux/grid.c +++ b/usr.bin/tmux/grid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grid.c,v 1.105 2020/04/09 13:53:50 nicm Exp $ */ +/* $OpenBSD: grid.c,v 1.106 2020/04/15 12:59:20 nicm Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -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/usr.bin/tmux/screen.c b/usr.bin/tmux/screen.c index 4ab88b4ff6e..4a0cdddd81a 100644 --- a/usr.bin/tmux/screen.c +++ b/usr.bin/tmux/screen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: screen.c,v 1.60 2020/04/07 13:55:24 nicm Exp $ */ +/* $OpenBSD: screen.c,v 1.61 2020/04/15 12:59:20 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -314,7 +314,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. */ @@ -484,10 +484,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); @@ -504,12 +501,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/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h index ed9d7b8b071..f33ec21cf19 100644 --- a/usr.bin/tmux/tmux.h +++ b/usr.bin/tmux/tmux.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tmux.h,v 1.991 2020/04/14 06:00:52 nicm Exp $ */ +/* $OpenBSD: tmux.h,v 1.992 2020/04/15 12:59:20 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -2312,6 +2312,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 *); |