aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md5
-rw-r--r--render.c17
-rw-r--r--shm.c84
-rw-r--r--shm.h5
-rw-r--r--sixel.c4
-rw-r--r--wayland.c3
-rw-r--r--wayland.h3
7 files changed, 42 insertions, 79 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6fa7439e..0462666c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -92,6 +92,11 @@
contains at least one upper case character.
* Mouse tracking in SGR pixel mode no longer emits negative column/row
pixel values ([#2226][2226]).
+* Foot now always uses ARGB SHM surfaces. In earlier versions, XRGB
+ surfaces were used for opaque surfaces. Unfortunately, several
+ compositors had issues when foot switched between ARGB and XRGB
+ surfaces (for example when switching color theme, or toggling
+ fullscreen).
[2202]: https://codeberg.org/dnkl/foot/issues/2202
[2226]: https://codeberg.org/dnkl/foot/issues/2226
diff --git a/render.c b/render.c
index ac8ece37..86244434 100644
--- a/render.c
+++ b/render.c
@@ -2012,7 +2012,7 @@ render_overlay(struct terminal *term)
}
struct buffer *buf = shm_get_buffer(
- term->render.chains.overlay, term->width, term->height, true);
+ term->render.chains.overlay, term->width, term->height);
pixman_image_set_clip_region32(buf->pix[0], NULL);
/* Bounding rectangle of damaged areas - for wl_surface_damage_buffer() */
@@ -2970,7 +2970,7 @@ render_csd(struct terminal *term)
}
struct buffer *bufs[CSD_SURF_COUNT];
- shm_get_many(term->render.chains.csd, CSD_SURF_COUNT, widths, heights, bufs, true);
+ shm_get_many(term->render.chains.csd, CSD_SURF_COUNT, widths, heights, bufs);
for (size_t i = CSD_SURF_LEFT; i <= CSD_SURF_BOTTOM; i++)
render_csd_border(term, i, &infos[i], bufs[i]);
@@ -3110,7 +3110,7 @@ render_scrollback_position(struct terminal *term)
}
struct buffer_chain *chain = term->render.chains.scrollback_indicator;
- struct buffer *buf = shm_get_buffer(chain, width, height, false);
+ struct buffer *buf = shm_get_buffer(chain, width, height);
wl_subsurface_set_position(
win->scrollback_indicator.sub, roundf(x / scale), roundf(y / scale));
@@ -3153,7 +3153,7 @@ render_render_timer(struct terminal *term, struct timespec render_time)
height = roundf(scale * ceilf(height / scale));
struct buffer_chain *chain = term->render.chains.render_timer;
- struct buffer *buf = shm_get_buffer(chain, width, height, false);
+ struct buffer *buf = shm_get_buffer(chain, width, height);
wl_subsurface_set_position(
win->render_timer.sub,
@@ -3336,10 +3336,7 @@ grid_render(struct terminal *term)
xassert(term->height > 0);
struct buffer_chain *chain = term->render.chains.grid;
- bool use_alpha = !term->window->is_fullscreen &&
- term->colors.alpha != 0xffff;
- struct buffer *buf = shm_get_buffer(
- chain, term->width, term->height, use_alpha);
+ struct buffer *buf = shm_get_buffer(chain, term->width, term->height);
/* Dirty old and current cursor cell, to ensure they're repainted */
dirty_old_cursor(term);
@@ -3787,7 +3784,7 @@ render_search_box(struct terminal *term)
size_t glyph_offset = term->render.search_glyph_offset;
struct buffer_chain *chain = term->render.chains.search;
- struct buffer *buf = shm_get_buffer(chain, width, height, true);
+ struct buffer *buf = shm_get_buffer(chain, width, height);
pixman_region32_t clip;
pixman_region32_init_rect(&clip, 0, 0, width, height);
@@ -4252,7 +4249,7 @@ render_urls(struct terminal *term)
struct buffer_chain *chain = term->render.chains.url;
struct buffer *bufs[render_count];
- shm_get_many(chain, render_count, widths, heights, bufs, false);
+ shm_get_many(chain, render_count, widths, heights, bufs);
uint32_t fg = term->conf->colors_dark.use_custom.jump_label
? term->conf->colors_dark.jump_label.fg
diff --git a/shm.c b/shm.c
index f488d6b6..5c1573ad 100644
--- a/shm.c
+++ b/shm.c
@@ -84,7 +84,6 @@ struct buffer_private {
struct buffer_pool *pool;
off_t offset; /* Offset into memfd where data begins */
size_t size;
- bool with_alpha;
bool scrollable;
@@ -98,11 +97,8 @@ struct buffer_chain {
size_t pix_instances;
bool scrollable;
- pixman_format_code_t pixman_fmt_without_alpha;
- enum wl_shm_format shm_format_without_alpha;
-
- pixman_format_code_t pixman_fmt_with_alpha;
- enum wl_shm_format shm_format_with_alpha;
+ pixman_format_code_t pixman_fmt;
+ enum wl_shm_format shm_format;
void (*release_cb)(struct buffer *buf, void *data);
void *cb_data;
@@ -285,9 +281,7 @@ instantiate_offset(struct buffer_private *buf, off_t new_offset)
wl_buf = wl_shm_pool_create_buffer(
pool->wl_pool, new_offset,
buf->public.width, buf->public.height, buf->public.stride,
- buf->with_alpha
- ? buf->chain->shm_format_with_alpha
- : buf->chain->shm_format_without_alpha);
+ buf->chain->shm_format);
if (wl_buf == NULL) {
LOG_ERR("failed to create SHM buffer");
@@ -297,9 +291,7 @@ instantiate_offset(struct buffer_private *buf, off_t new_offset)
/* One pixman image for each worker thread (do we really need multiple?) */
for (size_t i = 0; i < buf->public.pix_instances; i++) {
pix[i] = pixman_image_create_bits_no_clear(
- buf->with_alpha
- ? buf->chain->pixman_fmt_with_alpha
- : buf->chain->pixman_fmt_without_alpha,
+ buf->chain->pixman_fmt,
buf->public.width, buf->public.height,
(uint32_t *)mmapped, buf->public.stride);
@@ -334,8 +326,7 @@ err:
static void NOINLINE
get_new_buffers(struct buffer_chain *chain, size_t count,
int widths[static count], int heights[static count],
- struct buffer *bufs[static count], bool with_alpha,
- bool immediate_purge)
+ struct buffer *bufs[static count], bool immediate_purge)
{
xassert(count == 1 || !chain->scrollable);
/*
@@ -354,10 +345,7 @@ get_new_buffers(struct buffer_chain *chain, size_t count,
size_t total_size = 0;
for (size_t i = 0; i < count; i++) {
stride[i] = stride_for_format_and_width(
- with_alpha
- ? chain->pixman_fmt_with_alpha
- : chain->pixman_fmt_without_alpha,
- widths[i]);
+ chain->pixman_fmt, widths[i]);
if (min_stride_alignment > 0) {
const size_t m = min_stride_alignment;
@@ -521,7 +509,6 @@ get_new_buffers(struct buffer_chain *chain, size_t count,
.chain = chain,
.ref_count = immediate_purge ? 0 : 1,
.busy = true,
- .with_alpha = with_alpha,
.pool = pool,
.offset = 0,
.size = sizes[i],
@@ -593,13 +580,13 @@ shm_did_not_use_buf(struct buffer *_buf)
void
shm_get_many(struct buffer_chain *chain, size_t count,
int widths[static count], int heights[static count],
- struct buffer *bufs[static count], bool with_alpha)
+ struct buffer *bufs[static count])
{
- get_new_buffers(chain, count, widths, heights, bufs, with_alpha, true);
+ get_new_buffers(chain, count, widths, heights, bufs, true);
}
struct buffer *
-shm_get_buffer(struct buffer_chain *chain, int width, int height, bool with_alpha)
+shm_get_buffer(struct buffer_chain *chain, int width, int height)
{
LOG_DBG(
"chain=%p: looking for a reusable %dx%d buffer "
@@ -610,9 +597,7 @@ shm_get_buffer(struct buffer_chain *chain, int width, int height, bool with_alph
tll_foreach(chain->bufs, it) {
struct buffer_private *buf = it->item;
- if (buf->public.width != width || buf->public.height != height ||
- with_alpha != buf->with_alpha)
- {
+ if (buf->public.width != width || buf->public.height != height) {
LOG_DBG("purging mismatching buffer %p", (void *)buf);
if (buffer_unref_no_remove_from_chain(buf))
tll_remove(chain->bufs, it);
@@ -663,7 +648,7 @@ shm_get_buffer(struct buffer_chain *chain, int width, int height, bool with_alph
}
struct buffer *ret;
- get_new_buffers(chain, 1, &width, &height, &ret, with_alpha, false);
+ get_new_buffers(chain, 1, &width, &height, &ret, false);
return ret;
}
@@ -1009,11 +994,8 @@ shm_chain_new(struct wayland *wayl, bool scrollable, size_t pix_instances,
enum shm_bit_depth desired_bit_depth,
void (*release_cb)(struct buffer *buf, void *data), void *cb_data)
{
- pixman_format_code_t pixman_fmt_without_alpha = PIXMAN_x8r8g8b8;
- enum wl_shm_format shm_fmt_without_alpha = WL_SHM_FORMAT_XRGB8888;
-
- pixman_format_code_t pixman_fmt_with_alpha = PIXMAN_a8r8g8b8;
- enum wl_shm_format shm_fmt_with_alpha = WL_SHM_FORMAT_ARGB8888;
+ pixman_format_code_t pixman_fmt = PIXMAN_a8r8g8b8;
+ enum wl_shm_format shm_fmt = WL_SHM_FORMAT_ARGB8888;
static bool have_logged = false;
static bool have_logged_10_fallback = false;
@@ -1022,12 +1004,9 @@ shm_chain_new(struct wayland *wayl, bool scrollable, size_t pix_instances,
static bool have_logged_16_fallback = false;
if (desired_bit_depth == SHM_BITS_16) {
- if (wayl->shm_have_abgr161616 && wayl->shm_have_xbgr161616) {
- pixman_fmt_without_alpha = PIXMAN_a16b16g16r16;
- shm_fmt_without_alpha = WL_SHM_FORMAT_XBGR16161616;
-
- pixman_fmt_with_alpha = PIXMAN_a16b16g16r16;
- shm_fmt_with_alpha = WL_SHM_FORMAT_ABGR16161616;
+ if (wayl->shm_have_abgr161616) {
+ pixman_fmt = PIXMAN_a16b16g16r16;
+ shm_fmt = WL_SHM_FORMAT_ABGR16161616;
if (!have_logged) {
have_logged = true;
@@ -1045,15 +1024,10 @@ shm_chain_new(struct wayland *wayl, bool scrollable, size_t pix_instances,
}
#endif
- if (desired_bit_depth >= SHM_BITS_10 &&
- pixman_fmt_with_alpha == PIXMAN_a8r8g8b8)
- {
- if (wayl->shm_have_argb2101010 && wayl->shm_have_xrgb2101010) {
- pixman_fmt_without_alpha = PIXMAN_x2r10g10b10;
- shm_fmt_without_alpha = WL_SHM_FORMAT_XRGB2101010;
-
- pixman_fmt_with_alpha = PIXMAN_a2r10g10b10;
- shm_fmt_with_alpha = WL_SHM_FORMAT_ARGB2101010;
+ if (desired_bit_depth >= SHM_BITS_10 && pixman_fmt == PIXMAN_a8r8g8b8) {
+ if (wayl->shm_have_argb2101010) {
+ pixman_fmt = PIXMAN_a2r10g10b10;
+ shm_fmt = WL_SHM_FORMAT_ARGB2101010;
if (!have_logged) {
have_logged = true;
@@ -1061,12 +1035,9 @@ shm_chain_new(struct wayland *wayl, bool scrollable, size_t pix_instances,
}
}
- else if (wayl->shm_have_abgr2101010 && wayl->shm_have_xbgr2101010) {
- pixman_fmt_without_alpha = PIXMAN_x2b10g10r10;
- shm_fmt_without_alpha = WL_SHM_FORMAT_XBGR2101010;
-
- pixman_fmt_with_alpha = PIXMAN_a2b10g10r10;
- shm_fmt_with_alpha = WL_SHM_FORMAT_ABGR2101010;
+ else if (wayl->shm_have_abgr2101010) {
+ pixman_fmt = PIXMAN_a2b10g10r10;
+ shm_fmt = WL_SHM_FORMAT_ABGR2101010;
if (!have_logged) {
have_logged = true;
@@ -1098,11 +1069,8 @@ shm_chain_new(struct wayland *wayl, bool scrollable, size_t pix_instances,
.pix_instances = pix_instances,
.scrollable = scrollable,
- .pixman_fmt_without_alpha = pixman_fmt_without_alpha,
- .shm_format_without_alpha = shm_fmt_without_alpha,
-
- .pixman_fmt_with_alpha = pixman_fmt_with_alpha,
- .shm_format_with_alpha = shm_fmt_with_alpha,
+ .pixman_fmt = pixman_fmt,
+ .shm_format = shm_fmt,
.release_cb = release_cb,
.cb_data = cb_data,
@@ -1129,7 +1097,7 @@ shm_chain_free(struct buffer_chain *chain)
enum shm_bit_depth
shm_chain_bit_depth(const struct buffer_chain *chain)
{
- const pixman_format_code_t fmt = chain->pixman_fmt_with_alpha;
+ const pixman_format_code_t fmt = chain->pixman_fmt;
return fmt == PIXMAN_a8r8g8b8
? SHM_BITS_8
diff --git a/shm.h b/shm.h
index 84eb4386..c58a8531 100644
--- a/shm.h
+++ b/shm.h
@@ -65,8 +65,7 @@ enum shm_bit_depth shm_chain_bit_depth(const struct buffer_chain *chain);
*
* A newly allocated buffer has an age of 1234.
*/
-struct buffer *shm_get_buffer(
- struct buffer_chain *chain, int width, int height, bool with_alpha);
+struct buffer *shm_get_buffer(struct buffer_chain *chain, int width, int height);
/*
* Returns many buffers, described by 'info', all sharing the same SHM
* buffer pool.
@@ -84,7 +83,7 @@ struct buffer *shm_get_buffer(
void shm_get_many(
struct buffer_chain *chain, size_t count,
int widths[static count], int heights[static count],
- struct buffer *bufs[static count], bool with_alpha);
+ struct buffer *bufs[static count]);
void shm_did_not_use_buf(struct buffer *buf);
diff --git a/sixel.c b/sixel.c
index 07b97f46..294864fd 100644
--- a/sixel.c
+++ b/sixel.c
@@ -125,12 +125,12 @@ sixel_init(struct terminal *term, int p1, int p2, int p3)
* that assumes 32-bit pixels).
*/
if (shm_chain_bit_depth(term->render.chains.grid) >= SHM_BITS_10) {
- if (term->wl->shm_have_argb2101010 && term->wl->shm_have_xrgb2101010) {
+ if (term->wl->shm_have_argb2101010) {
term->sixel.use_10bit = true;
term->sixel.pixman_fmt = PIXMAN_a2r10g10b10;
}
- else if (term->wl->shm_have_abgr2101010 && term->wl->shm_have_xbgr2101010) {
+ else if (term->wl->shm_have_abgr2101010) {
term->sixel.use_10bit = true;
term->sixel.pixman_fmt = PIXMAN_a2b10g10r10;
}
diff --git a/wayland.c b/wayland.c
index 6785c52d..958e535d 100644
--- a/wayland.c
+++ b/wayland.c
@@ -240,11 +240,8 @@ shm_format(void *data, struct wl_shm *wl_shm, uint32_t format)
struct wayland *wayl = data;
switch (format) {
- case WL_SHM_FORMAT_XRGB2101010: wayl->shm_have_xrgb2101010 = true; break;
case WL_SHM_FORMAT_ARGB2101010: wayl->shm_have_argb2101010 = true; break;
- case WL_SHM_FORMAT_XBGR2101010: wayl->shm_have_xbgr2101010 = true; break;
case WL_SHM_FORMAT_ABGR2101010: wayl->shm_have_abgr2101010 = true; break;
- case WL_SHM_FORMAT_XBGR16161616: wayl->shm_have_xbgr161616 = true; break;
case WL_SHM_FORMAT_ABGR16161616: wayl->shm_have_abgr161616 = true; break;
}
diff --git a/wayland.h b/wayland.h
index 140c2058..1b1c1f4c 100644
--- a/wayland.h
+++ b/wayland.h
@@ -502,11 +502,8 @@ struct wayland {
bool use_shm_release;
bool shm_have_argb2101010:1;
- bool shm_have_xrgb2101010:1;
bool shm_have_abgr2101010:1;
- bool shm_have_xbgr2101010:1;
bool shm_have_abgr161616:1;
- bool shm_have_xbgr161616:1;
};
struct wayland *wayl_init(