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

Fix two errors with character/line insertion and deletion: the maximum number

Browse Source 
of characters which may be inserted or deleted is the screen width, not one
less (and similarly for lines and height); and if characters or lines are
deleted by moving the ones that follow, the space at the end needs to be
cleared.

This appears to solve long-standing redraw issues most visible when using the
force-width option then scrolling in view(1) or unwrapping lines in emacs.
This commit is contained in:
Nicholas Marriott 2009-06-29 21:30:50 +00:00
parent 003e8e65f7
commit 68e06fb6b7
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
grid-view.c
View File

@ -158,6 +158,7 @@ grid_view_delete_lines(struct grid *gd, u_int py, u_int ny)
sy = grid_view_y(gd, gd->sy); sy = grid_view_y(gd, gd->sy);
grid_move_lines(gd, py, py + ny, sy - py - ny); grid_move_lines(gd, py, py + ny, sy - py - ny);
grid_clear(gd, 0, sy - ny, gd->sx, py + ny - (sy - ny));
} }
/* Delete lines inside scroll region. */ /* Delete lines inside scroll region. */
@ -191,7 +192,7 @@ grid_view_insert_cells(struct grid *gd, u_int px, u_int py, u_int nx)
if (px == sx - 1) if (px == sx - 1)
grid_clear(gd, px, py, 1, 1); grid_clear(gd, px, py, 1, 1);
else else
grid_move_cells(gd, px + nx, px, py, (sx - 1) - (px + nx)); grid_move_cells(gd, px + nx, px, py, sx - px - nx);
} }
/* Delete characters. */ /* Delete characters. */
@ -207,7 +208,8 @@ grid_view_delete_cells(struct grid *gd, u_int px, u_int py, u_int nx)
sx = grid_view_x(gd, gd->sx); sx = grid_view_x(gd, gd->sx);
grid_move_cells(gd, px, px + nx, py, (sx - 1) - (px + nx)); grid_move_cells(gd, px, px + nx, py, sx - px - nx);
grid_clear(gd, sx - nx, py, px + nx - (sx - nx), 1);
} }
/* Convert cells into a string. */ /* Convert cells into a string. */

16
screen-write.c
View File

@ -325,8 +325,8 @@ screen_write_insertcharacter(struct screen_write_ctx *ctx, u_int nx)
if (nx == 0) if (nx == 0)
nx = 1; nx = 1;
if (nx > screen_size_x(s) - 1 - s->cx) if (nx > screen_size_x(s) - s->cx)
nx = screen_size_x(s) - 1 - s->cx; nx = screen_size_x(s) - s->cx;
if (nx == 0) if (nx == 0)
return; return;
@ -347,8 +347,8 @@ screen_write_deletecharacter(struct screen_write_ctx *ctx, u_int nx)
if (nx == 0) if (nx == 0)
nx = 1; nx = 1;
if (nx > screen_size_x(s) - 1 - s->cx) if (nx > screen_size_x(s) - s->cx)
nx = screen_size_x(s) - 1 - s->cx; nx = screen_size_x(s) - s->cx;
if (nx == 0) if (nx == 0)
return; return;
@ -369,8 +369,8 @@ screen_write_insertline(struct screen_write_ctx *ctx, u_int ny)
if (ny == 0) if (ny == 0)
ny = 1; ny = 1;
if (ny > screen_size_y(s) - 1 - s->cy) if (ny > screen_size_y(s) - s->cy)
ny = screen_size_y(s) - 1 - s->cy; ny = screen_size_y(s) - s->cy;
if (ny == 0) if (ny == 0)
return; return;
@ -395,8 +395,8 @@ screen_write_deleteline(struct screen_write_ctx *ctx, u_int ny)
if (ny == 0) if (ny == 0)
ny = 1; ny = 1;
if (ny > screen_size_y(s) - 1 - s->cy) if (ny > screen_size_y(s) - s->cy)
ny = screen_size_y(s) - 1 - s->cy; ny = screen_size_y(s) - s->cy;
if (ny == 0) if (ny == 0)
return; return;