Deduplicate some state

1 files changed, 5 insertions, 9 deletions

diff --git a/src/layer_surface.zig b/src/layer_surface.zig
index 38af53a..aa73217 100644
--- a/src/layer_surface.zig
+++ b/src/layer_surface.zig
@@ -11,9 +11,6 @@ pub const LayerSurface = struct {
     output: *Output,
     wlr_layer_surface: *c.wlr_layer_surface_v1,
 
-    /// True if the layer surface is currently mapped
-    mapped: bool,
-
     box: Box,
     layer: c.zwlr_layer_shell_v1_layer,
 
@@ -36,8 +33,6 @@ pub const LayerSurface = struct {
         self.wlr_layer_surface = wlr_layer_surface;
         wlr_layer_surface.data = self;
 
-        self.mapped = false;
-
         self.box = undefined;
         self.layer = layer;
 
@@ -79,8 +74,6 @@ pub const LayerSurface = struct {
 
         Log.Debug.log("Layer surface '{}' mapped.", .{wlr_layer_surface.namespace});
 
-        self.mapped = true;
-
         // Add listeners that are only active while mapped
         self.listen_commit.notify = handleCommit;
         c.wl_signal_add(&wlr_layer_surface.surface.*.events.commit, &self.listen_commit);
@@ -101,8 +94,6 @@ pub const LayerSurface = struct {
 
         Log.Debug.log("Layer surface '{}' unmapped.", .{self.wlr_layer_surface.namespace});
 
-        self.mapped = false;
-
         // remove listeners only active while the layer surface is mapped
         c.wl_list_remove(&self.listen_commit.link);
         c.wl_list_remove(&self.listen_new_popup.link);
@@ -118,6 +109,11 @@ pub const LayerSurface = struct {
             }
         }
 
+        // Slight hack: This is automatically set to false by wlroots after
+        // this callback is exited, but we need it set to false before calling
+        // arrangeLayers() to avoid a crash.
+        self.wlr_layer_surface.mapped = false;
+
         // This gives exclusive focus to a keyboard interactive top or overlay layer
         // surface if there is one.
         self.output.arrangeLayers();