mirror of
https://github.com/tmux/tmux.git
synced 2025-09-03 06:17:04 +00:00
Change inserting and deleting lines inside the scroll region to properly clear
lines that should be inserted/deleted but not moved. Fixes problems with mutt reported by Brian Lewis, thanks.
This commit is contained in:
@ -1,4 +1,4 @@
|
||||
/* $Id: screen-write.c,v 1.57 2009-07-09 18:04:17 nicm Exp $ */
|
||||
/* $Id: screen-write.c,v 1.58 2009-07-09 18:04:53 nicm Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
|
||||
@ -369,11 +369,25 @@ screen_write_insertline(struct screen_write_ctx *ctx, u_int ny)
|
||||
if (ny == 0)
|
||||
ny = 1;
|
||||
|
||||
if (ny > screen_size_y(s) - s->cy)
|
||||
ny = screen_size_y(s) - s->cy;
|
||||
if (s->cy < s->rupper || s->cy > s->rlower) {
|
||||
if (ny > screen_size_y(s) - s->cy)
|
||||
ny = screen_size_y(s) - s->cy;
|
||||
if (ny == 0)
|
||||
return;
|
||||
|
||||
screen_write_save(ctx);
|
||||
|
||||
grid_view_insert_lines(s->grid, s->cy, ny);
|
||||
|
||||
tty_write_cmd(ctx->wp, TTY_INSERTLINE, ny);
|
||||
return;
|
||||
}
|
||||
|
||||
if (ny > s->rlower + 1 - s->cy)
|
||||
ny = s->rlower + 1 - s->cy;
|
||||
if (ny == 0)
|
||||
return;
|
||||
|
||||
|
||||
screen_write_save(ctx);
|
||||
|
||||
if (s->cy < s->rupper || s->cy > s->rlower)
|
||||
@ -393,8 +407,22 @@ screen_write_deleteline(struct screen_write_ctx *ctx, u_int ny)
|
||||
if (ny == 0)
|
||||
ny = 1;
|
||||
|
||||
if (ny > screen_size_y(s) - s->cy)
|
||||
ny = screen_size_y(s) - s->cy;
|
||||
if (s->cy < s->rupper || s->cy > s->rlower) {
|
||||
if (ny > screen_size_y(s) - s->cy)
|
||||
ny = screen_size_y(s) - s->cy;
|
||||
if (ny == 0)
|
||||
return;
|
||||
|
||||
screen_write_save(ctx);
|
||||
|
||||
grid_view_delete_lines(s->grid, s->cy, ny);
|
||||
|
||||
tty_write_cmd(ctx->wp, TTY_DELETELINE, ny);
|
||||
return;
|
||||
}
|
||||
|
||||
if (ny > s->rlower + 1 - s->cy)
|
||||
ny = s->rlower + 1 - s->cy;
|
||||
if (ny == 0)
|
||||
return;
|
||||
|
||||
|
Reference in New Issue
Block a user