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

render: store frame callback pointer in terminal struct

Browse source 
This allows us to free it when exiting
This commit is contained in:
Daniel Eklöf 2019-07-09 09:23:32 +02:00
parent d7bb83022d
commit 0d24fcafd0
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
3 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
main.c
View file

@ -496,7 +496,7 @@ main(int argc, char *const *argv)
if (ret == 0 || !(timeout_ms != -1 && fds[1].revents & POLLIN)) { if (ret == 0 || !(timeout_ms != -1 && fds[1].revents & POLLIN)) {
/* Delayed rendering */ /* Delayed rendering */
if (!term.frame_is_scheduled) if (term.frame_callback == NULL)
grid_render(&term); grid_render(&term);
} }
@ -584,6 +584,8 @@ out:
mtx_unlock(&term.kbd.repeat.mutex); mtx_unlock(&term.kbd.repeat.mutex);
shm_fini(); shm_fini();
if (term.frame_callback != NULL)
wl_callback_destroy(term.frame_callback);
if (term.wl.xdg_toplevel != NULL) if (term.wl.xdg_toplevel != NULL)
xdg_toplevel_destroy(term.wl.xdg_toplevel); xdg_toplevel_destroy(term.wl.xdg_toplevel);
if (term.wl.xdg_surface != NULL) if (term.wl.xdg_surface != NULL)

11
render.c
View file

@ -308,9 +308,9 @@ grid_render(struct terminal *term)
cairo_surface_flush(buf->cairo_surface); cairo_surface_flush(buf->cairo_surface);
wl_surface_attach(term->wl.surface, buf->wl_buf, 0, 0); wl_surface_attach(term->wl.surface, buf->wl_buf, 0, 0);
struct wl_callback *cb = wl_surface_frame(term->wl.surface); assert(term->frame_callback == NULL);
wl_callback_add_listener(cb, &frame_listener, term); term->frame_callback = wl_surface_frame(term->wl.surface);
term->frame_is_scheduled = true; wl_callback_add_listener(term->frame_callback, &frame_listener, term);
wl_surface_commit(term->wl.surface); wl_surface_commit(term->wl.surface);
} }
@ -320,8 +320,9 @@ frame_callback(void *data, struct wl_callback *wl_callback, uint32_t callback_da
{ {
struct terminal *term = data; struct terminal *term = data;
term->frame_is_scheduled = false; assert(term->frame_callback == wl_callback);
wl_callback_destroy(wl_callback); wl_callback_destroy(wl_callback);
term->frame_callback = NULL;
grid_render(term); grid_render(term);
} }
@ -435,7 +436,7 @@ render_resize(struct terminal *term, int width, int height)
min(term->cursor.col, term->cols - 1)); min(term->cursor.col, term->cols - 1));
term_damage_all(term); term_damage_all(term);
if (!term->frame_is_scheduled) if (term->frame_callback == NULL)
grid_render(term); grid_render(term);
} }

3
terminal.h
View file

@ -7,6 +7,7 @@
#include <threads.h> #include <threads.h>
#include <cairo.h> #include <cairo.h>
#include <wayland-client.h>
#include <xkbcommon/xkbcommon.h> #include <xkbcommon/xkbcommon.h>
#include <xkbcommon/xkbcommon-keysyms.h> #include <xkbcommon/xkbcommon-keysyms.h>
@ -241,7 +242,7 @@ struct terminal {
cairo_font_extents_t fextents; cairo_font_extents_t fextents;
struct wayland wl; struct wayland wl;
bool frame_is_scheduled; struct wl_callback *frame_callback;
}; };
void term_damage_all(struct terminal *term); void term_damage_all(struct terminal *term);