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

term: scrolling: calling function must clamp scroll amount

Browse source
This commit is contained in:
Daniel Eklöf 2020-05-19 18:47:38 +02:00
parent dea36de7e3
commit 550667a9ea
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
csi.c
View file

@ -650,13 +650,21 @@ csi_dispatch(struct terminal *term, uint8_t final)
break; break;
} }
case 'S': case 'S': {
term_scroll(term, vt_param_get(term, 0, 1)); int amount = min(
vt_param_get(term, 0, 1),
term->scroll_region.end - term->scroll_region.start);
term_scroll(term, amount);
break; break;
}
case 'T': case 'T': {
term_scroll_reverse(term, vt_param_get(term, 0, 1)); int amount = min(
vt_param_get(term, 0, 1),
term->scroll_region.end - term->scroll_region.start);
term_scroll_reverse(term, amount);
break; break;
}
case 'X': { case 'X': {
/* Erase chars */ /* Erase chars */

8
terminal.c
View file

@ -1744,8 +1744,8 @@ term_scroll_partial(struct terminal *term, struct scroll_region region, int rows
LOG_DBG("scroll: rows=%d, region.start=%d, region.end=%d", LOG_DBG("scroll: rows=%d, region.start=%d, region.end=%d",
rows, region.start, region.end); rows, region.start, region.end);
/* Clamp scroll amount */ /* Verify scroll amount has been clamped */
rows = min(rows, region.end - region.start); assert(rows <= region.end - region.start);
/* Cancel selections that cannot be scrolled */ /* Cancel selections that cannot be scrolled */
if (unlikely(term->selection.start.row != -1)) { if (unlikely(term->selection.start.row != -1)) {
@ -1816,8 +1816,8 @@ term_scroll_reverse_partial(struct terminal *term,
LOG_DBG("scroll reverse: rows=%d, region.start=%d, region.end=%d", LOG_DBG("scroll reverse: rows=%d, region.start=%d, region.end=%d",
rows, region.start, region.end); rows, region.start, region.end);
/* Clamp scroll amount */ /* Verify scroll amount has been clamped */
rows = min(rows, region.end - region.start); assert(rows <= region.end - region.start);
/* Cancel selections that cannot be scrolled */ /* Cancel selections that cannot be scrolled */
if (unlikely(term->selection.start.row != -1)) { if (unlikely(term->selection.start.row != -1)) {