aboutsummaryrefslogtreecommitdiff
path: root/commands.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2019-07-10 07:55:53 +0000
committerDaniel Eklöf <daniel@ekloef.se>2019-07-10 07:55:53 +0000
commit18c61a9a2abddf1688fcbe6ac2c63d7faffcf7f2 (patch)
tree6a20dee6ec1952f526c58a61dbbe4af3eaf7d013 /commands.c
parentrender: don't render cursor if it is not in view (diff)
scrollback: fix off-by-one when grid size matches terminal/window size
Diffstat (limited to 'commands.c')
-rw-r--r--commands.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/commands.c b/commands.c
index f66609cb..006e537c 100644
--- a/commands.c
+++ b/commands.c
@@ -30,13 +30,13 @@ cmd_scrollback_up(struct terminal *term, int rows)
new_view = (new_view + 1) % term->grid->num_rows;
/* Don't scroll past scrollback history */
- int end = (term->grid->offset + term->rows) % term->grid->num_rows;
+ int end = (term->grid->offset + term->rows - 1) % term->grid->num_rows;
if (end >= term->grid->offset) {
/* Not wrapped */
- if (new_view >= term->grid->offset && new_view < end)
+ if (new_view >= term->grid->offset && new_view <= end)
new_view = end;
} else {
- if (new_view >= term->grid->offset || new_view < end)
+ if (new_view >= term->grid->offset || new_view <= end)
new_view = end;
}
@@ -85,13 +85,13 @@ cmd_scrollback_down(struct terminal *term, int rows)
} while (!all_initialized);
/* Don't scroll past scrollback history */
- int end = (term->grid->offset + term->rows) % term->grid->num_rows;
+ int end = (term->grid->offset + term->rows - 1) % term->grid->num_rows;
if (end >= term->grid->offset) {
/* Not wrapped */
- if (new_view >= term->grid->offset && new_view < end)
+ if (new_view >= term->grid->offset && new_view <= end)
new_view = term->grid->offset;
} else {
- if (new_view >= term->grid->offset || new_view < end)
+ if (new_view >= term->grid->offset || new_view <= end)
new_view = term->grid->offset;
}