diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2019-10-29 20:09:37 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2019-10-29 20:09:37 +0000 |
| commit | a42df2434b796f19ff729e194dd6a22f5128b89a (patch) | |
| tree | c95df42d6b884b22c8815661f2391ecdc53ffcef | |
| parent | render: regression: don't apply scroll damage when view is in scrollback (diff) | |
scrollback: regression: fix rendering of scrollback diffs less than a screen
When doing "small" scrolls (typically done via mouse wheel or
similar), we render the scrolling by emitting a "scroll damage".
A recent commit changed how scroll damage is rendered; only when the
view is at the bottom ("following" the screen output) do we render the
damage.
To fix this, add a new type of scroll damage,
SCROLL_DAMAGE_IN_VIEW and SCROLL_DAMAGE_REVERSE_IN_VIEW.
These signal to the renderer that it should always render the damage.
| -rw-r--r-- | commands.c | 4 | ||||
| -rw-r--r-- | render.c | 29 | ||||
| -rw-r--r-- | terminal.h | 4 |
3 files changed, 23 insertions, 14 deletions
@@ -72,7 +72,7 @@ cmd_scrollback_up(struct terminal *term, int rows) term->grid->view = new_view; if (diff >= 0 && diff < term->rows) { - term_damage_scroll(term, DAMAGE_SCROLL_REVERSE, (struct scroll_region){0, term->rows}, diff); + term_damage_scroll(term, DAMAGE_SCROLL_REVERSE_IN_VIEW, (struct scroll_region){0, term->rows}, diff); term_damage_rows_in_view(term, 0, diff - 1); } else term_damage_view(term); @@ -142,7 +142,7 @@ cmd_scrollback_down(struct terminal *term, int rows) term->grid->view = new_view; if (diff >= 0 && diff < term->rows) { - term_damage_scroll(term, DAMAGE_SCROLL, (struct scroll_region){0, term->rows}, diff); + term_damage_scroll(term, DAMAGE_SCROLL_IN_VIEW, (struct scroll_region){0, term->rows}, diff); term_damage_rows_in_view(term, term->rows - diff, term->rows - 1); } else term_damage_view(term); @@ -530,22 +530,29 @@ grid_render(struct terminal *term) } } - if (term->grid->view == term->grid->offset) { - tll_foreach(term->grid->scroll_damage, it) { - switch (it->item.type) { - case DAMAGE_SCROLL: + tll_foreach(term->grid->scroll_damage, it) { + switch (it->item.type) { + case DAMAGE_SCROLL: + if (term->grid->view == term->grid->offset) grid_render_scroll(term, buf, &it->item); - break; + break; - case DAMAGE_SCROLL_REVERSE: + case DAMAGE_SCROLL_REVERSE: + if (term->grid->view == term->grid->offset) grid_render_scroll_reverse(term, buf, &it->item); - break; - } + break; - tll_remove(term->grid->scroll_damage, it); + case DAMAGE_SCROLL_IN_VIEW: + grid_render_scroll(term, buf, &it->item); + break; + + case DAMAGE_SCROLL_REVERSE_IN_VIEW: + grid_render_scroll_reverse(term, buf, &it->item); + break; } - } else - tll_free(term->grid->scroll_damage); + + tll_remove(term->grid->scroll_damage, it); + } if (term->render.workers.count > 0) { @@ -129,7 +129,9 @@ struct coord { int row; }; -enum damage_type {DAMAGE_SCROLL, DAMAGE_SCROLL_REVERSE}; +enum damage_type {DAMAGE_SCROLL, DAMAGE_SCROLL_REVERSE, + DAMAGE_SCROLL_IN_VIEW, DAMAGE_SCROLL_REVERSE_IN_VIEW}; + struct damage { enum damage_type type; /* DAMAGE_SCROLL, DAMAGE_SCROLL_REVERSE */ |
