zig/mach
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wip: wayland resize
Some checks are pending
CI / x86_64-linux (push) Waiting to run
Details
CI / x86_64-windows (push) Waiting to run
Details
CI / x86_64-macos (push) Waiting to run
Details

Browse source
This commit is contained in:
icefox 2026-01-10 10:26:37 -03:00
parent cfd9fc8ff0
commit bf291b79cb
No known key found for this signature in database
1 changed files with 36 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/core/linux/Wayland.zig
View file

@ -173,9 +173,6 @@ pub fn initWindow(
return error.ListenerHasAlreadyBeenSet; return error.ListenerHasAlreadyBeenSet;
} }
// Wait for events to get pushed
_ = libwaylandclient.?.wl_display_roundtrip(wl.display);
core_window = core.windows.getValue(window_id); core_window = core.windows.getValue(window_id);
wl = &core_window.native.?.wayland; wl = &core_window.native.?.wayland;
@ -203,10 +200,16 @@ pub fn initWindow(
// Commit changes to surface // Commit changes to surface
c.wl_surface_commit(wl.surface); c.wl_surface_commit(wl.surface);
_ = libwaylandclient.?.wl_display_roundtrip(wl.display); // _ = libwaylandclient.?.wl_display_roundtrip(wl.display);
// // Wait for events to get pushed
// _ = libwaylandclient.?.wl_display_roundtrip(wl.display);
core.windows.setValue(window_id, core_window); core.windows.setValue(window_id, core_window);
try core.initWindow(window_id); try core.initWindow(window_id);
_ = libwaylandclient.?.wl_display_roundtrip(wl.display);
core_window = core.windows.getValue(window_id);
core.windows.setValue(window_id, core_window);
} }
pub fn tick(window_id: mach.ObjectID) !void { pub fn tick(window_id: mach.ObjectID) !void {
@ -805,15 +808,40 @@ const xdg_surface_listener = struct {
var core_window = core_ptr.windows.getValue(window_id); var core_window = core_ptr.windows.getValue(window_id);
const wl = &core_window.native.?.wayland; const wl = &core_window.native.?.wayland;
if (wl.configured) { if (!wl.configured) {
c.wl_surface_commit(wl.surface); std.log.debug("not configure\n", .{});
} else {
wl.configured = true; wl.configured = true;
core_ptr.windows.setValue(window_id, core_window); core_ptr.windows.setValue(window_id, core_window);
core_window = core_ptr.windows.getValue(window_id); // core_window = core_ptr.windows.getValue(window_id);
return;
} }
setContentAreaOpaque(wl, Core.Size{ .width = core_window.width, .height = core_window.height }); setContentAreaOpaque(wl, Core.Size{ .width = core_window.width, .height = core_window.height });
std.log.debug("configure\n", .{});
if (core_window.framebuffer_width != core_window.width or core_window.framebuffer_height != core_window.height) {
std.log.debug("recreating\n", .{});
core_window.framebuffer_width = core_window.width;
core_window.framebuffer_height = core_window.height;
core_window.swap_chain_descriptor.width = core_window.framebuffer_width;
core_window.swap_chain_descriptor.height = core_window.framebuffer_height;
core_window.swap_chain.release();
core_window.swap_chain = core_window.device.createSwapChain(core_window.surface, &core_window.swap_chain_descriptor);
core_ptr.windows.setValueRaw(window_id, core_window);
core_ptr.pushEvent(.{
.window_resize = .{
.window_id = window_id,
.size = .{
.width = core_window.width,
.height = core_window.height,
},
},
});
}
c.wl_surface_commit(wl.surface);
} }
const listener = c.xdg_surface_listener{ .configure = @ptrCast(&xdgSurfaceHandleConfigure) }; const listener = c.xdg_surface_listener{ .configure = @ptrCast(&xdgSurfaceHandleConfigure) };