2 files changed, 29 insertions, 17 deletions

diff --git a/crates/wayland/src/state/layers.rs b/crates/wayland/src/state/layers.rs
index 34db3f1..ee4c022 100644
--- a/crates/wayland/src/state/layers.rs
+++ b/crates/wayland/src/state/layers.rs
@@ -61,29 +61,13 @@ impl CompState {
         }
         let has_buffer = with_renderer_surface_state(surface, |state: &mut RendererSurfaceState| state.buffer().is_some()).unwrap_or(false);
 
-        // TEMPORARY diagnostic for the "AGS dock reserves its exclusive
-        // zone but never paints" investigation, relayed from the AGS peer
-        // session - this function's own `has_buffer`-based hide/show logic
-        // (see the doc comment above) is the leading suspect: if a client
-        // ever legitimately commits a null buffer for a reason other than
-        // an intentional hide (an internal `Gtk.Revealer` transition
-        // artifact, a resize-in-progress commit), this treats it as a hide,
-        // `unmap_layer`s it, and requires a *later* has-buffer commit to
-        // ever come back - which would look exactly like this symptom if
-        // the client's own state machine doesn't expect the compositor to
-        // have done that and never re-triggers one. Logs every call for
-        // every layer surface, not just suspected ones, since which
-        // surface is actually affected isn't confirmed yet. Remove once
-        // resolved.
-        log::warn!("LAYER-VIS-DIAG surface={:?} has_buffer={has_buffer} already_hidden={}", surface.id(), self.hidden_layer_surfaces.contains_key(surface));
-
         if has_buffer {
+            self.layer_surfaces_shown_once.insert(surface.clone());
             let Some((output, layer)) = self.hidden_layer_surfaces.remove(surface) else { return };
             let mut map = layer_map_for_output(&output);
             let zone_before = map.non_exclusive_zone();
             let _ = map.map_layer(&layer);
             let zone_after = map.non_exclusive_zone();
-            log::warn!("LAYER-VIS-DIAG re-mapped namespace={:?} zone_before={zone_before:?} zone_after={zone_after:?}", layer.namespace());
             if zone_after != zone_before {
                 self.pending.borrow_mut().push(CoreEvent::MonitorAdded(srdwm_core::Monitor::new(0, "", srdwm_core::Rect::new(0, 0, 0, 0))));
             }
@@ -93,6 +77,13 @@ impl CompState {
         if self.hidden_layer_surfaces.contains_key(surface) {
             return;
         }
+        // A commit with no buffer on a surface that has never shown one
+        // yet is the ack-configure step of realization, not a hide - see
+        // `layer_surfaces_shown_once`'s own doc comment. Only a surface
+        // that has genuinely been visible at least once can be hidden.
+        if !self.layer_surfaces_shown_once.contains(surface) {
+            return;
+        }
         for output in self.outputs().cloned().collect::<Vec<_>>() {
             let mut map = layer_map_for_output(&output);
             let Some(layer) = map.layers().find(|l| l.wl_surface() == surface).cloned() else { continue };
diff --git a/crates/wayland/src/state/mod.rs b/crates/wayland/src/state/mod.rs
index e5b4d6a..5643ebc 100644
--- a/crates/wayland/src/state/mod.rs
+++ b/crates/wayland/src/state/mod.rs
@@ -303,6 +303,27 @@ pub(crate) struct CompState {
     /// again on its own - this is the only way `sync_layer_visibility`
     /// can re-map it once the client commits real content again.
     pub(crate) hidden_layer_surfaces: HashMap<WlSurface, (smithay::output::Output, smithay::desktop::LayerSurface)>,
+    /// Layer surfaces `sync_layer_visibility` has seen commit an actual
+    /// buffer at least once. A layer-shell client's realization sequence is
+    /// (commit with no buffer -> receive configure -> commit with no buffer
+    /// again to ack it -> *then* attach and commit real content), and that
+    /// middle ack-commit is indistinguishable from a real "hide" (a null-
+    /// buffer commit on an already-visible surface) by buffer-presence
+    /// alone - both are "committed, no buffer". Without this, every
+    /// layer-shell surface's very first realization spuriously unmapped and
+    /// immediately remapped itself through `sync_layer_visibility`, doubling
+    /// the number of `LayerMap::arrange()` passes on every single popup
+    /// open (confirmed live: an AGS popup toggle logged unmapped/re-mapped
+    /// within the same ~300ms window every time) and giving a second,
+    /// needless remap for `arrange()`'s zone/size math to disagree with
+    /// itself across - the leading suspect for a live-reproduced bug where
+    /// a full-monitor click-catcher popup's hit-tested geometry came back
+    /// wider than the real output after several open/close cycles. Real
+    /// hides (a role kept alive, buffer later reattached) still work:
+    /// `sync_layer_visibility`'s own `has_buffer` branch inserts here before
+    /// this set is ever consulted, so a surface only reaches the unmap path
+    /// once it has legitimately shown something.
+    pub(crate) layer_surfaces_shown_once: HashSet<WlSurface>,
     pub(crate) decorations: HashMap<WindowId, MemoryRenderBuffer>,
     /// The top border strip's rounded-corner bitmap, cached the same way
     /// and at the same trigger points as `decorations` (built in