aboutsummaryrefslogtreecommitdiff
path: root/render.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-01-04 18:57:16 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-01-04 18:57:16 +0000
commitf29d506f3bd459f1725a6cd2572b0e17a7b734a6 (patch)
tree90679ed3af4074e9080ba37b67a281e1486f6cb4 /render.c
parentdoc: document how to do block selections (diff)
parentterm: more comments in the 'render' sub-struct (diff)
Merge branch 'render-refresh-optimize'
Diffstat (limited to 'render.c')
-rw-r--r--render.c64
1 files changed, 57 insertions, 7 deletions
diff --git a/render.c b/render.c
index d97da212..1f58fd05 100644
--- a/render.c
+++ b/render.c
@@ -22,6 +22,11 @@
#define min(x, y) ((x) < (y) ? (x) : (y))
#define max(x, y) ((x) > (y) ? (x) : (y))
+struct renderer {
+ struct fdm *fdm;
+ struct wayland *wayl;
+};
+
static struct {
size_t total;
size_t zero; /* commits presented in less than one frame interval */
@@ -29,6 +34,56 @@ static struct {
size_t two; /* commits presented in two or more frame intervals */
} presentation_statistics = {0};
+static void
+fdm_hook_refresh_pending_terminals(struct fdm *fdm, void *data)
+{
+ struct renderer *renderer = data;
+ tll_foreach(renderer->wayl->terms, it) {
+ struct terminal *term = it->item;
+
+ if (!term->render.refresh_needed)
+ continue;
+
+ assert(term->window->is_configured);
+ term->render.refresh_needed = false;
+
+ if (term->window->frame_callback == NULL) {
+ LOG_INFO("rendering immediately");
+ grid_render(term);
+ } else {
+ LOG_INFO("setting pending");
+ term->render.pending = true;
+ }
+ }
+}
+
+struct renderer *
+render_init(struct fdm *fdm, struct wayland *wayl)
+{
+ struct renderer *renderer = calloc(1, sizeof(*renderer));
+ *renderer = (struct renderer) {
+ .fdm = fdm,
+ .wayl = wayl,
+ };
+
+ if (!fdm_hook_add(fdm, &fdm_hook_refresh_pending_terminals, renderer)) {
+ LOG_ERR("failed to register FDM hook");
+ free(renderer);
+ return NULL;
+ }
+
+ return renderer;
+}
+
+void
+render_destroy(struct renderer *renderer)
+{
+ if (renderer == NULL)
+ return;
+
+ fdm_hook_del(renderer->fdm, &fdm_hook_refresh_pending_terminals);
+}
+
static void __attribute__((destructor))
log_presentation_statistics(void)
{
@@ -156,7 +211,7 @@ static const struct wp_presentation_feedback_listener presentation_feedback_list
.discarded = &discarded,
};
-struct font *
+static struct font *
attrs_to_font(const struct terminal *term, const struct attributes *attrs)
{
int idx = attrs->italic << 1 | attrs->bold;
@@ -1079,10 +1134,5 @@ render_set_title(struct terminal *term, const char *_title)
void
render_refresh(struct terminal *term)
{
- assert(term->window->is_configured);
-
- if (term->window->frame_callback == NULL)
- grid_render(term);
- else
- term->render.pending = true;
+ term->render.refresh_needed = true;
}