diff options
Diffstat (limited to 'usr.bin/tmux/grid.c')
| -rw-r--r-- | usr.bin/tmux/grid.c | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/usr.bin/tmux/grid.c b/usr.bin/tmux/grid.c index 25f6acb0f56..0e6b00797e9 100644 --- a/usr.bin/tmux/grid.c +++ b/usr.bin/tmux/grid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grid.c,v 1.13 2009/08/21 07:29:37 nicm Exp $ */ +/* $OpenBSD: grid.c,v 1.14 2009/09/15 15:14:09 nicm Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net> @@ -189,22 +189,15 @@ grid_scroll_line(struct grid *gd) /* Expand line to fit to cell. */ void -grid_expand_line(struct grid *gd, u_int py, u_int wantx) +grid_expand_line(struct grid *gd, u_int py, u_int sx) { struct grid_line *gl; - u_int xx, sx; + u_int xx; gl = &gd->linedata[py]; - if (wantx <= gl->cellsize) + if (sx <= gl->cellsize) return; - if (gl->cellsize > gd->sx / 2) - sx = gd->sx; - 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); @@ -307,10 +300,7 @@ grid_set_utf8( grid_put_utf8(gd, px, py, gc); } -/* - * Clear area. Note this is different from a fill as it just omits unallocated - * cells. - */ +/* Clear area. */ void grid_clear(struct grid *gd, u_int px, u_int py, u_int nx, u_int ny) { @@ -336,6 +326,12 @@ grid_clear(struct grid *gd, u_int px, u_int py, u_int nx, u_int ny) return; for (yy = py; yy < py + ny; yy++) { + if (px >= gd->linedata[yy].cellsize) + continue; + if (px + nx >= gd->linedata[yy].cellsize) { + gd->linedata[yy].cellsize = px; + continue; + } for (xx = px; xx < px + nx; xx++) { if (xx >= gd->linedata[yy].cellsize) break; |