summaryrefslogtreecommitdiffstats
path: root/screen-write.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@openbsd.org>2009-06-29 21:30:50 +0000
committerNicholas Marriott <nicm@openbsd.org>2009-06-29 21:30:50 +0000
commit68e06fb6b76b250b1971867244f33eb809891b1f (patch)
tree4f8278f6ccd1a5ba4533c9cac1b0a5101eec7ec3 /screen-write.c
parent003e8e65f7a3613a3f3004091ad1c57298dbf507 (diff)
Fix two errors with character/line insertion and deletion: the maximum number
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.
Diffstat (limited to 'screen-write.c')
-rw-r--r--screen-write.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/screen-write.c b/screen-write.c
index e3a215ac..d0049c63 100644
--- a/screen-write.c
+++ b/screen-write.c
@@ -325,8 +325,8 @@ screen_write_insertcharacter(struct screen_write_ctx *ctx, u_int nx)
if (nx == 0)
nx = 1;
- if (nx > screen_size_x(s) - 1 - s->cx)
- nx = screen_size_x(s) - 1 - s->cx;
+ if (nx > screen_size_x(s) - s->cx)
+ nx = screen_size_x(s) - s->cx;
if (nx == 0)
return;
@@ -347,8 +347,8 @@ screen_write_deletecharacter(struct screen_write_ctx *ctx, u_int nx)
if (nx == 0)
nx = 1;
- if (nx > screen_size_x(s) - 1 - s->cx)
- nx = screen_size_x(s) - 1 - s->cx;
+ if (nx > screen_size_x(s) - s->cx)
+ nx = screen_size_x(s) - s->cx;
if (nx == 0)
return;
@@ -369,8 +369,8 @@ screen_write_insertline(struct screen_write_ctx *ctx, u_int ny)
if (ny == 0)
ny = 1;
- if (ny > screen_size_y(s) - 1 - s->cy)
- ny = screen_size_y(s) - 1 - s->cy;
+ if (ny > screen_size_y(s) - s->cy)
+ ny = screen_size_y(s) - s->cy;
if (ny == 0)
return;
@@ -395,8 +395,8 @@ screen_write_deleteline(struct screen_write_ctx *ctx, u_int ny)
if (ny == 0)
ny = 1;
- if (ny > screen_size_y(s) - 1 - s->cy)
- ny = screen_size_y(s) - 1 - s->cy;
+ if (ny > screen_size_y(s) - s->cy)
+ ny = screen_size_y(s) - s->cy;
if (ny == 0)
return;