wip: proxied corners, padding and blur for popups

Author: wash2

Cargo.lock

@@ -17,7 +17,7 @@ smithay = { git = "https://github.com/smithay/smithay", default-features = false
     "backend_egl",
     "backend_drm",
     "renderer_gl",
-], rev = "dba255c" }
+], rev = "f0992e7" }
 # sctk = { git = "https://github.com/smithay/client-toolkit", package = "smithay-client-toolkit", features = ["calloop", "xkbcommon"] }
 sctk.workspace = true
 # sctk = { package = "smithay-client-toolkit", path = "../../fork/client-toolkit", default-features = false, features = ["calloop", "xkbcommon"] }

cosmic-panel-bin/Cargo.toml

@@ -1,10 +1,12 @@
 use anyhow::bail;
 use cctk::sctk::shell::xdg::{XdgPositioner, popup};
 use cctk::wayland_client::QueueHandle;
+use cctk::wayland_client::protocol::wl_region::WlRegion;
 use cctk::wayland_client::protocol::wl_seat::WlSeat;
 use cosmic::iced::id;
 
 use cosmic_panel_config::PanelAnchor;
+use sctk::compositor::Region;
 use sctk::shell::WaylandSurface;
 use smithay::backend::renderer::damage::OutputDamageTracker;
 use smithay::backend::renderer::gles::GlesRenderer;
