remove hacky detection

Author: paperbenni

src/backend/wayland/compositor/window/lifecycle.rs

@@ -1,41 +1,25 @@
 use smithay::desktop::Window;
-use smithay::utils::SERIAL_COUNTER;
 use smithay::utils::{Logical, Point};
 use smithay::wayland::shell::xdg::ToplevelSurface;
 
 use crate::backend::wayland::compositor::WaylandState;
-use crate::backend::wayland::compositor::focus::KeyboardFocusTarget;
 use crate::backend::wayland::compositor::state::WindowIdMarker;
 use crate::types::WindowId;
 
 impl WaylandState {
     /// Map a new toplevel surface (from XDG shell).
     pub fn map_new_toplevel(&mut self, surface: ToplevelSurface) -> WindowId {
-        let is_overlay = Self::is_unmanaged_wayland_overlay(&surface);
         let window = Window::new_wayland_window(surface);
         let window_id = self.alloc_window_id();
         let _ = window
             .user_data()
             .get_or_insert_threadsafe(|| WindowIdMarker {
                 id: window_id,
-                is_overlay,
+                is_overlay: false,
             });
 
         self.space.map_element(window.clone(), (0, 0), false);
         self.window_index.insert(window_id, window.clone());
-
-        if is_overlay {
-            if let Some(keyboard) = self.seat.get_keyboard() {
-                let serial = SERIAL_COUNTER.next_serial();
-                keyboard.set_focus(
-                    self,
-                    Some(KeyboardFocusTarget::Window(window.clone())),
-                    serial,
-                );
-            }
-            return window_id;
-        }
-
         self.ensure_client_for_window(window_id);
 
         if let Some(title) = self.window_title(window_id)

src/backend/wayland/compositor/window/properties.rs

@@ -32,19 +32,6 @@ impl WaylandState {
         })
     }
 
-    pub(crate) fn toplevel_title(surface: &ToplevelSurface) -> Option<String> {
-        let wl_surface = surface.wl_surface();
-        smithay::wayland::compositor::with_states(&wl_surface, |states| {
-            states
-                .data_map
-                .get::<smithay::wayland::shell::xdg::XdgToplevelSurfaceData>()?
-                .lock()
-                .ok()?
-                .title
-                .clone()
-        })
-    }
-
     /// Get the app_id (desktop file ID) of a window.
     pub fn window_app_id(&self, window: WindowId) -> Option<String> {
         let element = self.window_index.get(&window)?;
@@ -66,30 +53,6 @@ impl WaylandState {
         })
     }
 
-    pub(crate) fn toplevel_app_id(surface: &ToplevelSurface) -> Option<String> {
-        let wl_surface = surface.wl_surface();
-        smithay::wayland::compositor::with_states(&wl_surface, |states| {
-            states
-                .data_map
-                .get::<smithay::wayland::shell::xdg::XdgToplevelSurfaceData>()?
-                .lock()
-                .ok()?
-                .app_id
-                .clone()
-        })
-    }
-
-    /// Detect helper toplevels that should stay outside WM client management.
-    ///
-    /// `wl-clipboard` creates a 1x1 fully transparent `xdg_toplevel` as a
-    /// focus-acquisition hack when data-control is unavailable. Managing that
-    /// surface like a normal client causes pointless layout churn.
-    pub(crate) fn is_unmanaged_wayland_overlay(surface: &ToplevelSurface) -> bool {
-        let app_id = Self::toplevel_app_id(surface).unwrap_or_default();
-        let title = Self::toplevel_title(surface).unwrap_or_default();
-        app_id == "io.github.bugaevc.wl-clipboard" || title == "wl-clipboard"
-    }
-
     /// Create a foreign toplevel handle for a window.
     pub(crate) fn create_foreign_toplevel(&mut self, window: WindowId) {
         let title = self.window_title(window).unwrap_or_default();