diff --git a/mode-tree.c b/mode-tree.c index 98f29e82..32ae4a33 100644 --- a/mode-tree.c +++ b/mode-tree.c @@ -595,7 +595,7 @@ mode_tree_draw(struct mode_tree_data *mtd) box = mtd->drawcb(mtd->modedata, mti->itemdata, box_x, box_y); if (box != NULL) { screen_write_cursormove(&ctx, 2, h + 1); - screen_write_copy(&ctx, box, 0, 0, box_x, box_y, NULL, NULL); + screen_write_fast_copy(&ctx, box, 0, 0, box_x, box_y); screen_free(box); } diff --git a/screen-write.c b/screen-write.c index f090d6fa..37a51fcb 100644 --- a/screen-write.c +++ b/screen-write.c @@ -351,11 +351,10 @@ screen_write_cnputs(struct screen_write_ctx *ctx, ssize_t maxlen, free(msg); } -/* Copy from another screen. */ +/* Copy from another screen. Assumes target region is big enough. */ void screen_write_copy(struct screen_write_ctx *ctx, struct screen *src, u_int px, - u_int py, u_int nx, u_int ny, bitstr_t *markbs, - const struct grid_cell *markgc) + u_int py, u_int nx, u_int ny, bitstr_t *mbs, const struct grid_cell *mgc) { struct screen *s = ctx->s; struct grid *gd = src->grid; @@ -371,22 +370,52 @@ 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) { + if (mbs != 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; + if (bit_test(mbs, b)) { + gc.attr = mgc->attr; + gc.fg = mgc->fg; + gc.bg = mgc->bg; } } screen_write_cell(ctx, &gc); } - cy++; screen_write_cursormove(ctx, cx, cy); } } +/* + * Copy from another screen but without the selection stuff. Also assumes the + * target region is already big enough and already cleared. + */ +void +screen_write_fast_copy(struct screen_write_ctx *ctx, struct screen *src, + u_int px, u_int py, u_int nx, u_int ny) +{ + struct screen *s = ctx->s; + struct grid *gd = src->grid; + struct grid_cell gc; + u_int xx, yy, cx, cy; + + if (nx == 0 || ny == 0) + return; + + cy = s->cy; + for (yy = py; yy < py + ny; yy++) { + cx = s->cx; + for (xx = px; xx < px + nx; xx++) { + if (xx >= gd->linedata[yy].cellsize) + break; + grid_get_cell(gd, xx, yy, &gc); + if (!grid_cells_equal(&gc, &grid_default_cell)) + grid_view_set_cell(ctx->s->grid, cx, cy, &gc); + cx++; + } + cy++; + } +} + /* Draw a horizontal line on screen. */ void screen_write_hline(struct screen_write_ctx *ctx, u_int nx, int left, int right) @@ -471,7 +500,10 @@ screen_write_box(struct screen_write_ctx *ctx, u_int nx, u_int ny) screen_write_cursormove(ctx, cx, cy); } -/* Write a preview version of a window. */ +/* + * Write a preview version of a window. Assumes target area is big enough and + * already cleared. + */ void screen_write_preview(struct screen_write_ctx *ctx, struct screen *src, u_int nx, u_int ny) @@ -515,8 +547,7 @@ screen_write_preview(struct screen_write_ctx *ctx, struct screen *src, u_int nx, py = 0; } - screen_write_copy(ctx, src, px, src->grid->hsize + py, nx, ny, NULL, - NULL); + screen_write_fast_copy(ctx, src, px, src->grid->hsize + py, nx, ny); if (src->mode & MODE_CURSOR) { grid_view_get_cell(src->grid, src->cx, src->cy, &gc); diff --git a/status.c b/status.c index b24fc2eb..60faa42d 100644 --- a/status.c +++ b/status.c @@ -508,8 +508,7 @@ draw: /* Copy the window list. */ c->wlmouse = -wloffset + wlstart; screen_write_cursormove(&ctx, wloffset, 0); - screen_write_copy(&ctx, &window_list, wlstart, 0, wlwidth, 1, NULL, - NULL); + screen_write_fast_copy(&ctx, &window_list, wlstart, 0, wlwidth, 1); screen_free(&window_list); screen_write_stop(&ctx); diff --git a/tmux.h b/tmux.h index 974a0678..62e88248 100644 --- a/tmux.h +++ b/tmux.h @@ -2037,6 +2037,8 @@ void screen_write_putc(struct screen_write_ctx *, const struct grid_cell *, u_char); void screen_write_copy(struct screen_write_ctx *, struct screen *, u_int, u_int, u_int, u_int, bitstr_t *, const struct grid_cell *); +void screen_write_fast_copy(struct screen_write_ctx *, struct screen *, + u_int, u_int, u_int, u_int); void screen_write_hline(struct screen_write_ctx *, u_int, int, int); void screen_write_vline(struct screen_write_ctx *, u_int, int, int); void screen_write_box(struct screen_write_ctx *, u_int, u_int); diff --git a/window-client.c b/window-client.c index 4b57aa23..fc5b55e7 100644 --- a/window-client.c +++ b/window-client.c @@ -235,9 +235,9 @@ window_client_draw(__unused void *modedata, void *itemdata, u_int sx, u_int sy) screen_write_cursormove(&ctx, 0, sy - 1); if (c->old_status != NULL) - screen_write_copy(&ctx, c->old_status, 0, 0, sx, 1, NULL, NULL); + screen_write_fast_copy(&ctx, c->old_status, 0, 0, sx, 1); else - screen_write_copy(&ctx, &c->status, 0, 0, sx, 1, NULL, NULL); + screen_write_fast_copy(&ctx, &c->status, 0, 0, sx, 1); screen_write_stop(&ctx); return (&s);