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). --- input.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'input.c') diff --git a/input.c b/input.c index e04ddc4f..20917fa1 100644 --- a/input.c +++ b/input.c @@ -879,8 +879,8 @@ input_clear(struct input_ctx *ictx) int input_print(struct input_ctx *ictx) { - ictx->cell.data = ictx->ch; - screen_write_cell(&ictx->ctx, &ictx->cell, NULL); + grid_cell_one(&ictx->cell, ictx->ch); + screen_write_cell(&ictx->ctx, &ictx->cell); return (0); } @@ -1657,9 +1657,8 @@ input_utf8_close(struct input_ctx *ictx) utf8_append(&ictx->utf8data, ictx->ch); - ictx->cell.flags |= GRID_FLAG_UTF8; - screen_write_cell(&ictx->ctx, &ictx->cell, &ictx->utf8data); - ictx->cell.flags &= ~GRID_FLAG_UTF8; + grid_cell_set(&ictx->cell, &ictx->utf8data); + screen_write_cell(&ictx->ctx, &ictx->cell); return (0); } -- cgit v1.2.3