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

Merge branch 'search-fix-rendering-of-combining-characters-with-positive-x-offsets'

Browse source
This commit is contained in:
Daniel Eklöf 2021-01-26 19:30:02 +01:00
commit 27f9972880
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -93,6 +93,7 @@
* Scrollback search not matching composed characters. * Scrollback search not matching composed characters.
* High CPU usage when holding down e.g. arrow keys while in scrollback * High CPU usage when holding down e.g. arrow keys while in scrollback
search mode. search mode.
* Rendering of composed characters in the scrollback search box.
### Security ### Security

10
render.c
View file

@ -2237,7 +2237,7 @@ render_search_box(struct terminal *term)
/* Calculate the width of each character */ /* Calculate the width of each character */
int widths[text_len + 1]; int widths[text_len + 1];
for (size_t i = 0; i < text_len; i++) for (size_t i = 0; i < text_len; i++)
widths[i] = max(1, wcwidth(text[i])); widths[i] = max(0, wcwidth(text[i]));
widths[text_len] = 0; widths[text_len] = 0;
const size_t total_cells = wcswidth(text, text_len); const size_t total_cells = wcswidth(text, text_len);
@ -2429,10 +2429,16 @@ render_search_box(struct terminal *term)
x + x_ofs + glyph->x, y + font_baseline(term) - glyph->y, x + x_ofs + glyph->x, y + font_baseline(term) - glyph->y,
glyph->width, glyph->height); glyph->width, glyph->height);
} else { } else {
int combining_ofs = width == 0
? (glyph->x < 0
? width * term->cell_width
: (width - 1) * term->cell_width)
: 0; /* Not a zero-width character - no additional offset */
pixman_image_t *src = pixman_image_create_solid_fill(&fg); pixman_image_t *src = pixman_image_create_solid_fill(&fg);
pixman_image_composite32( pixman_image_composite32(
PIXMAN_OP_OVER, src, glyph->pix, buf->pix[0], 0, 0, 0, 0, PIXMAN_OP_OVER, src, glyph->pix, buf->pix[0], 0, 0, 0, 0,
x + x_ofs + glyph->x, y + font_baseline(term) - glyph->y, x + x_ofs + combining_ofs + glyph->x,
y + font_baseline(term) - glyph->y,
glyph->width, glyph->height); glyph->width, glyph->height);
pixman_image_unref(src); pixman_image_unref(src);
} }