utils: New geometry spaces local/global

src/shell/element/mod.rs

@@ -4,7 +4,7 @@ use crate::{
         GlMultiError, GlMultiFrame, GlMultiRenderer,
     },
     state::State,
-    utils::prelude::SeatExt,
+    utils::prelude::*,
 };
 use calloop::LoopHandle;
 use id_tree::NodeId;
@@ -94,8 +94,8 @@ pub struct CosmicMapped {
     //tiling
     pub tiling_node_id: Arc<Mutex<Option<NodeId>>>,
     //floating
-    pub(super) last_geometry: Arc<Mutex<Option<Rectangle<i32, Logical>>>>,
     pub(super) resize_state: Arc<Mutex<Option<ResizeState>>>,
+    pub last_geometry: Arc<Mutex<Option<Rectangle<i32, Local>>>>,
 
     #[cfg(feature = "debug")]
     debug: Arc<Mutex<Option<smithay_egui::EguiState>>>,
@@ -108,6 +108,7 @@ impl fmt::Debug for CosmicMapped {
             .field("last_cursor_position", &self.last_cursor_position)
             .field("tiling_node_id", &self.tiling_node_id)
             .field("resize_state", &self.resize_state)
+            .field("last_geometry", &self.last_geometry)
             .finish()
     }
 }
@@ -361,7 +362,7 @@ impl CosmicMapped {
         window.is_activated(pending)
     }
 
-    pub fn set_geometry(&self, geo: Rectangle<i32, Logical>) {
+    pub fn set_geometry(&self, geo: Rectangle<i32, Global>) {
         match &self.element {
             CosmicMappedInternal::Stack(s) => s.set_geometry(geo),
             CosmicMappedInternal::Window(w) => w.set_geometry(geo),
@@ -501,11 +502,9 @@ impl CosmicMapped {
 
                 let stack = CosmicStack::new(std::iter::once(surface), handle);
                 if let Some(geo) = self.last_geometry.lock().unwrap().clone() {
-                    stack.set_geometry(geo);
-                }
-                for (output, overlap) in outputs {
-                    stack.output_enter(output, overlap);
+                    stack.set_geometry(geo.to_global(&output));
                 }
+                stack.output_enter(output, overlap);
                 stack.set_activate(activated);
                 stack.active().send_configure();
                 stack.refresh();
@@ -527,11 +526,9 @@ impl CosmicMapped {
         let window = CosmicWindow::new(surface, handle);
 
         if let Some(geo) = self.last_geometry.lock().unwrap().clone() {
-            window.set_geometry(geo);
-        }
-        for (output, overlap) in outputs {
-            window.output_enter(output, overlap);
+            window.set_geometry(geo.to_global(&output));
         }
+        window.output_enter(output, overlap);
         window.set_activate(self.is_activated(true));
         window.surface().send_configure();
         window.refresh();
@@ -1068,8 +1065,8 @@ impl From<CosmicWindow> for CosmicMapped {
             element: CosmicMappedInternal::Window(w),
             last_cursor_position: Arc::new(Mutex::new(HashMap::new())),
             tiling_node_id: Arc::new(Mutex::new(None)),
-            last_geometry: Arc::new(Mutex::new(None)),
             resize_state: Arc::new(Mutex::new(None)),
+            last_geometry: Arc::new(Mutex::new(None)),
             #[cfg(feature = "debug")]
             debug: Arc::new(Mutex::new(None)),
         }
@@ -1082,8 +1079,8 @@ impl From<CosmicStack> for CosmicMapped {
             element: CosmicMappedInternal::Stack(s),
             last_cursor_position: Arc::new(Mutex::new(HashMap::new())),
             tiling_node_id: Arc::new(Mutex::new(None)),
-            last_geometry: Arc::new(Mutex::new(None)),
             resize_state: Arc::new(Mutex::new(None)),
+            last_geometry: Arc::new(Mutex::new(None)),
             #[cfg(feature = "debug")]
             debug: Arc::new(Mutex::new(None)),
         }

src/shell/element/stack.rs

@@ -5,7 +5,7 @@ use crate::{
     },
     state::State,
     utils::iced::{IcedElement, Program},
-    utils::prelude::SeatExt,
+    utils::prelude::*,
     wayland::handlers::screencopy::ScreencopySessions,
 };
 use calloop::LoopHandle;
@@ -91,7 +91,7 @@ pub struct CosmicStackInternal {
     override_alive: Arc<AtomicBool>,
     last_seat: Arc<Mutex<Option<(Seat<State>, Serial)>>>,
     last_location: Arc<Mutex<Option<(Point<f64, Logical>, Serial, u32)>>>,
-    geometry: Arc<Mutex<Option<Rectangle<i32, Logical>>>>,
+    geometry: Arc<Mutex<Option<Rectangle<i32, Global>>>>,
     mask: Arc<Mutex<Option<tiny_skia::Mask>>>,
 }
 
@@ -406,7 +406,7 @@ impl CosmicStack {
         Point::from((0, TAB_HEIGHT))
     }
 
-    pub fn set_geometry(&self, geo: Rectangle<i32, Logical>) {
+    pub fn set_geometry(&self, geo: Rectangle<i32, Global>) {
         self.0.with_program(|p| {
             let loc = (geo.loc.x, geo.loc.y + TAB_HEIGHT);
             let size = (geo.size.w, geo.size.h - TAB_HEIGHT);
@@ -1047,11 +1047,11 @@ impl PointerTarget<State> for CosmicStack {
                                 if let Some(workspace) = data.common.shell.space_for(stack_mapped) {
                                     // TODO: Unify this somehow with Shell::move_request/Workspace::move_request
                                     let button = 0x110; // BTN_LEFT
-                                    let pos = event.location;
+                                    let pos = event.location.as_global();
                                     let start_data = PointerGrabStartData {
                                         focus: None,
                                         button,
-                                        location: pos,
+                                        location: pos.as_logical(),
                                     };
                                     let mapped = CosmicMapped::from(CosmicWindow::new(
                                         surface,

src/shell/element/surface.rs

@@ -51,6 +51,7 @@ use smithay::{
 
 use crate::{
     state::{State, SurfaceDmabufFeedback},
+    utils::prelude::*,
     wayland::handlers::decoration::PreferredDecorationMode,
 };
 
@@ -122,13 +123,13 @@ impl CosmicSurface {
         }
     }
 
-    pub fn set_geometry(&self, geo: Rectangle<i32, Logical>) {
+    pub fn set_geometry(&self, geo: Rectangle<i32, Global>) {
         match self {
             CosmicSurface::Wayland(window) => window
                 .toplevel()
-                .with_pending_state(|state| state.size = Some(geo.size)),
+                .with_pending_state(|state| state.size = Some(geo.size.as_logical())),
             CosmicSurface::X11(surface) => {
-                let _ = surface.configure(geo);
+                let _ = surface.configure(geo.as_logical());
             }
             _ => {}
         }

src/shell/element/window.rs

@@ -3,7 +3,7 @@ use crate::{
     state::State,
     utils::{
         iced::{IcedElement, Program},
-        prelude::SeatExt,
+        prelude::*,
     },
     wayland::handlers::screencopy::ScreencopySessions,
 };
@@ -132,7 +132,7 @@ impl CosmicWindow {
         ))
     }
 
-    pub fn set_geometry(&self, geo: Rectangle<i32, Logical>) {
+    pub fn set_geometry(&self, geo: Rectangle<i32, Global>) {
         self.0.with_program(|p| {
             let loc = (
                 geo.loc.x,