From 2fae6a57618e1cef47b65e73504d7d5570ca6a8e Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Wed, 4 Jul 2018 09:44:07 +0000
Subject: Add accessors for grid linedata member, for some future work. From
 Dan Aloni.

---
 tty.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'tty.c')

diff --git a/tty.c b/tty.c
index e8ab4714..4d543537 100644
--- a/tty.c
+++ b/tty.c
@@ -913,6 +913,7 @@ tty_draw_line(struct tty *tty, const struct window_pane *wp,
 	int			 flags, cleared = 0;
 	char			 buf[512];
 	size_t			 len, old_len;
+	u_int			 cellsize;
 
 	flags = (tty->flags & TTY_NOCURSOR);
 	tty->flags |= TTY_NOCURSOR;
@@ -926,15 +927,17 @@ tty_draw_line(struct tty *tty, const struct window_pane *wp,
 	 * there may be empty background cells after it (from BCE).
 	 */
 	sx = screen_size_x(s);
-	if (sx > gd->linedata[gd->hsize + py].cellsize)
-		sx = gd->linedata[gd->hsize + py].cellsize;
+
+	cellsize = grid_get_line(gd, gd->hsize + py)->cellsize;
+	if (sx > cellsize)
+		sx = cellsize;
 	if (sx > tty->sx)
 		sx = tty->sx;
 	ux = 0;
 
 	if (wp == NULL ||
 	    py == 0 ||
-	    (~gd->linedata[gd->hsize + py - 1].flags & GRID_LINE_WRAPPED) ||
+	    (~grid_get_line(gd, gd->hsize + py - 1)->flags & GRID_LINE_WRAPPED) ||
 	    ox != 0 ||
 	    tty->cx < tty->sx ||
 	    screen_size_x(s) < tty->sx) {
-- 
cgit