protocol: Impl ext-image-capture-source and ext-image-copy-capture

Author: Ottatop

TODO.md

@@ -6,8 +6,7 @@
 - Work on `ConnectorSavedState`
 - Keyboard focus in Idea Xwayland is weird when creating a new Java file
 
-Snowcap
-- Add `send_message` for layers
+- Snowcap crashes when a window opens and immediately closes because the foreign toplevel handle is no longer valid
 
 Testing
 - Test layout mode changing and how it interacts with client fullscreen/maximized requests

src/backend/udev.rs

@@ -121,7 +121,7 @@ pub struct Udev {
     pub session: LibSeatSession,
     udev_dispatcher: Dispatcher<'static, UdevBackend, State>,
     display_handle: DisplayHandle,
-    pub(super) primary_gpu: DrmNode,
+    pub primary_gpu: DrmNode,
     pub(super) gpu_manager: GpuManager<GbmGlesBackend<GlesRenderer, DrmDeviceFd>>,
     devices: HashMap<DrmNode, Device>,
     /// The global corresponding to the primary gpu
@@ -1375,6 +1375,11 @@ impl Udev {
             return;
         }
 
+        let Some(output_geo) = pinnacle.space.output_geometry(output) else {
+            make_idle(&mut surface.render_state, &pinnacle.loop_handle);
+            return;
+        };
+
         assert_matches!(
             surface.render_state,
             RenderState::Scheduled | RenderState::WaitingForEstimatedVblankAndScheduled(_)
@@ -1410,12 +1415,13 @@ impl Udev {
             || (pinnacle.lock_state.is_locked()
                 && output.with_state(|state| state.lock_surface.is_none()));
 
+        let scale = output.current_scale().fractional_scale();
+
         let (pointer_render_elements, cursor_ids) = pointer_render_elements(
-            output,
+            (pointer_location - output_geo.loc.to_f64()).to_physical_precise_round(scale),
+            scale,
             &mut renderer,
             &mut pinnacle.cursor_state,
-            &pinnacle.space,
-            pointer_location,
             pinnacle.dnd_icon.as_ref(),
             &pinnacle.clock,
         );
@@ -1552,6 +1558,10 @@ impl Udev {
                         &pinnacle.loop_handle,
                         cursor_ids,
                     );
+
+                    pinnacle.loop_handle.insert_idle(|state| {
+                        state.process_capture_sessions();
+                    });
                 }
 
                 pinnacle.update_primary_scanout_output(output, &res.states);

src/backend/winit.rs

@@ -243,12 +243,14 @@ impl Winit {
                 .map(|ptr| ptr.current_location())
                 .unwrap_or((0.0, 0.0).into());
 
+            let output_loc = pinnacle.space.output_geometry(&self.output).unwrap().loc;
+            let scale = self.output.current_scale().fractional_scale();
+
             let (pointer_render_elements, _cursor_ids) = pointer_render_elements(
-                &self.output,
+                (pointer_location - output_loc.to_f64()).to_physical_precise_round(scale),
+                scale,
                 self.backend.renderer(),
                 &mut pinnacle.cursor_state,
-                &pinnacle.space,
-                pointer_location,
                 pinnacle.dnd_icon.as_ref(),
                 &pinnacle.clock,
             );
@@ -374,6 +376,10 @@ impl Winit {
                         &render_output_result,
                         &pinnacle.loop_handle,
                     );
+
+                    pinnacle.loop_handle.insert_idle(|state| {
+                        state.process_capture_sessions();
+                    });
                 }
 
                 let now = pinnacle.clock.now();

src/handlers.rs

@@ -5,6 +5,8 @@ mod drm;
 mod foreign_toplevel;
 pub mod foreign_toplevel_list;
 pub mod idle;
+mod image_capture_source;
+pub mod image_copy_capture;
 pub mod session_lock;
 #[cfg(feature = "snowcap")]
 pub mod snowcap_decoration;
@@ -214,9 +216,7 @@ impl CompositorHandler for State {
             }
 
             // Window surface commit
-            if let Some(window) = self.pinnacle.window_for_surface(surface).cloned()
-                && window.is_wayland()
-            {
+            if let Some(window) = self.pinnacle.window_for_surface(surface).cloned() {
                 let Some(is_mapped) =
                     with_renderer_surface_state(surface, |state| state.buffer().is_some())
                 else {
@@ -225,28 +225,30 @@ impl CompositorHandler for State {
 
                 window.on_commit();
 
-                // Toplevel has become unmapped,
-                // see https://wayland.app/protocols/xdg-shell#xdg_toplevel
-                if !is_mapped {
-                    self.pinnacle.remove_window(&window, true);
+                if window.is_wayland() {
+                    // Toplevel has become unmapped,
+                    // see https://wayland.app/protocols/xdg-shell#xdg_toplevel
+                    if !is_mapped {
+                        self.pinnacle.remove_window(&window, true);
 
-                    let output = window.output(&self.pinnacle);
+                        let output = window.output(&self.pinnacle);
 
-                    if let Some(output) = output {
-                        self.pinnacle.request_layout(&output);
+                        if let Some(output) = output {
+                            self.pinnacle.request_layout(&output);
+                        }
                     }
-                }
 
-                // Update reactive popups
-                for (popup, _) in PopupManager::popups_for_surface(surface) {
-                    if let PopupKind::Xdg(popup) = popup
-                        && popup.with_pending_state(|state| state.positioner.reactive)
-                    {
-                        if let Err(err) = self.pinnacle.position_popup(&popup) {
-                            debug!("Failed to position reactive popup: {err}");
-                        }
-                        if let Err(err) = popup.send_configure() {
-                            warn!("Failed to configure reactive popup: {err}");
+                    // Update reactive popups
+                    for (popup, _) in PopupManager::popups_for_surface(surface) {
+                        if let PopupKind::Xdg(popup) = popup
+                            && popup.with_pending_state(|state| state.positioner.reactive)
+                        {
+                            if let Err(err) = self.pinnacle.position_popup(&popup) {
+                                debug!("Failed to position reactive popup: {err}");
+                            }
+                            if let Err(err) = popup.send_configure() {
+                                warn!("Failed to configure reactive popup: {err}");
+                            }
                         }
                     }
                 }

src/handlers/image_capture_source.rs

@@ -0,0 +1,3 @@
+use crate::{protocol::image_capture_source::delegate_image_capture_source, state::State};
+
+delegate_image_capture_source!(State);