diff options
| -rw-r--r-- | grid-view.c | 8 | ||||
| -rw-r--r-- | grid.c | 15 | ||||
| -rw-r--r-- | tmux.h | 12 |
3 files changed, 19 insertions, 16 deletions
diff --git a/grid-view.c b/grid-view.c index c3801b5c..7869d22e 100644 --- a/grid-view.c +++ b/grid-view.c @@ -1,4 +1,4 @@ -/* $Id: grid-view.c,v 1.8 2009-03-28 16:30:05 nicm Exp $ */ +/* $Id: grid-view.c,v 1.9 2009-03-28 16:55:46 nicm Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net> @@ -80,15 +80,15 @@ grid_view_clear(struct grid *gd, u_int px, u_int py, u_int nx, u_int ny) /* Fill area. */ void -grid_view_fill(struct grid *gd, - const struct grid_cell *gc, u_int px, u_int py, u_int nx, u_int ny) +grid_view_fill(struct grid *gd, const struct grid_cell *gc, + uint64_t text, u_int px, u_int py, u_int nx, u_int ny) { GRID_DEBUG(gd, "px=%u, py=%u, nx=%u, ny=%u", px, py, nx, ny); px = grid_view_x(gd, px); py = grid_view_y(gd, py); - grid_fill(gd, gc, px, py, nx, ny); + grid_fill(gd, gc, text, px, py, nx, ny); } /* Scroll region up. */ @@ -1,4 +1,4 @@ -/* $Id: grid.c,v 1.11 2009-03-28 16:30:05 nicm Exp $ */ +/* $Id: grid.c,v 1.12 2009-03-28 16:55:46 nicm Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net> @@ -312,14 +312,15 @@ grid_clear(struct grid *gd, u_int px, u_int py, u_int nx, u_int ny) if (xx >= gd->size[yy]) break; grid_put_cell(gd, xx, yy, &grid_default_cell); + grid_put_text(gd, xx, yy, ' '); } } } /* Fill area. */ void -grid_fill(struct grid *gd, - const struct grid_cell *gc, u_int px, u_int py, u_int nx, u_int ny) +grid_fill(struct grid *gd, const struct grid_cell *gc, + uint64_t text, u_int px, u_int py, u_int nx, u_int ny) { u_int xx, yy; @@ -341,6 +342,7 @@ grid_fill(struct grid *gd, for (xx = px; xx < px + nx; xx++) { grid_expand_line(gd, yy, xx + 1); grid_put_cell(gd, xx, py, gc); + grid_put_text(gd, xx, py, text); } } } @@ -374,10 +376,10 @@ grid_clear_lines(struct grid *gd, u_int py, u_int ny) /* Fill a group of lines. */ void -grid_fill_lines( - struct grid *gd, const struct grid_cell *gc, u_int py, u_int ny) +grid_fill_lines(struct grid *gd, + const struct grid_cell *gc, uint64_t text, u_int py, u_int ny) { - grid_fill(gd, gc, 0, py, gd->sx, ny); + grid_fill(gd, gc, text, 0, py, gd->sx, ny); } /* Move a group of lines. */ @@ -443,6 +445,7 @@ grid_clear_cells(struct grid *gd, u_int px, u_int py, u_int nx) if (xx >= gd->size[py]) break; grid_put_cell(gd, xx, py, &grid_default_cell); + grid_put_text(gd, xx, py, ' '); } } @@ -1,4 +1,4 @@ -/* $Id: tmux.h,v 1.288 2009-03-28 16:30:05 nicm Exp $ */ +/* $Id: tmux.h,v 1.289 2009-03-28 16:55:46 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -1379,10 +1379,10 @@ void grid_set_cell(struct grid *, u_int, u_int, const struct grid_cell *); uint64_t grid_peek_text(struct grid *, u_int, u_int); void grid_set_text(struct grid *, u_int, u_int, uint64_t); void grid_clear(struct grid *, u_int, u_int, u_int, u_int); -void grid_fill(struct grid *, - const struct grid_cell *, u_int, u_int, u_int, u_int); +void grid_fill(struct grid *, const struct grid_cell *, + uint64_t, u_int, u_int, u_int, u_int); void grid_fill_lines( - struct grid *, const struct grid_cell *, u_int, u_int); + struct grid *, const struct grid_cell *, uint64_t, u_int, u_int); void grid_clear_lines(struct grid *, u_int, u_int); void grid_move_lines(struct grid *, u_int, u_int, u_int); void grid_clear_cells(struct grid *, u_int, u_int, u_int); @@ -1397,8 +1397,8 @@ void grid_view_set_cell( uint64_t grid_view_peek_text(struct grid *, u_int, u_int); void grid_view_set_text(struct grid *, u_int, u_int, uint64_t); void grid_view_clear(struct grid *, u_int, u_int, u_int, u_int); -void grid_view_fill(struct grid *, - const struct grid_cell *, u_int, u_int, u_int, u_int); +void grid_view_fill(struct grid *, const struct grid_cell *, + uint64_t, u_int, u_int, u_int, u_int); void grid_view_scroll_region_up(struct grid *, u_int, u_int); void grid_view_scroll_region_down(struct grid *, u_int, u_int); void grid_view_insert_lines(struct grid *, u_int, u_int); |