diff options
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/tmux/grid-view.c | 14 | ||||
| -rw-r--r-- | usr.bin/tmux/screen-write.c | 14 | ||||
| -rw-r--r-- | usr.bin/tmux/tmux.h | 8 |
3 files changed, 13 insertions, 23 deletions
diff --git a/usr.bin/tmux/grid-view.c b/usr.bin/tmux/grid-view.c index 8e6c1dc0354..4475c9bffd9 100644 --- a/usr.bin/tmux/grid-view.c +++ b/usr.bin/tmux/grid-view.c @@ -1,4 +1,4 @@ -/* $OpenBSD: grid-view.c,v 1.3 2009/06/29 21:30:50 nicm Exp $ */ +/* $OpenBSD: grid-view.c,v 1.4 2009/07/09 00:29:32 nicm Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net> @@ -132,11 +132,9 @@ grid_view_insert_lines(struct grid *gd, u_int py, u_int ny) /* Insert lines in region. */ void -grid_view_insert_lines_region( - struct grid *gd, unused u_int rupper, u_int rlower, u_int py, u_int ny) +grid_view_insert_lines_region(struct grid *gd, u_int rlower, u_int py, u_int ny) { - GRID_DEBUG( - gd, "rupper=%u, rlower=%u, py=%u, ny=%u", rupper, rlower, py, ny); + GRID_DEBUG(gd, "rlower=%u, py=%u, ny=%u", rlower, py, ny); rlower = grid_view_y(gd, rlower); @@ -163,11 +161,9 @@ grid_view_delete_lines(struct grid *gd, u_int py, u_int ny) /* Delete lines inside scroll region. */ void -grid_view_delete_lines_region( - struct grid *gd, unused u_int rupper, u_int rlower, u_int py, u_int ny) +grid_view_delete_lines_region(struct grid *gd, u_int rlower, u_int py, u_int ny) { - GRID_DEBUG( - gd, "rupper=%u, rlower=%u, py=%u, ny=%u", rupper, rlower, py, ny); + GRID_DEBUG(gd, "rlower=%u, py=%u, ny=%u", rlower, py, ny); rlower = grid_view_y(gd, rlower); diff --git a/usr.bin/tmux/screen-write.c b/usr.bin/tmux/screen-write.c index ad37cb099a8..6796e422f7d 100644 --- a/usr.bin/tmux/screen-write.c +++ b/usr.bin/tmux/screen-write.c @@ -1,4 +1,4 @@ -/* $OpenBSD: screen-write.c,v 1.9 2009/06/29 21:30:50 nicm Exp $ */ +/* $OpenBSD: screen-write.c,v 1.10 2009/07/09 00:29:32 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -378,10 +378,8 @@ screen_write_insertline(struct screen_write_ctx *ctx, u_int ny) if (s->cy < s->rupper || s->cy > s->rlower) grid_view_insert_lines(s->grid, s->cy, ny); - else { - grid_view_insert_lines_region( - s->grid, s->rupper, s->rlower, s->cy, ny); - } + else + grid_view_insert_lines_region(s->grid, s->rlower, s->cy, ny); tty_write_cmd(ctx->wp, TTY_INSERTLINE, ny); } @@ -404,10 +402,8 @@ screen_write_deleteline(struct screen_write_ctx *ctx, u_int ny) if (s->cy < s->rupper || s->cy > s->rlower) grid_view_delete_lines(s->grid, s->cy, ny); - else { - grid_view_delete_lines_region( - s->grid, s->rupper, s->rlower, s->cy, ny); - } + else + grid_view_delete_lines_region(s->grid, s->rlower, s->cy, ny); tty_write_cmd(ctx->wp, TTY_DELETELINE, ny); } diff --git a/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h index 44e74d552d6..e397b2ae4d0 100644 --- a/usr.bin/tmux/tmux.h +++ b/usr.bin/tmux/tmux.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tmux.h,v 1.17 2009/07/08 05:26:45 nicm Exp $ */ +/* $OpenBSD: tmux.h,v 1.18 2009/07/09 00:29:32 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -1337,11 +1337,9 @@ void grid_view_clear(struct grid *, u_int, u_int, u_int, u_int); void grid_view_scroll_region_up(struct grid *, u_int, u_int); void grid_view_scroll_region_down(struct grid *, u_int, u_int); void grid_view_insert_lines(struct grid *, u_int, u_int); -void grid_view_insert_lines_region( - struct grid *, u_int, u_int, u_int, u_int); +void grid_view_insert_lines_region(struct grid *, u_int, u_int, u_int); void grid_view_delete_lines(struct grid *, u_int, u_int); -void grid_view_delete_lines_region( - struct grid *, u_int, u_int, u_int, u_int); +void grid_view_delete_lines_region(struct grid *, u_int, u_int, u_int); void grid_view_insert_cells(struct grid *, u_int, u_int, u_int); void grid_view_delete_cells(struct grid *, u_int, u_int, u_int); char *grid_view_string_cells(struct grid *, u_int, u_int, u_int); |