From e2a18e2b371de4bdd689dd32eee31d8a2697df4c Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Fri, 12 May 2017 14:56:56 +0000
Subject: Need to store bg for ECH.

---
 screen-write.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/screen-write.c b/screen-write.c
index 894da4b7..1af623b1 100644
--- a/screen-write.c
+++ b/screen-write.c
@@ -630,7 +630,7 @@ screen_write_clearcharacter(struct screen_write_ctx *ctx, u_int nx, u_int bg)
 	screen_write_initctx(ctx, &ttyctx);
 	ttyctx.bg = bg;
 
-	grid_view_clear(s->grid, s->cx, s->cy, nx, 1, 8);
+	grid_view_clear(s->grid, s->cx, s->cy, nx, 1, bg);
 
 	screen_write_collect_flush(ctx, 0);
 	ttyctx.num = nx;
-- 
cgit 


From 0cd74723e1e3c7152323c700eba6cf4ce83f46e4 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Fri, 12 May 2017 15:18:13 +0000
Subject: When expanding a line in order to clear it, we need to use the
 default background colour - there may be portions that we do not want to
 clear with the new background colour.

---
 grid.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grid.c b/grid.c
index 4f728dbe..3b03df75 100644
--- a/grid.c
+++ b/grid.c
@@ -472,7 +472,7 @@ grid_clear(struct grid *gd, u_int px, u_int py, u_int nx, u_int ny, u_int bg)
 			gd->linedata[yy].cellsize = px;
 			continue;
 		}
-		grid_expand_line(gd, yy, px + nx, bg);
+		grid_expand_line(gd, yy, px + nx, 8); /* default bg first */
 		for (xx = px; xx < px + nx; xx++)
 			grid_clear_cell(gd, xx, yy, bg);
 	}
-- 
cgit