Highlight all occurrences of search string after searching in copy mode.

1 files changed, 11 insertions, 2 deletions

diff --git a/screen-write.c b/screen-write.c
index e8593cf1..0fe23df8 100644
--- a/screen-write.c
+++ b/screen-write.c
@@ -392,12 +392,13 @@ screen_write_cnputs(struct screen_write_ctx *ctx, ssize_t maxlen,
 /* Copy from another screen. */
 void
 screen_write_copy(struct screen_write_ctx *ctx, struct screen *src, u_int px,
-    u_int py, u_int nx, u_int ny)
+    u_int py, u_int nx, u_int ny, bitstr_t *markbs,
+    const struct grid_cell *markgc)
 {
 	struct screen		*s = ctx->s;
 	struct grid		*gd = src->grid;
 	struct grid_cell	 gc;
-	u_int		 	 xx, yy, cx, cy;
+	u_int		 	 xx, yy, cx, cy, b;
 
 	cx = s->cx;
 	cy = s->cy;
@@ -405,6 +406,14 @@ screen_write_copy(struct screen_write_ctx *ctx, struct screen *src, u_int px,
 	for (yy = py; yy < py + ny; yy++) {
 		for (xx = px; xx < px + nx; xx++) {
 			grid_get_cell(gd, xx, yy, &gc);
+			if (markbs != NULL) {
+				b = (yy * screen_size_x(src)) + xx;
+				if (bit_test(markbs, b)) {
+					gc.attr = markgc->attr;
+					gc.fg = markgc->fg;
+					gc.bg = markgc->bg;
+				}
+			}
 			screen_write_cell(ctx, &gc);
 		}