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: margins: caller explicitly asks for top/bottom margins

Browse source
This commit is contained in:
Daniel Eklöf 2020-03-23 20:14:30 +01:00
parent 7fd6916446
commit 9166be8aed
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
render.c
View file

@ -479,18 +479,20 @@ draw_cursor:
} }
static void static void
render_margin(struct terminal *term, struct buffer *buf, int start_line, int end_line) render_margin(struct terminal *term, struct buffer *buf, int start_line, int end_line,
bool top, bool bottom)
{ {
/* Fill area outside the cell grid with the default background color */ /* Fill area outside the cell grid with the default background color */
int rmargin = term->width - term->margins.right; const int rmargin = term->width - term->margins.right;
int bmargin = term->height - term->margins.bottom; const int bmargin = term->height - term->margins.bottom;
const int line_count = end_line - start_line;
uint32_t _bg = !term->reverse ? term->colors.bg : term->colors.fg; uint32_t _bg = !term->reverse ? term->colors.bg : term->colors.fg;
pixman_color_t bg = color_hex_to_pixman_with_alpha(_bg, term->colors.alpha); pixman_color_t bg = color_hex_to_pixman_with_alpha(_bg, term->colors.alpha);
if (term->is_searching) if (term->is_searching)
pixman_color_dim(&bg); pixman_color_dim(&bg);
if (start_line == 0) { if (top) {
pixman_image_fill_rectangles( pixman_image_fill_rectangles(
PIXMAN_OP_SRC, buf->pix, &bg, 1, PIXMAN_OP_SRC, buf->pix, &bg, 1,
&(pixman_rectangle16_t){0, 0, term->width, term->margins.top}); &(pixman_rectangle16_t){0, 0, term->width, term->margins.top});
@ -498,7 +500,7 @@ render_margin(struct terminal *term, struct buffer *buf, int start_line, int end
term->window->surface, 0, 0, term->width, term->margins.top); term->window->surface, 0, 0, term->width, term->margins.top);
} }
if (end_line == term->rows) { if (bottom) {
pixman_image_fill_rectangles( pixman_image_fill_rectangles(
PIXMAN_OP_SRC, buf->pix, &bg, 1, PIXMAN_OP_SRC, buf->pix, &bg, 1,
&(pixman_rectangle16_t){0, bmargin, term->width, term->margins.bottom}); &(pixman_rectangle16_t){0, bmargin, term->width, term->margins.bottom});
@ -638,7 +640,8 @@ grid_render_scroll(struct terminal *term, struct buffer *buf,
/* Restore margins */ /* Restore margins */
render_margin( render_margin(
term, buf, dmg->scroll.region.end - dmg->scroll.lines, term->rows); term, buf, dmg->scroll.region.end - dmg->scroll.lines, term->rows,
true, true);
} }
/* Fallback for when we either cannot do SHM scrolling, or it failed */ /* Fallback for when we either cannot do SHM scrolling, or it failed */
@ -1261,7 +1264,7 @@ grid_render(struct terminal *term)
} }
else { else {
render_margin(term, buf, 0, term->rows); render_margin(term, buf, 0, term->rows, true, true);
term_damage_view(term); term_damage_view(term);
} }