aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2026-03-10 06:46:03 +0000
committerDaniel Eklöf <daniel@ekloef.se>2026-03-10 07:25:08 +0000
commit657db18a4ec4df93689c3eaae03b70f851724001 (patch)
treedbbc4cc9b4b895a1c66305ab5686bfb20fddfbd9
parentmeson: clang: add -Wno-wc2y-extensions (diff)
wayland: do all surface unmap and roundtrips before waiting for pre-apply damage
The pre-apply damage thread may be running when we destroy a terminal instance, and we need to wait for it to finish before destroying the underlying buffer. c291194a4e593bbbb91420e81fa0111508084448 did this, but failed to realize the thread may get re-started in the roundtrips done later in wayl_win_destroy(); after the wait added in c291194a4e593bbbb91420e81fa0111508084448, we unmap all surfaces (including the main grid), and roundtrip. This means the compositor will release the currently active buffer, and that means _we_ will trigger the pre-apply damage thread on it. This introduces a race, where wayl_win_destroy() may reach its shm_purge() calls before the pre-apply damage thread has finished. That typically causes foot to crash. Closes #2288
-rw-r--r--CHANGELOG.md3
-rw-r--r--wayland.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 30a73369..30b3e1e4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -77,8 +77,11 @@
* Wrong documented default value for `initial-color-theme` in
`foot.ini(5)` ([#2292][2292]).
+* Occasional crashes when closing a window and
+ `tweak.pre-apply-damage=yes` (the default) ([#2288][2288]).
[2292]: https://codeberg.org/dnkl/foot/issues/2292
+[2288]: https://codeberg.org/dnkl/foot/issues/2288
### Security
diff --git a/wayland.c b/wayland.c
index 1d258213..1ffd62a6 100644
--- a/wayland.c
+++ b/wayland.c
@@ -2177,8 +2177,6 @@ wayl_win_destroy(struct wl_window *win)
struct terminal *term = win->term;
- render_wait_for_preapply_damage(term);
-
if (win->csd.move_timeout_fd != -1)
close(win->csd.move_timeout_fd);
@@ -2236,6 +2234,8 @@ wayl_win_destroy(struct wl_window *win)
tll_remove(win->urls, it);
}
+ render_wait_for_preapply_damage(term);
+
csd_destroy(win);
wayl_win_subsurface_destroy(&win->search);
wayl_win_subsurface_destroy(&win->scrollback_indicator);