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

render: term->render.margins is used to explicitly tell us to re-render margins

Browse source
This commit is contained in:
Daniel Eklöf 2020-09-29 10:04:41 +02:00
parent 5116e40581
commit b19e07ad1c
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 7 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

22
render.c
View file

@ -1568,7 +1568,7 @@ static const struct wl_callback_listener frame_listener = {
}; };
static void static void
grid_render(struct terminal *term, bool redraw_margins) grid_render(struct terminal *term)
{ {
if (term->is_shutting_down) if (term->is_shutting_down)
return; return;
@ -1588,7 +1588,7 @@ grid_render(struct terminal *term, bool redraw_margins)
if (term->render.last_buf != buf || if (term->render.last_buf != buf ||
term->flash.active || term->render.was_flashing || term->flash.active || term->render.was_flashing ||
term->is_searching != term->render.was_searching || term->is_searching != term->render.was_searching ||
redraw_margins) term->render.margins)
{ {
if (term->render.last_buf != NULL && if (term->render.last_buf != NULL &&
term->render.last_buf->width == buf->width && term->render.last_buf->width == buf->width &&
@ -1596,7 +1596,7 @@ grid_render(struct terminal *term, bool redraw_margins)
!term->flash.active && !term->flash.active &&
!term->render.was_flashing && !term->render.was_flashing &&
term->is_searching == term->render.was_searching && term->is_searching == term->render.was_searching &&
!redraw_margins) !term->render.margins)
{ {
static bool has_warned = false; static bool has_warned = false;
if (!has_warned) { if (!has_warned) {
@ -1972,13 +1972,11 @@ frame_callback(void *data, struct wl_callback *wl_callback, uint32_t callback_da
term->window->frame_callback = NULL; term->window->frame_callback = NULL;
bool grid = term->render.pending.grid; bool grid = term->render.pending.grid;
bool margins = term->render.pending.margins;
bool csd = term->render.pending.csd; bool csd = term->render.pending.csd;
bool search = term->render.pending.search; bool search = term->render.pending.search;
bool title = term->render.pending.title; bool title = term->render.pending.title;
term->render.pending.grid = false; term->render.pending.grid = false;
term->render.pending.margins = false;
term->render.pending.csd = false; term->render.pending.csd = false;
term->render.pending.search = false; term->render.pending.search = false;
term->render.pending.title = false; term->render.pending.title = false;
@ -1995,11 +1993,8 @@ frame_callback(void *data, struct wl_callback *wl_callback, uint32_t callback_da
if (search && term->is_searching) if (search && term->is_searching)
render_search_box(term); render_search_box(term);
if ((grid || margins) && if (grid && (!term->delayed_render_timer.is_armed || csd || search))
(!term->delayed_render_timer.is_armed || csd || search)) grid_render(term);
{
grid_render(term, margins);
}
} }
/* Move to terminal.c? */ /* Move to terminal.c? */
@ -2336,13 +2331,11 @@ fdm_hook_refresh_pending_terminals(struct fdm *fdm, void *data)
assert(term->window->is_configured); assert(term->window->is_configured);
bool grid = term->render.refresh.grid; bool grid = term->render.refresh.grid;
bool margins = term->render.refresh.margins;
bool csd = term->render.refresh.csd; bool csd = term->render.refresh.csd;
bool search = term->render.refresh.search; bool search = term->render.refresh.search;
bool title = term->render.refresh.title; bool title = term->render.refresh.title;
term->render.refresh.grid = false; term->render.refresh.grid = false;
term->render.refresh.margins = false;
term->render.refresh.csd = false; term->render.refresh.csd = false;
term->render.refresh.search = false; term->render.refresh.search = false;
term->render.refresh.title = false; term->render.refresh.title = false;
@ -2357,12 +2350,11 @@ fdm_hook_refresh_pending_terminals(struct fdm *fdm, void *data)
render_update_title(term); render_update_title(term);
if (search) if (search)
render_search_box(term); render_search_box(term);
if (grid || margins) if (grid)
grid_render(term, margins); 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.margins |= margins;
term->render.pending.csd |= csd; term->render.pending.csd |= csd;
term->render.pending.search |= search; term->render.pending.search |= search;
term->render.pending.title |= title; term->render.pending.title |= title;