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

render: fdm refresh handler: don't clear pending flags

Browse source 
The pending flags may already be set (from a previous call to the FDM
hook). In this case, they should not be cleared.
This commit is contained in:
Daniel Eklöf 2020-03-24 17:42:29 +01:00
parent b79ed6f3e4
commit be8b6e8c75
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 18 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

41
render.c
View file

@ -1455,30 +1455,25 @@ frame_callback(void *data, struct wl_callback *wl_callback, uint32_t callback_da
wl_callback_destroy(wl_callback); wl_callback_destroy(wl_callback);
term->window->frame_callback = NULL; term->window->frame_callback = NULL;
if (term->render.pending.csd) { bool grid = term->render.pending.grid;
term->render.pending.csd = false; bool csd = term->render.pending.csd;
bool search = term->render.pending.search;
if (term->window->use_csd == CSD_YES) { term->render.pending.grid = false;
quirk_weston_csd_on(term); term->render.pending.csd = false;
render_csd(term); term->render.pending.search = false;
quirk_weston_csd_off(term);
} if (csd && term->window->use_csd == CSD_YES) {
quirk_weston_csd_on(term);
render_csd(term);
quirk_weston_csd_off(term);
} }
if (term->render.pending.search) { if (search && term->is_searching)
term->render.pending.search = false; render_search_box(term);
if (term->is_searching) if (grid && (!term->delayed_render_timer.is_armed || csd || search))
render_search_box(term); grid_render(term);
}
if (term->render.pending.grid) {
term->render.pending.grid = false;
/* TODO: need to check if this breaks GNOME/weston */
if (!term->delayed_render_timer.is_armed)
grid_render(term);
}
} }
/* Move to terminal.c? */ /* Move to terminal.c? */
@ -1823,9 +1818,9 @@ fdm_hook_refresh_pending_terminals(struct fdm *fdm, void *data)
grid_render(term); grid_render(term);
} else { } else {
/* Tells the frame callback to render again */ /* Tells the frame callback to render again */
term->render.pending.grid = grid; term->render.pending.grid |= grid;
term->render.pending.csd = csd; term->render.pending.csd |= csd;
term->render.pending.search = search; term->render.pending.search |= search;
} }
} }