From 002d38cb6b1bc6838389bbad24d791c1b119e11c Mon Sep 17 00:00:00 2001
From: Michael Grant <mgrant@grant.org>
Date: Fri, 7 Aug 2026 09:27:20 +0100
Subject: [PATCH] Revert "Clear text beneath graphical images"

This reverts commit fb589fd9f92d23e97dbaf59149b0a41d7862c78c.
---
 tty-draw.c | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/tty-draw.c b/tty-draw.c
index 5dd6fc0db..6e815cb54 100644
--- a/tty-draw.c
+++ b/tty-draw.c
@@ -29,6 +29,7 @@ enum tty_draw_line_state {
 	TTY_DRAW_LINE_NEW1,
 	TTY_DRAW_LINE_NEW2,
 	TTY_DRAW_LINE_EMPTY,
+	TTY_DRAW_LINE_IMAGE,
 	TTY_DRAW_LINE_SAME,
 	TTY_DRAW_LINE_DONE
 };
@@ -38,6 +39,7 @@ static const char* tty_draw_line_states[] = {
 	"NEW1",
 	"NEW2",
 	"EMPTY",
+	"IMAGE",
 	"SAME",
 	"DONE"
 };
@@ -130,7 +132,7 @@ tty_draw_line(struct tty *tty, struct screen *s, u_int px, u_int py, u_int nx,
 	struct grid_line	*gl;
 	u_int			 i, j, last_i, cx, ex, width;
 	u_int			 cellsize, bg;
-	int			 flags, empty, wrapped = 0;
+	int			 flags, empty, skip, wrapped = 0;
 	char			 buf[1000];
 	size_t			 len;
 	enum tty_draw_line_state current_state, next_state;
@@ -235,6 +237,8 @@ tty_draw_line(struct tty *tty, struct screen *s, u_int px, u_int py, u_int nx,
 	width = 0;
 	current_state = TTY_DRAW_LINE_FIRST;
 	for (;;) {
+		skip = 0;
+
 		/* Work out the next state. */
 		if (i == nx) {
 			/*
@@ -265,13 +269,17 @@ tty_draw_line(struct tty *tty, struct screen *s, u_int px, u_int py, u_int nx,
 						memcpy(&image_gc, &gc,
 						    sizeof image_gc);
 						utf8_set(&image_gc.data, ' ');
-						image_gc.flags &= ~(GRID_FLAG_IMAGE|
-						    GRID_FLAG_SELECTED);
+						image_gc.flags &=
+						    ~GRID_FLAG_IMAGE;
+						skip = 1;
 					} else {
 						image_get_fallback_cell(tty, im,
 						    gc.image_x, gc.image_y, &gc,
 						    &image_gc, style_ctx);
 					}
+					if (skip)
+						image_gc.flags &=
+						    ~GRID_FLAG_SELECTED;
 					gcp = &image_gc;
 				} else
 					gcp = &gc;
@@ -280,8 +288,12 @@ tty_draw_line(struct tty *tty, struct screen *s, u_int px, u_int py, u_int nx,
 #endif
 
 				/* Work out empty cells. */
-				empty = tty_draw_line_get_empty(gcp, &last, nx - i);
-				if (empty != 0)
+				if (skip)
+					empty = 0;
+				else
+					empty = tty_draw_line_get_empty(gcp,
+					    &last, nx - i);
+				if (empty != 0 || skip)
 					;
 				else {
 					/* Update for codeset if needed. */
@@ -298,7 +310,9 @@ tty_draw_line(struct tty *tty, struct screen *s, u_int px, u_int py, u_int nx,
 			}
 
 			/* Work out the next state. */
-			if (empty != 0)
+			if (skip)
+				next_state = TTY_DRAW_LINE_IMAGE;
+			else if (empty != 0)
 				next_state = TTY_DRAW_LINE_EMPTY;
 			else if (current_state == TTY_DRAW_LINE_FIRST)
 				next_state = TTY_DRAW_LINE_SAME;
@@ -345,7 +359,8 @@ tty_draw_line(struct tty *tty, struct screen *s, u_int px, u_int py, u_int nx,
 		}
 
 		/* Append the cell if it is not empty and not padding. */
-		if (next_state != TTY_DRAW_LINE_EMPTY) {
+		if (next_state != TTY_DRAW_LINE_EMPTY &&
+		    next_state != TTY_DRAW_LINE_IMAGE) {
 			memcpy(buf + len, gcp->data.data, gcp->data.size);
 			len += gcp->data.size;
 			width += gcp->data.width;