Move CastTarget to src/niri.rs

2 files changed, 6 insertions, 12 deletions

diff --git a/src/handlers/compositor.rs b/src/handlers/compositor.rs
index 43a405ea..1547a34d 100644
--- a/src/handlers/compositor.rs
+++ b/src/handlers/compositor.rs
@@ -21,7 +21,7 @@ use smithay::{delegate_compositor, delegate_shm};
 use super::xdg_shell::add_mapped_toplevel_pre_commit_hook;
 use crate::handlers::XDG_ACTIVATION_TOKEN_TIMEOUT;
 use crate::layout::{ActivateWindow, AddWindowTarget};
-use crate::niri::{ClientState, LockState, State};
+use crate::niri::{CastTarget, ClientState, LockState, State};
 use crate::utils::transaction::Transaction;
 use crate::utils::{is_mapped, send_scale_transform};
 use crate::window::{InitialConfigureState, Mapped, ResolvedWindowRules, Unmapped};
@@ -220,7 +220,6 @@ impl CompositorHandler for State {
                 let window = mapped.window.clone();
                 let output = output.cloned();
 
-                #[cfg(feature = "xdp-gnome-screencast")]
                 let id = mapped.id();
 
                 // This is a commit of a previously-mapped toplevel.
@@ -246,11 +245,8 @@ impl CompositorHandler for State {
                     let active_window = self.niri.layout.focus().map(|m| &m.window);
                     let was_active = active_window == Some(&window);
 
-                    #[cfg(feature = "xdp-gnome-screencast")]
                     self.niri
-                        .stop_casts_for_target(crate::pw_utils::CastTarget::Window {
-                            id: id.get(),
-                        });
+                        .stop_casts_for_target(CastTarget::Window { id: id.get() });
 
                     self.niri.layout.remove_window(&window, transaction.clone());
                     self.add_default_dmabuf_pre_commit_hook(surface);
diff --git a/src/handlers/xdg_shell.rs b/src/handlers/xdg_shell.rs
index 0c757c92..6d06fe91 100644
--- a/src/handlers/xdg_shell.rs
+++ b/src/handlers/xdg_shell.rs
@@ -43,7 +43,7 @@ use crate::input::resize_grab::ResizeGrab;
 use crate::input::touch_move_grab::TouchMoveGrab;
 use crate::input::touch_resize_grab::TouchResizeGrab;
 use crate::input::{PointerOrTouchStartData, DOUBLE_CLICK_TIME};
-use crate::niri::{PopupGrabState, State};
+use crate::niri::{CastTarget, PopupGrabState, State};
 use crate::utils::transaction::Transaction;
 use crate::utils::{
     get_monotonic_time, output_matches_name, send_scale_transform, update_tiled_state, ResizeEdge,
@@ -647,11 +647,9 @@ impl XdgShellHandler for State {
         let window = mapped.window.clone();
         let output = output.cloned();
 
-        #[cfg(feature = "xdp-gnome-screencast")]
-        self.niri
-            .stop_casts_for_target(crate::pw_utils::CastTarget::Window {
-                id: mapped.id().get(),
-            });
+        self.niri.stop_casts_for_target(CastTarget::Window {
+            id: mapped.id().get(),
+        });
 
         self.backend.with_primary_renderer(|renderer| {
             self.niri.layout.store_unmap_snapshot(renderer, &window);