WIP Update smithay with layer shell updates

Author: ids1024

Cargo.lock

@@ -147,4 +147,5 @@ cosmic-protocols = { git = "https://github.com/pop-os//cosmic-protocols", branch
 cosmic-client-toolkit = { git = "https://github.com/pop-os//cosmic-protocols", branch = "main" }
 
 [patch.crates-io]
-smithay = { git = "https://github.com/smithay/smithay.git", rev = "eb45814" }
+# smithay = { git = "https://github.com/smithay/smithay.git", rev = "eb45814" }
+smithay = { git = "https://github.com/ids1024/smithay", branch = "layer-shell-arrange" }

Cargo.toml

@@ -43,7 +43,9 @@ use smithay::{
     wayland::{
         compositor::{with_states, with_surface_tree_downward, SurfaceData, TraversalAction},
         seat::WaylandFocus,
-        shell::xdg::{SurfaceCachedState, ToplevelSurface, XdgToplevelSurfaceData},
+        shell::xdg::{
+            SurfaceCachedState, ToplevelCachedState, ToplevelSurface, XdgToplevelSurfaceData,
+        },
     },
     xwayland::{xwm::X11Relatable, X11Surface},
 };
@@ -216,7 +218,7 @@ impl CosmicSurface {
     pub fn is_activated(&self, pending: bool) -> bool {
         match self.0.underlying_surface() {
             WindowSurface::Wayland(toplevel) => with_toplevel_state(toplevel, pending, |state| {
-                state.states.contains(ToplevelState::Activated)
+                state.is_some_and(|state| state.states.contains(ToplevelState::Activated))
             }),
             WindowSurface::X11(surface) => surface.is_activated(),
         }
@@ -248,9 +250,11 @@ impl CosmicSurface {
                 });
 
                 let xdg_state = with_toplevel_state(toplevel, pending, |state| {
-                    state
-                        .decoration_mode
-                        .map(|mode| mode == DecorationMode::ClientSide)
+                    state.and_then(|state| {
+                        state
+                            .decoration_mode
+                            .map(|mode| mode == DecorationMode::ClientSide)
+                    })
                 });
 
                 kde_state.or(xdg_state).unwrap_or(true)
@@ -263,8 +267,9 @@ impl CosmicSurface {
         match self.0.underlying_surface() {
             WindowSurface::Wayland(toplevel) => {
                 if enable {
-                    let previous_decoration_state =
-                        toplevel.current_state().decoration_mode.clone();
+                    let previous_decoration_state = toplevel.with_committed_state(|state| {
+                        state.map_or_else(Default::default, |state| state.decoration_mode.clone())
+                    });
                     if PreferredDecorationMode::is_unset(&self.0) {
                         PreferredDecorationMode::update(&self.0, previous_decoration_state);
                     }
@@ -300,7 +305,7 @@ impl CosmicSurface {
         match self.0.underlying_surface() {
             WindowSurface::Wayland(toplevel) => {
                 Some(with_toplevel_state(toplevel, pending, |state| {
-                    state.states.contains(ToplevelState::Resizing)
+                    state.is_some_and(|state| state.states.contains(ToplevelState::Resizing))
                 }))
             }
             WindowSurface::X11(_surface) => None,
@@ -324,7 +329,7 @@ impl CosmicSurface {
         match self.0.underlying_surface() {
             WindowSurface::Wayland(toplevel) => {
                 Some(with_toplevel_state(toplevel, pending, |state| {
-                    state.states.contains(ToplevelState::TiledLeft)
+                    state.is_some_and(|state| state.states.contains(ToplevelState::TiledLeft))
                 }))
             }
             WindowSurface::X11(_surface) => None,
@@ -353,7 +358,7 @@ impl CosmicSurface {
     pub fn is_fullscreen(&self, pending: bool) -> bool {
         match self.0.underlying_surface() {
             WindowSurface::Wayland(toplevel) => with_toplevel_state(toplevel, pending, |state| {
-                state.states.contains(ToplevelState::Fullscreen)
+                state.is_some_and(|state| state.states.contains(ToplevelState::Fullscreen))
             }),
             WindowSurface::X11(surface) => surface.is_fullscreen(),
         }
@@ -377,7 +382,7 @@ impl CosmicSurface {
     pub fn is_maximized(&self, pending: bool) -> bool {
         match self.0.underlying_surface() {
             WindowSurface::Wayland(toplevel) => with_toplevel_state(toplevel, pending, |state| {
-                state.states.contains(ToplevelState::Maximized)
+                state.is_some_and(|state| state.states.contains(ToplevelState::Maximized))
             }),
             WindowSurface::X11(surface) => surface.is_maximized(),
         }
@@ -493,10 +498,9 @@ impl CosmicSurface {
                     .lock()
                     .unwrap();
                 attrs
-                    .configure_serial
+                    .last_acked
                     .as_ref()
-                    .map(|s| s >= serial)
-                    .unwrap_or(false)
+                    .is_some_and(|configure| configure.serial >= *serial)
             }),
             WindowSurface::X11(_surface) => true,
         }
@@ -505,17 +509,12 @@ impl CosmicSurface {
     pub fn serial_past(&self, serial: &Serial) -> bool {
         match self.0.underlying_surface() {
             WindowSurface::Wayland(toplevel) => with_states(toplevel.wl_surface(), |states| {
-                let attrs = states
-                    .data_map
-                    .get::<XdgToplevelSurfaceData>()
-                    .unwrap()
-                    .lock()
-                    .unwrap();
-                attrs
-                    .current_serial
+                let mut guard = states.cached_state.get::<ToplevelCachedState>();
+                guard
+                    .current()
+                    .last_acked
                     .as_ref()
-                    .map(|s| s >= serial)
-                    .unwrap_or(false)
+                    .is_some_and(|configure| configure.serial >= *serial)
             }),
             WindowSurface::X11(_surface) => true,
         }
@@ -533,12 +532,18 @@ impl CosmicSurface {
                         .unwrap();
 
                     let current_server = attributes.current_server_state();
-                    if attributes.current.size == current_server.size {
+                    let mut guard = states.cached_state.get::<ToplevelCachedState>();
+                    if guard
+                        .current()
+                        .last_acked
+                        .as_ref()
+                        .is_some_and(|configure| configure.state.size == current_server.size)
+                    {
                         // The window had committed for our previous size change, so we can
                         // change the size again.
                         trace!(
                             "current size matches server size: {:?}",
-                            attributes.current.size
+                            guard.current().last_acked.as_ref().unwrap().state.size
                         );
                         true
                     } else {
@@ -931,15 +936,14 @@ where
     }
 }
 
-fn with_toplevel_state<T, F: FnOnce(&smithay::wayland::shell::xdg::ToplevelState) -> T>(
+fn with_toplevel_state<T, F: FnOnce(Option<&smithay::wayland::shell::xdg::ToplevelState>) -> T>(
     toplevel: &ToplevelSurface,
     pending: bool,
     cb: F,
 ) -> T {
     if pending {
-        toplevel.with_pending_state(|pending| cb(pending))
+        toplevel.with_pending_state(|pending| cb(Some(pending)))
     } else {
-        let current = toplevel.current_state();
-        cb(&current)
+        toplevel.with_committed_state(|committed| cb(committed))
     }
 }

src/shell/element/surface.rs

@@ -15,7 +15,9 @@ use smithay::{
     wayland::{
         compositor::{get_role, with_states},
         seat::WaylandFocus,
-        shell::xdg::{PopupSurface, ToplevelSurface, XdgPopupSurfaceData, XDG_POPUP_ROLE},
+        shell::xdg::{
+            PopupCachedState, PopupSurface, ToplevelSurface, XdgPopupSurfaceData, XDG_POPUP_ROLE,
+        },
     },
 };
 use tracing::warn;
@@ -88,13 +90,13 @@ pub fn update_reactive_popups<'a>(
         match popup {
             PopupKind::Xdg(surface) => {
                 let positioner = with_states(&surface.wl_surface(), |states| {
-                    let attributes = states
-                        .data_map
-                        .get::<XdgPopupSurfaceData>()
-                        .unwrap()
-                        .lock()
-                        .unwrap();
-                    attributes.current.positioner.clone()
+                    let mut guard = states.cached_state.get::<PopupCachedState>();
+                    guard
+                        .current()
+                        .last_acked
+                        .map_or_else(Default::default, |configure| {
+                            configure.state.positioner.clone()
+                        })
                 });
                 if positioner.reactive {
                     let anchor_point = loc + positioner.get_anchor_point().as_global();