mirror of
https://github.com/tmux/tmux.git
synced 2026-05-31 06:36:18 +00:00
Merge branch 'floating_panes' into floating_panes_staging
This commit is contained in:
@@ -644,16 +644,19 @@ screen_write_fast_copy(struct screen_write_ctx *ctx, struct screen *src,
|
|||||||
sgl = grid_get_line(s->grid, s->cy);
|
sgl = grid_get_line(s->grid, s->cy);
|
||||||
if (xx >= gl->cellsize && s->cx >= sgl->cellsize)
|
if (xx >= gl->cellsize && s->cx >= sgl->cellsize)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
grid_get_cell(gd, xx, yy, &gc);
|
grid_get_cell(gd, xx, yy, &gc);
|
||||||
if (xx + gc.data.width > px + nx)
|
if (xx + gc.data.width > px + nx)
|
||||||
break;
|
break;
|
||||||
grid_view_set_cell(s->grid, s->cx, s->cy, &gc);
|
grid_view_set_cell(s->grid, s->cx, s->cy, &gc);
|
||||||
|
|
||||||
if (!screen_redraw_is_visible(r, px))
|
if (!screen_redraw_is_visible(r, px))
|
||||||
break;
|
break;
|
||||||
ttyctx.cell = &gc;
|
ttyctx.cell = &gc;
|
||||||
ttyctx.flags &= (TTY_CTX_OVERLAY_SYNC|TTY_CTX_SYNC);
|
ttyctx.flags &= (TTY_CTX_OVERLAY_SYNC|TTY_CTX_SYNC);
|
||||||
tty_write(tty_cmd_cell, &ttyctx);
|
tty_write(tty_cmd_cell, &ttyctx);
|
||||||
ttyctx.ocx++;
|
ttyctx.ocx++;
|
||||||
|
|
||||||
s->cx++;
|
s->cx++;
|
||||||
}
|
}
|
||||||
s->cy++;
|
s->cy++;
|
||||||
|
|||||||
Reference in New Issue
Block a user