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

render: break up grid_render()

Browse source
This commit is contained in:
Daniel Eklöf 2019-06-19 14:37:42 +02:00
parent 304f15d696
commit 0ddd96de0d
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 158 additions and 152 deletions
Download patch file Download diff file Expand all files Collapse all files

3
grid.c
View file

@ -170,9 +170,10 @@ grid_scroll(struct grid *grid, int rows)
int count = cell_end - cell_start; int count = cell_end - cell_start;
LOG_DBG("moving %d cells from %d", count, cell_start); LOG_DBG("moving %d cells from %d", count, cell_start);
const size_t bytes = count * sizeof(grid->cells[0]);
memmove( memmove(
&grid->cells[0], &grid->cells[cell_start], &grid->cells[0], &grid->cells[cell_start],
count * sizeof(grid->cells[0])); bytes);
tll_free(grid->damage); tll_free(grid->damage);

93
main.c
View file

@ -69,37 +69,20 @@ static const struct wl_callback_listener frame_listener = {
}; };
static void static void
grid_render(struct context *c) grid_render_erase(struct context *c, struct buffer *buf, const struct damage *dmg)
{ {
if (tll_length(c->term.grid.damage) == 0)
return;
assert(c->width > 0);
assert(c->height > 0);
struct buffer *buf = shm_get_buffer(c->wl.shm, c->width, c->height);
double br, bg, bb; /* Background */
double fr, fg, fb; /* Foreground */
cairo_set_operator(buf->cairo, CAIRO_OPERATOR_SOURCE);
cairo_set_scaled_font(buf->cairo, c->font);
tll_foreach(c->term.grid.damage, it) {
switch (it->item.type) {
case DAMAGE_ERASE: {
LOG_DBG("damage: ERASE: %d -> %d", LOG_DBG("damage: ERASE: %d -> %d",
it->item.range.start, it->item.range.start + it->item.range.length); dmg->range.start, dmg->range.start + dmg->range.length);
br = (double)((default_background >> 24) & 0xff) / 255.0; double br = (double)((default_background >> 24) & 0xff) / 255.0;
bg = (double)((default_background >> 16) & 0xff) / 255.0; double bg = (double)((default_background >> 16) & 0xff) / 255.0;
bb = (double)((default_background >> 8) & 0xff) / 255.0; double bb = (double)((default_background >> 8) & 0xff) / 255.0;
cairo_set_source_rgba(buf->cairo, br, bg, bb, 1.0); cairo_set_source_rgba(buf->cairo, br, bg, bb, 1.0);
const int cols = c->term.grid.cols; const int cols = c->term.grid.cols;
int start = it->item.range.start; int start = dmg->range.start;
int left = it->item.range.length; int left = dmg->range.length;
int row = start / cols; int row = start / cols;
int col = start % cols; int col = start % cols;
@ -160,20 +143,20 @@ grid_render(struct context *c)
cairo_fill(buf->cairo); cairo_fill(buf->cairo);
wl_surface_damage_buffer(c->wl.surface, x, y, width, height); wl_surface_damage_buffer(c->wl.surface, x, y, width, height);
} }
}
break; static void
} grid_render_update(struct context *c, struct buffer *buf, const struct damage *dmg)
{
case DAMAGE_UPDATE: {
LOG_DBG("damage: UPDATE: %d -> %d", LOG_DBG("damage: UPDATE: %d -> %d",
it->item.range.start, it->item.range.start + it->item.range.length); dmg->range.start, dmg->range.start + dmg->range.length);
const int cols = c->term.grid.cols; const int cols = c->term.grid.cols;
for (int linear_cursor = it->item.range.start, for (int linear_cursor = dmg->range.start,
row = it->item.range.start / cols, row = dmg->range.start / cols,
col = it->item.range.start % cols; col = dmg->range.start % cols;
linear_cursor < it->item.range.start + it->item.range.length; linear_cursor < dmg->range.start + dmg->range.length;
linear_cursor++, linear_cursor++,
col = (col + 1) % cols, col = (col + 1) % cols,
row += col == 0 ? 1 : 0) row += col == 0 ? 1 : 0)
@ -192,13 +175,13 @@ grid_render(struct context *c)
//LOG_DBG("cell %dx%d dirty: c=0x%02x (%c)", //LOG_DBG("cell %dx%d dirty: c=0x%02x (%c)",
// row, col, cell->c[0], cell->c[0]); // row, col, cell->c[0], cell->c[0]);
br = (double)((cell->attrs.background >> 24) & 0xff) / 255.0; double br = (double)((cell->attrs.background >> 24) & 0xff) / 255.0;
bg = (double)((cell->attrs.background >> 16) & 0xff) / 255.0; double bg = (double)((cell->attrs.background >> 16) & 0xff) / 255.0;
bb = (double)((cell->attrs.background >> 8) & 0xff) / 255.0; double bb = (double)((cell->attrs.background >> 8) & 0xff) / 255.0;
fr = (double)((cell->attrs.foreground >> 24) & 0xff) / 255.0; double fr = (double)((cell->attrs.foreground >> 24) & 0xff) / 255.0;
fg = (double)((cell->attrs.foreground >> 16) & 0xff) / 255.0; double fg = (double)((cell->attrs.foreground >> 16) & 0xff) / 255.0;
fb = (double)((cell->attrs.foreground >> 8) & 0xff) / 255.0; double fb = (double)((cell->attrs.foreground >> 8) & 0xff) / 255.0;
if (has_cursor) if (has_cursor)
cairo_set_source_rgba(buf->cairo, fr, fg, fb, 1.0); cairo_set_source_rgba(buf->cairo, fr, fg, fb, 1.0);
@ -229,15 +212,37 @@ grid_render(struct context *c)
cairo_set_source_rgba(buf->cairo, fr, fg, fb, 1.0); cairo_set_source_rgba(buf->cairo, fr, fg, fb, 1.0);
cairo_show_glyphs(buf->cairo, glyphs, num_glyphs); cairo_show_glyphs(buf->cairo, glyphs, num_glyphs);
cairo_glyph_free(glyphs); cairo_glyph_free(glyphs);
//wl_surface_damage_buffer(c->wl.surface, x, y, width, height);
} }
wl_surface_damage_buffer( wl_surface_damage_buffer(
c->wl.surface, c->wl.surface,
0, (it->item.range.start / cols) * c->term.grid.cell_height, 0, (dmg->range.start / cols) * c->term.grid.cell_height,
buf->width, (it->item.range.length + cols - 1) / cols * c->term.grid.cell_height); buf->width, (dmg->range.length + cols - 1) / cols * c->term.grid.cell_height);
}
static void
grid_render(struct context *c)
{
if (tll_length(c->term.grid.damage) == 0)
return;
assert(c->width > 0);
assert(c->height > 0);
struct buffer *buf = shm_get_buffer(c->wl.shm, c->width, c->height);
cairo_set_operator(buf->cairo, CAIRO_OPERATOR_SOURCE);
cairo_set_scaled_font(buf->cairo, c->font);
tll_foreach(c->term.grid.damage, it) {
switch (it->item.type) {
case DAMAGE_ERASE:
grid_render_erase(c, buf, &it->item);
break;
case DAMAGE_UPDATE:
grid_render_update(c, buf, &it->item);
break; break;
}
case DAMAGE_SCROLL: case DAMAGE_SCROLL:
assert(false); assert(false);