circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-12-13 01:48:47 +00:00
Code Issues Projects Releases Wiki Activity

screen_write_copy tried to be clever and clear the line if it reached

Browse Source 
the end of the source, but it was wrong and causes problems that are
only showing up now we are more aggressive about skipping redundant
screen updates. Remove the optimization entirely as more trouble than it
is worth to fix (and it'll have to go when BCE is done anyway).
This commit is contained in:
nicm 2016-10-05 22:00:29 +00:00
parent f55c991a1b
commit 30086e504c
1 changed files with 7 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
screen-write.c
View File

@ -394,38 +394,18 @@ screen_write_copy(struct screen_write_ctx *ctx, struct screen *src, u_int px,
{ {
struct screen *s = ctx->s; struct screen *s = ctx->s;
struct grid *gd = src->grid; struct grid *gd = src->grid;
struct grid_line *gl;
struct grid_cell gc; struct grid_cell gc;
u_int xx, yy, cx, cy, ax, bx; u_int xx, yy, cx, cy;
cx = s->cx; cx = s->cx;
cy = s->cy; cy = s->cy;
for (yy = py; yy < py + ny; yy++) {
gl = &gd->linedata[yy];
if (yy < gd->hsize + gd->sy) {
/*
* Find start and end position and copy between
* them. Limit to the real end of the line then use a
* clear EOL only if copying to the end, otherwise
* could overwrite whatever is there already.
*/
if (px > gl->cellsize)
ax = gl->cellsize;
else
ax = px;
if (px + nx == gd->sx && px + nx > gl->cellsize)
bx = gl->cellsize;
else
bx = px + nx;
for (xx = ax; xx < bx; xx++) { for (yy = py; yy < py + ny; yy++) {
grid_get_cell(gd, xx, yy, &gc); for (xx = px; xx < px + nx; xx++) {
screen_write_cell(ctx, &gc); grid_get_cell(gd, xx, yy, &gc);
} screen_write_cell(ctx, &gc);
if (px + nx == gd->sx && px + nx > gl->cellsize) }
screen_write_clearendofline(ctx);
} else
screen_write_clearline(ctx);
cy++; cy++;
screen_write_cursormove(ctx, cx, cy); screen_write_cursormove(ctx, cx, cy);
} }