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

scroll: let the render erase the scrolled up region

Browse source 
The grid scroll operation no longer inserts a DAMAGE_ERASE operation,
but instead manually clears the region. The render does the
corresponding thing.
This commit is contained in:
Daniel Eklöf 2019-06-26 19:33:39 +02:00
parent a35738d96f
commit 97420f13d8
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 51 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

44
grid.c
View file

@ -164,26 +164,22 @@ grid_damage_scroll(struct grid *grid, enum damage_type damage_type,
{ {
damage_adjust_after_scroll(grid, damage_type, region, lines); damage_adjust_after_scroll(grid, damage_type, region, lines);
if (tll_length(grid->scroll_damage) > 0 && if (tll_length(grid->scroll_damage) > 0) {
tll_back(grid->scroll_damage).type == damage_type &&
tll_back(grid->scroll_damage).scroll.region.start == region.start &&
tll_back(grid->scroll_damage).scroll.region.end == region.end)
{
/* Merge with existing scroll damage */
struct damage *dmg = &tll_back(grid->scroll_damage); struct damage *dmg = &tll_back(grid->scroll_damage);
dmg->scroll.lines += lines;
/* If we've scrolled away the entire screen, remove it all together */ if (dmg->type == damage_type &&
if (dmg->scroll.lines >= region.end - region.start) dmg->scroll.region.start == region.start &&
tll_pop_back(grid->scroll_damage); dmg->scroll.region.end == region.end)
} else { {
struct damage dmg = { dmg->scroll.lines += lines;
.type = damage_type, return;
.scroll = {.region = region, .lines = lines}, }
};
tll_push_back(grid->scroll_damage, dmg);
} }
struct damage dmg = {
.type = damage_type,
.scroll = {.region = region, .lines = lines},
};
tll_push_back(grid->scroll_damage, dmg);
} }
void void
@ -277,11 +273,10 @@ grid_scroll_partial(struct grid *grid, struct scroll_region region, int rows)
&grid->cells[cell_dst], &grid->cells[cell_src], &grid->cells[cell_dst], &grid->cells[cell_src],
bytes); bytes);
memset(&grid->cells[(region.end - rows) * grid->cols], 0,
rows * grid->cols * sizeof(grid->cells[0]));
grid_damage_scroll(grid, DAMAGE_SCROLL, region, rows); grid_damage_scroll(grid, DAMAGE_SCROLL, region, rows);
grid_erase(
grid,
(region.end - rows) * grid->cols,
region.end * grid->cols);
} }
void void
@ -311,11 +306,10 @@ grid_scroll_reverse_partial(struct grid *grid,
&grid->cells[cell_dst], &grid->cells[cell_src], &grid->cells[cell_dst], &grid->cells[cell_src],
bytes); bytes);
memset(&grid->cells[cell_src], 0,
rows * grid->cols * sizeof(grid->cells[0]));
grid_damage_scroll(grid, DAMAGE_SCROLL_REVERSE, region, rows); grid_damage_scroll(grid, DAMAGE_SCROLL_REVERSE, region, rows);
grid_erase(
grid,
region.start * grid->cols,
(region.start + rows) * grid->cols);
} }
void void

46
main.c
View file

@ -27,6 +27,7 @@
#include "grid.h" #include "grid.h"
#define min(x, y) ((x) < (y) ? (x) : (y)) #define min(x, y) ((x) < (y) ? (x) : (y))
#define max(x, y) ((x) > (y) ? (x) : (y))
static const uint32_t default_foreground = 0xffffffff; static const uint32_t default_foreground = 0xffffffff;
static const uint32_t default_background = 0x000000ff; static const uint32_t default_background = 0x000000ff;
@ -269,25 +270,28 @@ grid_render_scroll(struct context *c, struct buffer *buf,
dst_y, src_y, height, stride, dst_y, src_y, height, stride,
buf->size); buf->size);
cairo_surface_flush(buf->cairo_surface); if (height > 0) {
uint8_t *raw = cairo_image_surface_get_data(buf->cairo_surface); 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); memmove(raw + dst_y * stride, raw + src_y * stride, height * stride);
cairo_surface_mark_dirty(buf->cairo_surface); cairo_surface_mark_dirty(buf->cairo_surface);
wl_surface_damage_buffer(c->wl.surface, 0, dst_y, width, height); wl_surface_damage_buffer(c->wl.surface, 0, dst_y, width, height);
}
#if 0
const int cols = c->term.grid.cols; const int cols = c->term.grid.cols;
struct damage erase = { struct damage erase = {
.type = DAMAGE_ERASE, .type = DAMAGE_ERASE,
.range = { .range = {
.start = (dmg->scroll.region.end - dmg->scroll.lines) * cols, .start = max(dmg->scroll.region.end - dmg->scroll.lines,
.length = dmg->scroll.lines * cols dmg->scroll.region.start) * cols,
.length = min(dmg->scroll.region.end - dmg->scroll.region.start,
dmg->scroll.lines) * cols,
}, },
}; };
grid_render_erase(c, buf, &erase); grid_render_erase(c, buf, &erase);
#endif
} }
static void static void
@ -308,13 +312,27 @@ grid_render_scroll_reverse(struct context *c, struct buffer *buf,
dst_y, src_y, height, stride, dst_y, src_y, height, stride,
buf->size); buf->size);
cairo_surface_flush(buf->cairo_surface); if (height > 0) {
uint8_t *raw = cairo_image_surface_get_data(buf->cairo_surface); 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); memmove(raw + dst_y * stride, raw + src_y * stride, height * stride);
cairo_surface_mark_dirty(buf->cairo_surface); cairo_surface_mark_dirty(buf->cairo_surface);
wl_surface_damage_buffer(c->wl.surface, 0, dst_y, width, height); 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.region.start * cols,
.length = min(dmg->scroll.region.end - dmg->scroll.region.start,
dmg->scroll.lines) * cols,
},
};
grid_render_erase(c, buf, &erase);
} }
static void static void