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

Merge branch 'sixel-dont-shrink-below-sra-size'

Browse source
This commit is contained in:
Daniel Eklöf 2021-05-16 11:05:59 +02:00
commit a0ab4f3f1c
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -101,6 +101,8 @@
* Font underlines being positioned below the cell (and thus being * Font underlines being positioned below the cell (and thus being
invisible) for certain combinations of fonts and font sizes invisible) for certain combinations of fonts and font sizes
(https://codeberg.org/dnkl/foot/issues/503). (https://codeberg.org/dnkl/foot/issues/503).
* Sixels with transparent bottom border being resized below the size
specified in _”Set Raster Attributes”_.
### Security ### Security

12
sixel.c
View file

@ -816,7 +816,8 @@ sixel_unhook(struct terminal *term)
xassert(image.rows <= term->grid->num_rows); xassert(image.rows <= term->grid->num_rows);
xassert(image.pos.row + image.rows - 1 < term->grid->num_rows); xassert(image.pos.row + image.rows - 1 < term->grid->num_rows);
LOG_DBG("generating %dx%d pixman image at %d-%d", LOG_DBG("generating %s %dx%d pixman image at %d-%d",
image.opaque ? "opaque" : "transparent",
image.width, image.height, image.width, image.height,
image.pos.row, image.pos.row + image.rows); image.pos.row, image.pos.row + image.rows);
@ -1195,11 +1196,10 @@ decgra(struct terminal *term, uint8_t c)
ph <= term->sixel.max_height && pv <= term->sixel.max_width) ph <= term->sixel.max_height && pv <= term->sixel.max_width)
{ {
resize(term, ph, pv); resize(term, ph, pv);
if (!term->sixel.transparent_bg) {
/* This ensures the sixel’s final image size is *at /* This ensures the sixel’s final image size is *at least*
* least* this large */ * this large */
term->sixel.max_non_empty_row_no = pv - 1; term->sixel.max_non_empty_row_no = pv - 1;
}
} }
term->sixel.state = SIXEL_DECSIXEL; term->sixel.state = SIXEL_DECSIXEL;