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

render: render_margin(): remove top/bottom arguments

Browse source 
All calls to render_margin() set top=true and bottom=true anyway.
This commit is contained in:
Daniel Eklöf 2020-07-13 14:03:58 +02:00
parent 9f21799cb2
commit 0336f47f05
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 20 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

44
render.c
View file

@ -503,8 +503,8 @@ 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,
bool top, bool bottom) int start_line, int end_line)
{ {
/* Fill area outside the cell grid with the default background color */ /* Fill area outside the cell grid with the default background color */
const int rmargin = term->width - term->margins.right; const int rmargin = term->width - term->margins.right;
@ -517,25 +517,15 @@ render_margin(struct terminal *term, struct buffer *buf, int start_line, int end
if (term->is_searching) if (term->is_searching)
color_dim(&bg); color_dim(&bg);
if (top) {
pixman_image_fill_rectangles(
PIXMAN_OP_SRC, buf->pix[0], &bg, 1,
&(pixman_rectangle16_t){0, 0, term->width, term->margins.top});
wl_surface_damage_buffer(
term->window->surface, 0, 0, term->width, term->margins.top);
}
if (bottom) {
pixman_image_fill_rectangles(
PIXMAN_OP_SRC, buf->pix[0], &bg, 1,
&(pixman_rectangle16_t){0, bmargin, term->width, term->margins.bottom});
wl_surface_damage_buffer(
term->window->surface, 0, bmargin, term->width, term->margins.bottom);
}
pixman_image_fill_rectangles( pixman_image_fill_rectangles(
PIXMAN_OP_SRC, buf->pix[0], &bg, 2, PIXMAN_OP_SRC, buf->pix[0], &bg, 4,
(pixman_rectangle16_t[]){ (pixman_rectangle16_t[]){
/* Top */
{0, 0, term->width, term->margins.top},
/* Bottom */
{0, bmargin, term->width, term->margins.bottom},
/* Left */ /* Left */
{0, term->margins.top + start_line * term->cell_height, {0, term->margins.top + start_line * term->cell_height,
term->margins.left, line_count * term->cell_height}, term->margins.left, line_count * term->cell_height},
@ -545,6 +535,14 @@ render_margin(struct terminal *term, struct buffer *buf, int start_line, int end
term->margins.right, line_count * term->cell_height}, term->margins.right, line_count * term->cell_height},
}); });
/* Top */
wl_surface_damage_buffer(
term->window->surface, 0, 0, term->width, term->margins.top);
/* Bottom */
wl_surface_damage_buffer(
term->window->surface, 0, bmargin, term->width, term->margins.bottom);
/* Left */ /* Left */
wl_surface_damage_buffer( wl_surface_damage_buffer(
term->window->surface, term->window->surface,
@ -633,8 +631,7 @@ grid_render_scroll(struct terminal *term, struct buffer *buf,
if (did_shm_scroll) { if (did_shm_scroll) {
/* Restore margins */ /* Restore margins */
render_margin( render_margin(
term, buf, dmg->region.end - dmg->lines, term->rows, term, buf, dmg->region.end - dmg->lines, term->rows);
true, true);
} else { } else {
/* Fallback for when we either cannot do SHM scrolling, or it failed */ /* Fallback for when we either cannot do SHM scrolling, or it failed */
uint8_t *raw = buf->mmapped; uint8_t *raw = buf->mmapped;
@ -699,8 +696,7 @@ grid_render_scroll_reverse(struct terminal *term, struct buffer *buf,
if (did_shm_scroll) { if (did_shm_scroll) {
/* Restore margins */ /* Restore margins */
render_margin( render_margin(
term, buf, dmg->region.start, dmg->region.start + dmg->lines, term, buf, dmg->region.start, dmg->region.start + dmg->lines);
true, true);
} else { } else {
/* Fallback for when we either cannot do SHM scrolling, or it failed */ /* Fallback for when we either cannot do SHM scrolling, or it failed */
uint8_t *raw = buf->mmapped; uint8_t *raw = buf->mmapped;
@ -1341,7 +1337,7 @@ grid_render(struct terminal *term)
else { else {
tll_free(term->grid->scroll_damage); tll_free(term->grid->scroll_damage);
render_margin(term, buf, 0, term->rows, true, true); render_margin(term, buf, 0, term->rows);
term_damage_view(term); term_damage_view(term);
} }