vt: implement reverse scrolling (terminfo 'ri')

This currently duplicates the code paths for DAMAGE_SCROLL; there are
many similarities between the two, but also major differences...
This commit is contained in:
Daniel Eklöf 2019-06-23 17:16:52 +02:00
parent c0a9f9e6b2
commit fbf0db621c
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
5 changed files with 132 additions and 28 deletions

52
main.c
View file

@ -266,7 +266,8 @@ grid_render_scroll(struct context *c, struct buffer *buf,
const uint32_t stride = cairo_format_stride_for_width(CAIRO_FORMAT_ARGB32, width);
LOG_DBG("damage: SCROLL: %d-%d by %d lines (dst-y: %d, src-y: %d, height: %d, stride: %d, mmap-size: %zu)",
LOG_DBG("damage: SCROLL: %d-%d by %d lines (dst-y: %d, src-y: %d, "
"height: %d, stride: %d, mmap-size: %zu)",
dmg->scroll.top_margin,
c->term.grid.rows - dmg->scroll.bottom_margin,
dmg->scroll.lines,
@ -281,7 +282,6 @@ grid_render_scroll(struct context *c, struct buffer *buf,
wl_surface_damage_buffer(c->wl.surface, 0, dst_y, width, height);
#if 1
const int cols = c->term.grid.cols;
struct damage erase = {
.type = DAMAGE_ERASE,
@ -293,7 +293,48 @@ grid_render_scroll(struct context *c, struct buffer *buf,
},
};
grid_render_erase(c, buf, &erase);
#endif
}
static void
grid_render_scroll_reverse(struct context *c, struct buffer *buf,
const struct damage *dmg)
{
//int x = 0;
int src_y = (dmg->scroll.top_margin + 0) * c->term.grid.cell_height;
int dst_y = (dmg->scroll.top_margin + dmg->scroll.lines) * c->term.grid.cell_height;
int width = buf->width;
int height = (c->term.grid.rows -
dmg->scroll.top_margin -
dmg->scroll.bottom_margin -
dmg->scroll.lines) * c->term.grid.cell_height;
const uint32_t stride = cairo_format_stride_for_width(CAIRO_FORMAT_ARGB32, width);
LOG_DBG("damage: SCROLL REVERSE: %d-%d by %d lines (dst-y: %d, src-y: %d, "
"height: %d, stride: %d, mmap-size: %zu)",
dmg->scroll.top_margin,
c->term.grid.rows - dmg->scroll.bottom_margin,
dmg->scroll.lines,
dst_y, src_y, height, stride,
buf->size);
cairo_surface_flush(buf->cairo_surface);
uint8_t *raw = cairo_image_surface_get_data(buf->cairo_surface);
memmove(raw + dst_y * stride, raw + src_y * stride, height * stride);
cairo_surface_mark_dirty(buf->cairo_surface);
wl_surface_damage_buffer(c->wl.surface, 0, dst_y, width, height);
const int cols = c->term.grid.cols;
struct damage erase = {
.type = DAMAGE_ERASE,
.range = {
.start = dmg->scroll.top_margin * cols,
.length = dmg->scroll.lines * cols
},
};
grid_render_erase(c, buf, &erase);
}
static void
@ -321,9 +362,12 @@ grid_render(struct context *c)
break;
case DAMAGE_SCROLL:
//scroll = true;
grid_render_scroll(c, buf, &it->item);
break;
case DAMAGE_SCROLL_REVERSE:
grid_render_scroll_reverse(c, buf, &it->item);
break;
}
tll_remove(c->term.grid.damage, it);