aboutsummaryrefslogtreecommitdiff
path: root/render.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2025-01-03 07:00:53 +0000
committerDaniel Eklöf <daniel@ekloef.se>2025-01-03 07:00:53 +0000
commitb66a076bf1c0398521315c52ed77d3d7fa1a222f (patch)
tree3af0b7902ff9b67a304e6f2e599df45dc06bead9 /render.c
parentmeson: bump version to 1.20.0 (diff)
parentrender: fix order we're checking custom codepoints (diff)
Merge branch 'master' into releases/1.20
Diffstat (limited to 'render.c')
-rw-r--r--render.c31
1 files changed, 26 insertions, 5 deletions
diff --git a/render.c b/render.c
index ed6b802e..5a924743 100644
--- a/render.c
+++ b/render.c
@@ -817,14 +817,14 @@ render_cell(struct terminal *term, pixman_image_t *pix, pixman_region32_t *damag
size_t count;
size_t idx;
- if (base >= GLYPH_OCTANTS_FIRST) {
- arr = &term->custom_glyphs.octants;
- count = GLYPH_OCTANTS_COUNT;
- idx = base - GLYPH_OCTANTS_FIRST;
- } else if (base >= GLYPH_LEGACY_FIRST) {
+ if (base >= GLYPH_LEGACY_FIRST) {
arr = &term->custom_glyphs.legacy;
count = GLYPH_LEGACY_COUNT;
idx = base - GLYPH_LEGACY_FIRST;
+ } else if (base >= GLYPH_OCTANTS_FIRST) {
+ arr = &term->custom_glyphs.octants;
+ count = GLYPH_OCTANTS_COUNT;
+ idx = base - GLYPH_OCTANTS_FIRST;
} else if (base >= GLYPH_BRAILLE_FIRST) {
arr = &term->custom_glyphs.braille;
count = GLYPH_BRAILLE_COUNT;
@@ -1898,6 +1898,27 @@ render_overlay(struct terminal *term)
break;
case OVERLAY_FLASH:
+ /*
+ * A compositor will not send a frame callback for our main
+ * window if it is fully occluded (for example, by a fully
+ * opaque overlay...). This causes the overlay to stuck.
+ *
+ * For regular buffers, it _should_ be enough to *not* hint
+ * the compositor it's opaque. But at least some compositor
+ * special cases single-pixel buffers, and actually look at
+ * their pixel value.
+ *
+ * Thus, we have two options: implement frame callback
+ * handling for the overlay sub-surface, or ensure we don't
+ * use a fully opaque surface. Since no overlays are fully
+ * opaque by default, and the flash surface is the only one
+ * that can be configured to be opaque (colors.flash-alpha),
+ * and since adding frame callback handling adds a lot of
+ * boilerplate code... let's go with the simpler solution of
+ * not allowing colors.flash-alpha to be 1.0.
+ */
+ xassert(term->conf->colors.flash_alpha != 0xffff);
+
color = color_hex_to_pixman_with_alpha(
term->conf->colors.flash,
term->conf->colors.flash_alpha);