From 37b0bcd7c15b6dac69ac8cb1c0d9d6a4fd5c54c0 Mon Sep 17 00:00:00 2001 From: Tiago Cunha Date: Sun, 9 Aug 2009 17:28:24 +0000 Subject: Sync OpenBSD patchset 226: Change the way the grid is stored, previously it was: - a two-dimensional array of cells; - a two-dimensional array of utf8 data; - an array of line lengths. Now it is a single array of a new struct grid_line each of which represents a line and contains the length and an array of cells and an array of utf8 data. This will make it easier to add additional per-line members, such as flags. --- tty.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tty.c') diff --git a/tty.c b/tty.c index d1b75fb1..95aee805 100644 --- a/tty.c +++ b/tty.c @@ -1,4 +1,4 @@ -/* $Id: tty.c,v 1.121 2009-08-09 16:50:57 tcunha Exp $ */ +/* $Id: tty.c,v 1.122 2009-08-09 17:28:24 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -496,8 +496,8 @@ tty_draw_line(struct tty *tty, struct screen *s, u_int py, u_int ox, u_int oy) u_int i, sx; sx = screen_size_x(s); - if (sx > s->grid->size[s->grid->hsize + py]) - sx = s->grid->size[s->grid->hsize + py]; + if (sx > s->grid->linedata[s->grid->hsize + py].cellsize) + sx = s->grid->linedata[s->grid->hsize + py].cellsize; if (sx > tty->sx) sx = tty->sx; -- cgit