mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-03-10 05:33:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

scrollback: fix off-by-one when grid size matches terminal/window size

Browse source
This commit is contained in:
Daniel Eklöf 2019-07-10 09:55:53 +02:00
parent 1bb5afeb0a
commit 18c61a9a2a
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
commands.c
View file

@ -30,13 +30,13 @@ cmd_scrollback_up(struct terminal *term, int rows)
new_view = (new_view + 1) % term->grid->num_rows; new_view = (new_view + 1) % term->grid->num_rows;
/* Don't scroll past scrollback history */ /* 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) { if (end >= term->grid->offset) {
/* Not wrapped */ /* Not wrapped */
if (new_view >= term->grid->offset && new_view < end) if (new_view >= term->grid->offset && new_view <= end)
new_view = end; new_view = end;
} else { } else {
if (new_view >= term->grid->offset || new_view < end) if (new_view >= term->grid->offset || new_view <= end)
new_view = end; new_view = end;
} }
@ -85,13 +85,13 @@ cmd_scrollback_down(struct terminal *term, int rows)
} while (!all_initialized); } while (!all_initialized);
/* Don't scroll past scrollback history */ /* 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) { if (end >= term->grid->offset) {
/* Not wrapped */ /* 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; new_view = term->grid->offset;
} else { } else {
if (new_view >= term->grid->offset || new_view < end) if (new_view >= term->grid->offset || new_view <= end)
new_view = term->grid->offset; new_view = term->grid->offset;
} }