aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2025-05-21 11:01:30 +0000
committerDaniel Eklöf <daniel@ekloef.se>2025-05-21 11:07:49 +0000
commitd26659988113662d1500f600f5c10899920a5e6b (patch)
tree705a98e63e462a1cc0a53db781bba615e8d94337
parentrender: improve CSD button positioning (diff)
wayland: configure: don't commit if we have a pending refresh
Currently, if the following occurs: 1. foot has AxB size 2. Compositor sends CxD size 3. foot detects a resize, acks and saves CxD, but doesn't redraw immediately 4. Compositor sends CxD size again (due to a toplevel state array change, for example) Then foot will detect no resize occurred, and will do an "empty" commit immediately. In this particular case that's wrong, since we're effectively acking+committing the initial AxB size. Fix by only doing the immediate commit if there's no size change **and** there's no pending refresh. Note: normally, we'd resize and refresh+commit immediately, but if we're waiting for a frame callback, then the refresh+commit will be delayed (i.e. scheduled). This is what we're checking here. Closes #2105
-rw-r--r--CHANGELOG.md4
-rw-r--r--wayland.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb478f87..fe149600 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -121,6 +121,10 @@
### Fixed
* `REP`: wrong width of repeated multi-codepoint graphemes.
+* Incorrect surface commit after a configure event, under certain
+ conditions ([#2105][2105]).
+
+[2105]: https://codeberg.org/dnkl/foot/issues/2105
### Security
diff --git a/wayland.c b/wayland.c
index 368b3be7..37fefb29 100644
--- a/wayland.c
+++ b/wayland.c
@@ -1134,7 +1134,7 @@ xdg_surface_configure(void *data, struct xdg_surface *xdg_surface,
else
term_visual_focus_out(term);
- if (!resized) {
+ if (!resized && !term->render.pending.grid) {
/*
* If we didn't resize, we won't be committing a new surface
* anytime soon. Some compositors require a commit in