steven/beansprout-custom
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Try again when wl_display.flush() returns EAGAIN

Browse source 
This was causing us to exist when we probably shouldn't have been.
I think the main issue was all the syncNextCommit calls for the bar.

These changes have seeminglly fixed my crash
This commit is contained in:
Ben Buhse 2026-02-27 13:39:08 -06:00
commit f10eecffc4
No known key found for this signature in database
GPG key ID: 7916ACFCD38FD0B4
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Bar.zig
View file

@ -319,8 +319,6 @@ pub fn draw(bar: *Bar) !void {
// Attach the buffer to the surface // Attach the buffer to the surface
const surfaces = bar.surfaces orelse return error.NoSurfaces; const surfaces = bar.surfaces orelse return error.NoSurfaces;
const wl_surface = surfaces.wl_surface; const wl_surface = surfaces.wl_surface;
// sync_next_commit ensures frame-perfect application
surfaces.river_shell_surface.syncNextCommit();
wl_surface.setBufferScale(scale); wl_surface.setBufferScale(scale);
wl_surface.attach(buffer.wl_buffer, 0, 0); wl_surface.attach(buffer.wl_buffer, 0, 0);
wl_surface.damageBuffer(0, 0, render_width, render_height); wl_surface.damageBuffer(0, 0, render_width, render_height);

13
src/main.zig
View file

@ -124,9 +124,16 @@ fn run(wl_display: *wl.Display, context: *Context) !void {
}; };
while (true) { while (true) {
const errno = wl_display.flush(); const flush_errno = wl_display.flush();
if (errno != .SUCCESS) { if (flush_errno == .AGAIN) {
fatal("wl_display flush failed: E{s}", .{@tagName(errno)}); // Send buffer is full; ask poll to wake us when the socket is writable
// again so we can retry the flush at the top of the next iteration.
pollfds[poll_wayland].events = posix.POLL.IN | posix.POLL.OUT;
} else if (flush_errno != .SUCCESS) {
fatal("wl_display flush failed: E{s}", .{@tagName(flush_errno)});
} else {
// Flush succeeded; stop polling for writability.
pollfds[poll_wayland].events = posix.POLL.IN;
} }
// Get the number of milliseconds to the top of the next second // Get the number of milliseconds to the top of the next second