Merge branch 'obsd-master'

screen-write.c

@@ -27,6 +27,8 @@ static struct screen_write_citem *screen_write_collect_trim(
 		    struct screen_write_ctx *, u_int, u_int, u_int, int *);
 static void	screen_write_collect_insert(struct screen_write_ctx *,
 		    struct screen_write_citem *);
+static void	screen_write_collect_insert_clear(struct screen_write_ctx *,
+		    u_int, u_int, u_int);
 static void	screen_write_collect_clear(struct screen_write_ctx *, u_int,
 		    u_int);
 static void	screen_write_collect_scroll(struct screen_write_ctx *, u_int);
@@ -187,6 +189,14 @@ screen_write_pane_is_obscured(struct screen_write_ctx *ctx)
 	}
 	ctx->flags |= SCREEN_WRITE_CHECKED_IF_OBSCURED;
 
+	if (ctx->wp->xoff < 0 ||
+	    ctx->wp->yoff < 0 ||
+	    ctx->wp->xoff + ctx->wp->sx >= ctx->wp->window->sx ||
+	    ctx->wp->yoff + ctx->wp->sy >= ctx->wp->window->sy) {
+		ctx->flags |= SCREEN_WRITE_OBSCURED;
+		return (1);
+	}
+
 	while ((wp = TAILQ_PREV(wp, window_panes, zentry)) != NULL) {
 		if ((wp->flags & PANE_FLOATING) &&
 		    ((wp->yoff >= ctx->wp->yoff &&
@@ -1716,6 +1726,9 @@ screen_write_clearendofscreen(struct screen_write_ctx *ctx, u_int bg)
 	struct grid		*gd = s->grid;
 	struct tty_ctx		 ttyctx;
 	u_int			 sx = screen_size_x(s), sy = screen_size_y(s);
+	u_int			 y, i, xoff, yoff, ocx, ocy;
+	struct visible_ranges	*r;
+	struct visible_range	*ri;
 
 #ifdef ENABLE_SIXEL
 	if (image_check_line(s, s->cy, sy - s->cy) && ctx->wp != NULL)
@@ -1740,7 +1753,50 @@ screen_write_clearendofscreen(struct screen_write_ctx *ctx, u_int bg)
 
 	screen_write_collect_clear(ctx, s->cy + 1, sy - (s->cy + 1));
 	screen_write_collect_flush(ctx, 0, __func__);
+
+	if (~ttyctx.flags & TTY_CTX_PANE_OBSCURED) {
 		tty_write(tty_cmd_clearendofscreen, &ttyctx);
+		return;
+	}
+
+	/* Can't just clear screen, must avoid floating windows. */
+	ocx = s->cx;
+	ocy = s->cy;
+	if (ctx->wp != NULL) {
+		xoff = ctx->wp->xoff;
+		yoff = ctx->wp->yoff;
+	} else {
+		xoff = 0;
+		yoff = 0;
+	}
+
+	/* First line (containing the cursor). */
+	if (s->cx <= sx - 1) {
+		r = screen_redraw_get_visible_ranges(ctx->wp, xoff + s->cx,
+		    yoff + s->cy, sx - s->cx, NULL);
+		for (i = 0; i < r->used; i++) {
+			ri = &r->ranges[i];
+			if (ri->nx == 0)
+				continue;
+			screen_write_collect_insert_clear(ctx, ri->px - xoff,
+			    ri->nx, bg);
+		}
+	}
+
+	/* Below cursor to bottom. */
+	for (y = s->cy + 1; y < sy; y++) {
+		screen_write_set_cursor(ctx, 0, y);
+		r = screen_redraw_get_visible_ranges(ctx->wp, xoff, yoff + y,
+		    sx, NULL);
+		for (i = 0; i < r->used; i++) {
+			ri = &r->ranges[i];
+			if (ri->nx == 0)
+				continue;
+			screen_write_collect_insert_clear(ctx, ri->px - xoff,
+			    ri->nx, bg);
+		}
+	}
+	screen_write_set_cursor(ctx, ocx, ocy);
 }
 
 /* Clear to start of screen. */
@@ -1750,6 +1806,9 @@ screen_write_clearstartofscreen(struct screen_write_ctx *ctx, u_int bg)
 	struct screen		*s = ctx->s;
 	struct tty_ctx		 ttyctx;
 	u_int			 sx = screen_size_x(s);
+	u_int			 y, i, xoff, yoff, ocx, ocy;
+	struct visible_ranges	*r;
+	struct visible_range	*ri;
 
 #ifdef ENABLE_SIXEL
 	if (image_check_line(s, 0, s->cy - 1) && ctx->wp != NULL)
@@ -1768,7 +1827,49 @@ screen_write_clearstartofscreen(struct screen_write_ctx *ctx, u_int bg)
 
 	screen_write_collect_clear(ctx, 0, s->cy);
 	screen_write_collect_flush(ctx, 0, __func__);
+
+	if (~ttyctx.flags & TTY_CTX_PANE_OBSCURED) {
 		tty_write(tty_cmd_clearstartofscreen, &ttyctx);
+		return;
+	}
+
+	/* Can't just clear screen, must avoid floating windows. */
+	ocx = s->cx;
+	ocy = s->cy;
+	if (ctx->wp != NULL) {
+		xoff = ctx->wp->xoff;
+		yoff = ctx->wp->yoff;
+	} else {
+		xoff = 0;
+		yoff = 0;
+	}
+
+	/* Top to above the cursor. */
+	for (y = 0; y < s->cy; y++) {
+		screen_write_set_cursor(ctx, 0, y);
+		r = screen_redraw_get_visible_ranges(ctx->wp, xoff, yoff + y,
+		    sx, NULL);
+		for (i = 0; i < r->used; i++) {
+			ri = &r->ranges[i];
+			if (ri->nx == 0)
+				continue;
+			screen_write_collect_insert_clear(ctx, ri->px - xoff,
+			    ri->nx, bg);
+		}
+	}
+
+	/* Last line (containing the cursor). */
+	screen_write_set_cursor(ctx, 0, s->cy);
+	r = screen_redraw_get_visible_ranges(ctx->wp, xoff, yoff + ocy,
+	    s->cx + 1, NULL);
+	for (i = 0; i < r->used; i++) {
+		ri = &r->ranges[i];
+		if (ri->nx == 0)
+			continue;
+		screen_write_collect_insert_clear(ctx, ri->px - xoff, ri->nx,
+		    bg);
+	}
+	screen_write_set_cursor(ctx, ocx, ocy);
 }
 
 /* Clear entire screen. */
@@ -1778,6 +1879,9 @@ screen_write_clearscreen(struct screen_write_ctx *ctx, u_int bg)
 	struct screen		*s = ctx->s;
 	struct tty_ctx		 ttyctx;
 	u_int			 sx = screen_size_x(s), sy = screen_size_y(s);
+	u_int			 y, i, xoff, yoff, ocx, ocy;
+	struct visible_ranges	*r;
+	struct visible_range	*ri;
 
 #ifdef ENABLE_SIXEL
 	if (image_free_all(s) && ctx->wp != NULL)
@@ -1796,7 +1900,37 @@ screen_write_clearscreen(struct screen_write_ctx *ctx, u_int bg)
 		grid_view_clear(s->grid, 0, 0, sx, sy, bg);
 
 	screen_write_collect_clear(ctx, 0, sy);
+
+	if (~ttyctx.flags & TTY_CTX_PANE_OBSCURED) {
 		tty_write(tty_cmd_clearscreen, &ttyctx);
+		return;
+	}
+
+	/* Can't just clear screen, must avoid floating windows. */
+	ocx = s->cx;
+	ocy = s->cy;
+	if (ctx->wp != NULL) {
+		xoff = ctx->wp->xoff;
+		yoff = ctx->wp->yoff;
+	} else {
+		xoff = 0;
+		yoff = 0;
+	}
+
+	/* Clear every line. */
+	for (y = 0; y < sy; y++) {
+		screen_write_set_cursor(ctx, 0, y);
+		r = screen_redraw_get_visible_ranges(ctx->wp, xoff, yoff + y,
+		    sx, NULL);
+		for (i = 0; i < r->used; i++) {
+			ri = &r->ranges[i];
+			if (ri->nx == 0)
+				continue;
+			screen_write_collect_insert_clear(ctx, ri->px - xoff,
+			    ri->nx, bg);
+		}
+	}
+	screen_write_set_cursor(ctx, ocx, ocy);
 }
 
 /* Clear entire history. */
@@ -2039,7 +2173,7 @@ discard:
 }
 
 /* Insert an item on current line. */
-void
+static void
 screen_write_collect_insert(struct screen_write_ctx *ctx,
     struct screen_write_citem *ci)
 {
@@ -2056,6 +2190,22 @@ screen_write_collect_insert(struct screen_write_ctx *ctx,
 	ctx->item = screen_write_get_citem();
 }
 
+/* Insert a clear for part of a line. */
+static void
+screen_write_collect_insert_clear(struct screen_write_ctx *ctx, u_int px,
+    u_int nx, u_int bg)
+{
+	struct screen_write_citem	*ci = ctx->item;
+
+	if (nx != 0) {
+		ci->x = px;
+		ci->used = nx;
+		ci->type = CLEAR;
+		ci->bg = bg;
+		screen_write_collect_insert(ctx, ci);
+	}
+}
+
 /* Finish and store collected cells. */
 void
 screen_write_collect_end(struct screen_write_ctx *ctx)