@@ -113,6 +115,35 @@ impl PanelSpace {
 
         // must be done after role is assigned as popup
         c_wl_surface.commit();
+        let blur_surface = if let Some(blur_manager) = self.blur_manager.as_ref()
+            && self.colors.theme.cosmic().frosted_applets
+        {
+            let b = blur_manager.get_background_effect(c_popup.wl_surface(), &self.qh, ());
+            let region = Region::new(compositor_state).unwrap();
+            region.add(0, 0, popup_bbox.size.w, popup_bbox.size.h);
+            b.set_blur_region(Some(region.wl_region()));
+            Some(b)
+        } else {
+            None
+        };
+
+        let cosmic = self.colors.theme.cosmic();
+        let radius_m = cosmic.corner_radii.radius_m;
+
+        let corner_radius = if let Some(corner_radius) = self.corner_radius_manager.as_ref()
+            && self.colors.theme.cosmic().frosted_applets
+        {
+            let c = corner_radius.get_corner_radius_surface(c_popup.xdg_surface(), &self.qh, ());
+            c.set_radius(
+                radius_m[0] as u32,
+                radius_m[1] as u32,
+                radius_m[2] as u32,
+                radius_m[3] as u32,
+            );
+            Some(c)
+        } else {
+            None
+        };
 
         self.overflow_popup = Some((
             PanelPopup {
@@ -135,6 +166,8 @@ impl PanelSpace {
                 input_region: None,
                 parent: self.layer.as_ref().unwrap().wl_surface().clone(),
                 grab: true,
+                blur_surface,
+                corner_radius,
             },
             section,
         ));

cosmic-panel-bin/src/space/overflow.rs

@@ -15,6 +15,7 @@ use crate::workspaces_dbus::CosmicWorkspaces;
 use crate::xdg_shell_wrapper::client::handlers::cosmic_corner_radius::CornerRadius;
 use crate::xdg_shell_wrapper::client::handlers::overlap::OverlapNotifyV1;
 use crate::xdg_shell_wrapper::client_state::{ClientFocus, FocusStatus};
+use crate::xdg_shell_wrapper::server::handlers::cosmic_corner_radius::{CacheableCorners, Corners};
 use crate::xdg_shell_wrapper::server_state::{ServerFocus, ServerPtrFocus};
 use crate::xdg_shell_wrapper::shared_state::GlobalState;
 use crate::xdg_shell_wrapper::space::{
@@ -25,7 +26,6 @@ use crate::xdg_shell_wrapper::util::smootherstep;
 use crate::xdg_shell_wrapper::wp_fractional_scaling::FractionalScalingManager;
 use crate::xdg_shell_wrapper::wp_security_context::SecurityContextManager;
 use crate::xdg_shell_wrapper::wp_viewporter::ViewporterState;
-use cctk::cosmic_protocols::corner_radius;
 use cctk::cosmic_protocols::corner_radius::v1::client::cosmic_corner_radius_manager_v1::CosmicCornerRadiusManagerV1;
 use cctk::cosmic_protocols::overlap_notify::v1::client::zcosmic_overlap_notification_v1::ZcosmicOverlapNotificationV1;
 use cctk::sctk::shell::wlr_layer::Layer;
@@ -58,6 +58,7 @@ use smithay::desktop::{PopupManager, Space};
 use smithay::output::Output;
 use smithay::reexports::wayland_protocols::xdg::shell::client::xdg_positioner::{Anchor, Gravity};
 use smithay::reexports::wayland_server::backend::ClientId;
+use smithay::reexports::wayland_server::protocol::wl_surface::WlSurface;
 use smithay::reexports::wayland_server::{Client, DisplayHandle, Resource};
 use smithay::utils::{Logical, Rectangle, Size};
 use smithay::wayland::compositor::with_states;
@@ -388,7 +389,7 @@ pub struct PanelSpace {
     pub(crate) hover_track: HoverTrack,
     pub(crate) start_show_instant: Rc<RefCell<Option<Instant>>>,
     pub shared: Rc<PanelSharedState>,
-    qh: QueueHandle<GlobalState>,
+    pub(crate) qh: QueueHandle<GlobalState>,
 }
 
 impl PanelSpace {
@@ -2135,6 +2136,74 @@ impl PanelSpace {
         }
         self.is_dirty = true;
     }
+
+    pub(crate) fn update_popup_corners(
+        &mut self,
+        corners: CacheableCorners,
+        surface: &WlSurface,
+    ) -> bool {
+        let Some(popup) = self.popups.iter_mut().find(|p| p.s_surface.wl_surface() == surface)
+        else {
+            return false;
+        };
+        let Some(corner_manager) = self.corner_radius_manager.as_ref() else {
+            return false;
+        };
+
+        let corners_surface = popup.popup.corner_radius.take().unwrap_or_else(|| {
+            corner_manager.get_corner_radius_surface(
+                popup.popup.c_popup.xdg_surface(),
+                &self.qh,
+                (),
+            )
+        });
+
+        if let Some(Corners { top_left, top_right, bottom_right, bottom_left }) = corners.0 {
+            corners_surface.set_radius(top_left, top_right, bottom_right, bottom_left);
+        } else {
+            corners_surface.unset_radius();
+        }
+
+        popup.popup.corner_radius = Some(corners_surface);
+
+        true
+    }
+
+    pub(crate) fn commit_popup_blur(
+        &mut self,
+        region: Option<&Vec<Rectangle<i32, Logical>>>,
+        surface: &WlSurface,
+    ) -> bool {
+        let Some(popup) = self.popups.iter_mut().find(|p| p.s_surface.wl_surface() == surface)
+        else {
+            return false;
+        };
+        let Some(blur_manager) = self.blur_manager.as_ref() else {
+            return false;
+        };
+
+        let blur_surface = popup.popup.blur_surface.take().unwrap_or_else(|| {
+            blur_manager.get_background_effect(popup.popup.c_popup.wl_surface(), &self.qh, ())
+        });
+
+        let Some(compositor_state) = self.compositor_state.as_ref() else {
+            tracing::error!("Missing compositor state");
+            return false;
+        };
+
+        let region = region.map(|r| {
+            let wl_region = Region::new(compositor_state).unwrap();
+            for Rectangle { loc, size } in r {
+                wl_region.add(loc.x, loc.y, size.w, size.h);
+            }
+            wl_region
+        });
+        blur_surface.set_blur_region(region.as_ref().map(|r| r.wl_region()));
+
+        popup.popup.blur_surface = Some(blur_surface);
+
+        true
+    }
 }
 
 impl Drop for PanelSpace {

cosmic-panel-bin/src/space/panel_space.rs

@@ -327,6 +327,8 @@ impl WrapperSpace for PanelSpace {
                     .map(|p| p.wl_surface().clone())
                     .unwrap_or(self.layer.as_ref().unwrap().wl_surface().clone()),
                 grab: true,
+                blur_surface: None,
+                corner_radius: None,
             },
             s_surface,
         });

cosmic-panel-bin/src/space/wrapper_space.rs

@@ -22,7 +22,7 @@ pub use xdg_shell_wrapper_config as config;
 use crate::space_container::SpaceContainer;
 
 pub(crate) mod client;
-mod server;
+pub(crate) mod server;
 /// shared state
 pub mod shared_state;
 /// wrapper space abstraction