From fdbfc7e3498e1cdd04e8df58aa1a937ee4d79caa Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Fri, 18 Jan 2013 02:16:21 +0000 Subject: Rather than having two grids for each pane, one for ASCII and one for UTF-8, collapse the two together. Simplifies the code at the expense of more memory (which can probably be reduced again later). --- grid-view.c | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) (limited to 'grid-view.c') diff --git a/grid-view.c b/grid-view.c index e36144f0..bde624cc 100644 --- a/grid-view.c +++ b/grid-view.c @@ -52,28 +52,6 @@ grid_view_set_cell( grid_set_cell(gd, grid_view_x(gd, px), grid_view_y(gd, py), gc); } -/* Get UTF-8 for reading. */ -const struct grid_utf8 * -grid_view_peek_utf8(struct grid *gd, u_int px, u_int py) -{ - return (grid_peek_utf8(gd, grid_view_x(gd, px), grid_view_y(gd, py))); -} - -/* Get UTF-8 for writing. */ -struct grid_utf8 * -grid_view_get_utf8(struct grid *gd, u_int px, u_int py) -{ - return (grid_get_utf8(gd, grid_view_x(gd, px), grid_view_y(gd, py))); -} - -/* Set UTF-8. */ -void -grid_view_set_utf8( - struct grid *gd, u_int px, u_int py, const struct grid_utf8 *gu) -{ - grid_set_utf8(gd, grid_view_x(gd, px), grid_view_y(gd, py), gu); -} - /* Clear into history. */ void grid_view_clear_history(struct grid *gd) @@ -87,7 +65,7 @@ grid_view_clear_history(struct grid *gd) last = 0; for (yy = 0; yy < gd->sy; yy++) { gl = &gd->linedata[grid_view_y(gd, yy)]; - if (gl->cellsize != 0 || gl->utf8size != 0) + if (gl->cellsize != 0) last = yy + 1; } if (last == 0) -- cgit v1.2.3