diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2020-07-14 06:35:47 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2020-07-14 06:35:47 +0000 |
| commit | fa75e1646a3cbd1568f50b9a552d8d2d2814f659 (patch) | |
| tree | 62def00b813eb3196e91e642126acd8dd99b37b7 | |
| parent | render: keep lock while pushing dirty rows to worker queue (diff) | |
| parent | changelog: mention fix for 'too many wl_surface_damage_buffer()' calls (diff) | |
Merge branch 'merge-wl-surface-damage'
Closes #35
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | main.c | 3 | ||||
| -rw-r--r-- | render.c | 163 | ||||
| -rw-r--r-- | terminal.c | 1 | ||||
| -rw-r--r-- | wayland.c | 8 |
5 files changed, 100 insertions, 77 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 306a1cc1..36ae5308 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -91,6 +91,8 @@ * Sixel images being erased when printing text next to them. * Sixel handling when resizing window. * Sixel handling when scrollback wraps around. +* Foot now issues much fewer `wl_surface_damage_buffer()` calls + (https://codeberg.org/dnkl/foot/issues/35). ### Security @@ -403,10 +403,10 @@ main(int argc, char *const *argv) if (!as_server && (term = term_init( &conf, fdm, reaper, wayl, "foot", cwd, argc, argv, &term_shutdown_cb, &shutdown_ctx)) == NULL) { - free(cwd); goto out; } free(cwd); + cwd = NULL; if (as_server && (server = server_init(&conf, fdm, reaper, wayl)) == NULL) goto out; @@ -439,6 +439,7 @@ main(int argc, char *const *argv) ret = aborted || tll_length(wayl->terms) == 0 ? EXIT_SUCCESS : EXIT_FAILURE; out: + free(cwd); server_destroy(server); term_destroy(term); @@ -503,8 +503,8 @@ draw_cursor: } static void -render_margin(struct terminal *term, struct buffer *buf, int start_line, int end_line, - bool top, bool bottom) +render_margin(struct terminal *term, struct buffer *buf, + int start_line, int end_line, bool apply_damage) { /* Fill area outside the cell grid with the default background color */ const int rmargin = term->width - term->margins.right; @@ -517,25 +517,15 @@ render_margin(struct terminal *term, struct buffer *buf, int start_line, int end if (term->is_searching) color_dim(&bg); - if (top) { - pixman_image_fill_rectangles( - PIXMAN_OP_SRC, buf->pix[0], &bg, 1, - &(pixman_rectangle16_t){0, 0, term->width, term->margins.top}); - wl_surface_damage_buffer( - term->window->surface, 0, 0, term->width, term->margins.top); - } - - if (bottom) { - pixman_image_fill_rectangles( - PIXMAN_OP_SRC, buf->pix[0], &bg, 1, - &(pixman_rectangle16_t){0, bmargin, term->width, term->margins.bottom}); - wl_surface_damage_buffer( - term->window->surface, 0, bmargin, term->width, term->margins.bottom); - } - pixman_image_fill_rectangles( - PIXMAN_OP_SRC, buf->pix[0], &bg, 2, + PIXMAN_OP_SRC, buf->pix[0], &bg, 4, (pixman_rectangle16_t[]){ + /* Top */ + {0, 0, term->width, term->margins.top}, + + /* Bottom */ + {0, bmargin, term->width, term->margins.bottom}, + /* Left */ {0, term->margins.top + start_line * term->cell_height, term->margins.left, line_count * term->cell_height}, @@ -545,17 +535,27 @@ render_margin(struct terminal *term, struct buffer *buf, int start_line, int end term->margins.right, line_count * term->cell_height}, }); - /* Left */ - wl_surface_damage_buffer( - term->window->surface, - 0, term->margins.top + start_line * term->cell_height, - term->margins.left, line_count * term->cell_height); + if (apply_damage) { + /* Top */ + wl_surface_damage_buffer( + term->window->surface, 0, 0, term->width, term->margins.top); - /* Right */ - wl_surface_damage_buffer( - term->window->surface, - rmargin, term->margins.top + start_line * term->cell_height, - term->margins.right, line_count * term->cell_height); + /* Bottom */ + wl_surface_damage_buffer( + term->window->surface, 0, bmargin, term->width, term->margins.bottom); + + /* Left */ + wl_surface_damage_buffer( + term->window->surface, + 0, term->margins.top + start_line * term->cell_height, + term->margins.left, line_count * term->cell_height); + + /* Right */ + wl_surface_damage_buffer( + term->window->surface, + rmargin, term->margins.top + start_line * term->cell_height, + term->margins.right, line_count * term->cell_height); + } } static void @@ -633,8 +633,7 @@ grid_render_scroll(struct terminal *term, struct buffer *buf, if (did_shm_scroll) { /* Restore margins */ render_margin( - term, buf, dmg->region.end - dmg->lines, term->rows, - true, true); + term, buf, dmg->region.end - dmg->lines, term->rows, false); } else { /* Fallback for when we either cannot do SHM scrolling, or it failed */ uint8_t *raw = buf->mmapped; @@ -699,8 +698,7 @@ grid_render_scroll_reverse(struct terminal *term, struct buffer *buf, if (did_shm_scroll) { /* Restore margins */ render_margin( - term, buf, dmg->region.start, dmg->region.start + dmg->lines, - true, true); + term, buf, dmg->region.start, dmg->region.start + dmg->lines, false); } else { /* Fallback for when we either cannot do SHM scrolling, or it failed */ uint8_t *raw = buf->mmapped; @@ -865,6 +863,15 @@ render_worker_thread(void *_ctx) struct buffer *buf = term->render.workers.buf; bool frame_done = false; + /* Translate offset-relative cursor row to view-relative */ + struct coord cursor = {-1, -1}; + if (!term->hide_cursor) { + cursor = term->grid->cursor.point; + cursor.row += term->grid->offset; + cursor.row -= term->grid->view; + cursor.row &= term->grid->num_rows - 1; + } + while (!frame_done) { mtx_lock(lock); assert(tll_length(term->render.workers.queue) > 0); @@ -872,18 +879,12 @@ render_worker_thread(void *_ctx) int row_no = tll_pop_front(term->render.workers.queue); mtx_unlock(lock); - /* Translate offset-relative cursor row to view-relative */ - struct coord cursor = term->grid->cursor.point; - cursor.row += term->grid->offset; - cursor.row -= term->grid->view; - cursor.row &= term->grid->num_rows - 1; - switch (row_no) { default: { assert(buf != NULL); struct row *row = grid_row_in_view(term->grid, row_no); - int cursor_col = !term->hide_cursor && cursor.row == row_no ? cursor.col : -1; + int cursor_col = cursor.row == row_no ? cursor.col : -1; render_row(term, buf->pix[my_id], row, row_no, cursor_col); break; @@ -1338,7 +1339,7 @@ grid_render(struct terminal *term) else { tll_free(term->grid->scroll_damage); - render_margin(term, buf, 0, term->rows, true, true); + render_margin(term, buf, 0, term->rows, true); term_damage_view(term); } @@ -1412,31 +1413,67 @@ grid_render(struct terminal *term) row->dirty = true; } - if (term->render.workers.count > 0) { + /* Translate offset-relative row to view-relative, unless cursor + * is hidden, then we just set it to -1 */ + struct coord cursor = {-1, -1}; + if (!term->hide_cursor) { + cursor = term->grid->cursor.point; + cursor.row += term->grid->offset; + cursor.row -= term->grid->view; + cursor.row &= term->grid->num_rows - 1; + } + if (term->render.workers.count > 0) { mtx_lock(&term->render.workers.lock); - term->render.workers.buf = buf; for (size_t i = 0; i < term->render.workers.count; i++) sem_post(&term->render.workers.start); assert(tll_length(term->render.workers.queue) == 0); + } - for (int r = 0; r < term->rows; r++) { - struct row *row = grid_row_in_view(term->grid, r); + int first_dirty_row = -1; + for (int r = 0; r < term->rows; r++) { + struct row *row = grid_row_in_view(term->grid, r); - if (!row->dirty) - continue; + if (!row->dirty) { + if (first_dirty_row >= 0) { + wl_surface_damage_buffer( + term->window->surface, + term->margins.left, + term->margins.top + first_dirty_row * term->cell_height, + term->width - term->margins.left - term->margins.right, + (r - first_dirty_row) * term->cell_height); + } + first_dirty_row = -1; + continue; + } + + if (first_dirty_row < 0) + first_dirty_row = r; + row->dirty = false; + + if (term->render.workers.count > 0) tll_push_back(term->render.workers.queue, r); - row->dirty = false; - wl_surface_damage_buffer( - term->window->surface, - term->margins.left, term->margins.top + r * term->cell_height, - term->width - term->margins.left - term->margins.right, term->cell_height); + else { + int cursor_col = cursor.row == r ? cursor.col : -1; + render_row(term, buf->pix[0], row, r, cursor_col); } + } + + if (first_dirty_row >= 0) { + wl_surface_damage_buffer( + term->window->surface, + term->margins.left, + term->margins.top + first_dirty_row * term->cell_height, + term->width - term->margins.left - term->margins.right, + (term->rows - first_dirty_row) * term->cell_height); + } + /* Signal workers the frame is done */ + if (term->render.workers.count > 0) { for (size_t i = 0; i < term->render.workers.count; i++) tll_push_back(term->render.workers.queue, -1); mtx_unlock(&term->render.workers.lock); @@ -1444,28 +1481,6 @@ grid_render(struct terminal *term) for (size_t i = 0; i < term->render.workers.count; i++) sem_wait(&term->render.workers.done); term->render.workers.buf = NULL; - } else { - for (int r = 0; r < term->rows; r++) { - struct row *row = grid_row_in_view(term->grid, r); - - if (!row->dirty) - continue; - - /* Translate offset-relative row to view-relative */ - struct coord cursor = term->grid->cursor.point; - cursor.row += term->grid->offset; - cursor.row -= term->grid->view; - cursor.row &= term->grid->num_rows - 1; - - int cursor_col = !term->hide_cursor && cursor.row == r ? cursor.col : -1; - render_row(term, buf->pix[0], row, r, cursor_col); - row->dirty = false; - - wl_surface_damage_buffer( - term->window->surface, - term->margins.left, term->margins.top + r * term->cell_height, - term->width - term->margins.left - term->margins.right, term->cell_height); - } } render_sixel_images(term, buf->pix[0]); @@ -552,6 +552,7 @@ term_set_fonts(struct terminal *term, struct fcft_font *fonts[static 4]) term->fonts[0]->ascent + term->fonts[0]->descent); LOG_INFO("cell width=%d, height=%d", term->cell_width, term->cell_height); + /* Use force, since cell-width/height may have changed */ render_resize_force(term, term->width / term->scale, term->height / term->scale); return true; } @@ -546,7 +546,11 @@ xdg_surface_configure(void *data, struct xdg_surface *xdg_surface, win->is_fullscreen = win->configure.is_fullscreen; xdg_surface_ack_configure(xdg_surface, serial); - bool resized = render_resize_force(term, win->configure.width, win->configure.height); + + /* TODO: check with GNOME and tiling - presumably that didn't work + * unless we presented a *new* buffer, hence we used to do a force + * resize here */ + bool resized = render_resize(term, win->configure.width, win->configure.height); if (win->configure.is_activated) term_visual_focus_in(term); @@ -556,7 +560,7 @@ xdg_surface_configure(void *data, struct xdg_surface *xdg_surface, /* TODO: remove - shouldn't be necessary with render_resize_force() */ if (!resized) { /* - * If we didn't resize, we won't be commit a new surface + * If we didn't resize, we won't be committing a new surface * anytime soon. Some compositors require a commit in * combination with an ack - make them happy. */ |
