Nulo/river
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

view: ensure surface_box is initailized before use

Browse source
This commit is contained in:
Isaac Freund 2021-06-14 22:37:14 +00:00
parent 37251c8758
commit 6f61ea07db
No known key found for this signature in database
GPG key ID: 86DED400DDFD7A11
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
river/XdgToplevel.zig
View file

@ -185,8 +185,6 @@ fn handleMap(listener: *wl.Listener(*wlr.XdgSurface), xdg_surface: *wlr.XdgSurfa
toplevel.events.set_title.add(&self.set_title); toplevel.events.set_title.add(&self.set_title);
toplevel.events.set_app_id.add(&self.set_app_id); toplevel.events.set_app_id.add(&self.set_app_id);
view.surface = self.xdg_surface.surface;
// Use the view's initial size centered on the output as the default // Use the view's initial size centered on the output as the default
// floating dimensions // floating dimensions
var initial_box: wlr.Box = undefined; var initial_box: wlr.Box = undefined;
@ -203,6 +201,9 @@ fn handleMap(listener: *wl.Listener(*wlr.XdgSurface), xdg_surface: *wlr.XdgSurfa
toplevel.server_pending.width = @intCast(u32, initial_box.width); toplevel.server_pending.width = @intCast(u32, initial_box.width);
toplevel.server_pending.height = @intCast(u32, initial_box.height); toplevel.server_pending.height = @intCast(u32, initial_box.height);
view.surface = self.xdg_surface.surface;
view.surface_box = Box.fromWlrBox(initial_box);
// Also use the view's "natural" size as the initial regular dimensions, // Also use the view's "natural" size as the initial regular dimensions,
// for the case that it does not get arranged by a lyaout. // for the case that it does not get arranged by a lyaout.
view.pending.box = view.float_box; view.pending.box = view.float_box;

13
river/XwaylandView.zig
View file

@ -163,11 +163,18 @@ fn handleMap(listener: *wl.Listener(*wlr.XwaylandSurface), xwayland_surface: *wl
const view = self.view; const view = self.view;
// Add listeners that are only active while mapped // Add listeners that are only active while mapped
xwayland_surface.surface.?.events.commit.add(&self.commit); const surface = xwayland_surface.surface.?;
surface.events.commit.add(&self.commit);
xwayland_surface.events.set_title.add(&self.set_title); xwayland_surface.events.set_title.add(&self.set_title);
xwayland_surface.events.set_class.add(&self.set_class); xwayland_surface.events.set_class.add(&self.set_class);
view.surface = self.xwayland_surface.surface; view.surface = surface;
self.view.surface_box = .{
.x = 0,
.y = 0,
.width = @intCast(u32, surface.current.width),
.height = @intCast(u32, surface.current.height),
};
// Use the view's "natural" size centered on the output as the default // Use the view's "natural" size centered on the output as the default
// floating dimensions // floating dimensions
@ -240,7 +247,7 @@ fn handleCommit(listener: *wl.Listener(*wlr.Surface), surface: *wlr.Surface) voi
self.view.output.damage.addWhole(); self.view.output.damage.addWhole();
self.view.surface_box = Box{ self.view.surface_box = .{
.x = 0, .x = 0,
.y = 0, .y = 0,
.width = @intCast(u32, surface.current.width), .width = @intCast(u32, surface.current.width),