aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-07-14 17:55:23 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-07-14 17:56:11 +0000
commit0c777d825da92778233cbec1a9c659429ee1e20c (patch)
treecd0c28ccdc56f08a3cc5a98ec5a326683b9a8ffb
parentchangelog: box-drawing fixes on big-endian (diff)
Revert "render: don’t assume PIXMAN_a8r8g8b8 for color glyphs"
This reverts commit 9b4796e996a6b524718591df8d8ea1ebe3b9bbbd. Sub-pixel anti-aliasing also uses 32-bit glyphs (but x8r8g8b8, instead of a8r8g8b8)...
-rw-r--r--render.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/render.c b/render.c
index 81fe481d..80d5efb5 100644
--- a/render.c
+++ b/render.c
@@ -682,7 +682,7 @@ render_cell(struct terminal *term, pixman_image_t *pix,
if (i > 0 && glyph->x >= 0)
g_x -= term->cell_width;
- if (unlikely(PIXMAN_FORMAT_BPP(pixman_image_get_format(glyph->pix)) == 32)) {
+ if (unlikely(pixman_image_get_format(glyph->pix) == PIXMAN_a8r8g8b8)) {
/* Glyph surface is a pre-rendered image (typically a color emoji...) */
if (!(cell->attrs.blink && term->blink.state == BLINK_OFF)) {
pixman_image_composite32(
@@ -2801,7 +2801,7 @@ render_search_box(struct terminal *term)
continue;
}
- if (unlikely(PIXMAN_FORMAT_BPP(pixman_image_get_format(glyph->pix)) == 32)) {
+ if (unlikely(pixman_image_get_format(glyph->pix) == PIXMAN_a8r8g8b8)) {
/* Glyph surface is a pre-rendered image (typically a color emoji...) */
pixman_image_composite32(
PIXMAN_OP_OVER, glyph->pix, NULL, buf->pix[0], 0, 0, 0, 0,