aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2019-07-07 19:55:31 +0000
committerDaniel Eklöf <daniel@ekloef.se>2019-07-07 19:55:31 +0000
commitc35e10bd9a1ca934fc440144d206984d5c1f0d9c (patch)
tree137f3f5abc90499cee537b698035a7bb664b5628
parentgrid: add a fast path to grid_memmove() (diff)
render: collect glyphs over *all* update damages
-rw-r--r--render.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/render.c b/render.c
index e776fcdd..0b833376 100644
--- a/render.c
+++ b/render.c
@@ -54,9 +54,6 @@ grid_render_update(struct terminal *term, struct buffer *buf, const struct damag
const int cols = term->cols;
- gseq.g = gseq.glyphs;
- gseq.count = 0;
-
for (int linear_cursor = start,
row = ((start - term->grid->offset) % term->grid->size) / cols,
col = ((start - term->grid->offset) % term->grid->size) % cols;
@@ -166,15 +163,6 @@ grid_render_update(struct terminal *term, struct buffer *buf, const struct damag
assert(gseq.count <= sizeof(gseq.glyphs) / sizeof(gseq.glyphs[0]));
}
- if (gseq.count > 0) {
- cairo_set_scaled_font(buf->cairo, attrs_to_font(term, &gseq.attrs));
- cairo_set_source_rgba(
- buf->cairo, gseq.foreground.r, gseq.foreground.g,
- gseq.foreground.b, gseq.foreground.a);
- cairo_set_operator(buf->cairo, CAIRO_OPERATOR_OVER);
- cairo_show_glyphs(buf->cairo, gseq.glyphs, gseq.count);
- }
-
wl_surface_damage_buffer(
term->wl.surface,
0, ((dmg->range.start - term->grid->offset) / cols) * term->cell_height,
@@ -419,6 +407,9 @@ grid_render(struct terminal *term)
tll_remove(term->grid->scroll_damage, it);
}
+ gseq.g = gseq.glyphs;
+ gseq.count = 0;
+
tll_foreach(term->grid->damage, it) {
switch (it->item.type) {
case DAMAGE_ERASE: grid_render_erase(term, buf, &it->item); break;
@@ -451,6 +442,15 @@ grid_render(struct terminal *term)
grid_render_update(term, buf, &cursor);
last_cursor = term->grid->offset + term->cursor.linear;
+ if (gseq.count > 0) {
+ cairo_set_scaled_font(buf->cairo, attrs_to_font(term, &gseq.attrs));
+ cairo_set_source_rgba(
+ buf->cairo, gseq.foreground.r, gseq.foreground.g,
+ gseq.foreground.b, gseq.foreground.a);
+ cairo_set_operator(buf->cairo, CAIRO_OPERATOR_OVER);
+ cairo_show_glyphs(buf->cairo, gseq.glyphs, gseq.count);
+ }
+
term->grid->offset %= term->grid->size;
if (term->grid->offset < 0)
term->grid->offset += term->grid->size;