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

Handle arrange after view unmap/destroy properly

Browse source
This commit is contained in:
Isaac Freund 2020-03-26 21:43:02 +01:00
parent d787e2c2cc
commit 647545d9fb
No known key found for this signature in database
GPG key ID: 86DED400DDFD7A11
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/view.zig
View file

@ -107,31 +107,32 @@ pub const View = struct {
const view = @fieldParentPtr(View, "listen_map", listener.?); const view = @fieldParentPtr(View, "listen_map", listener.?);
view.mapped = true; view.mapped = true;
view.focus(view.wlr_xdg_surface.surface); view.focus(view.wlr_xdg_surface.surface);
view.root.arrange();
const node = @fieldParentPtr(std.TailQueue(View).Node, "data", view); const node = @fieldParentPtr(std.TailQueue(View).Node, "data", view);
view.root.unmapped_views.remove(node); view.root.unmapped_views.remove(node);
view.root.views.prepend(node); view.root.views.prepend(node);
view.root.arrange();
} }
fn handleUnmap(listener: ?*c.wl_listener, data: ?*c_void) callconv(.C) void { fn handleUnmap(listener: ?*c.wl_listener, data: ?*c_void) callconv(.C) void {
const view = @fieldParentPtr(View, "listen_unmap", listener.?); const view = @fieldParentPtr(View, "listen_unmap", listener.?);
view.mapped = false; view.mapped = false;
const node = @fieldParentPtr(std.TailQueue(View).Node, "data", view);
view.root.views.remove(node);
view.root.unmapped_views.prepend(node);
view.root.arrange();
} }
fn handleDestroy(listener: ?*c.wl_listener, data: ?*c_void) callconv(.C) void { fn handleDestroy(listener: ?*c.wl_listener, data: ?*c_void) callconv(.C) void {
const view = @fieldParentPtr(View, "listen_destroy", listener.?); const view = @fieldParentPtr(View, "listen_destroy", listener.?);
const root = view.root; const root = view.root;
var it = root.views.first; const node = @fieldParentPtr(std.TailQueue(View).Node, "data", view);
const target = while (it) |node| : (it = node.next) { root.unmapped_views.remove(node);
if (&node.data == view) { root.unmapped_views.destroyNode(node, root.server.allocator);
break node;
}
} else unreachable;
root.views.remove(target);
root.views.destroyNode(target, root.server.allocator);
} }
fn handleCommit(listener: ?*c.wl_listener, data: ?*c_void) callconv(.C) void { fn handleCommit(listener: ?*c.wl_listener, data: ?*c_void) callconv(.C) void {