fix: it exit if no units when single mode

Author: Decodetalkers

layershellev/src/lib.rs

@@ -132,6 +132,7 @@ use strtoshape::str_to_shape;
 use waycrate_xkbkeycode::xkb_keyboard::ElementState;
 use waycrate_xkbkeycode::xkb_keyboard::RepeatInfo;
 
+use wayland_client::protocol::wl_surface;
 use wayland_client::{
     ConnectError, Connection, Dispatch, DispatchError, EventQueue, Proxy, QueueHandle, WEnum,
     delegate_noop,
@@ -1610,17 +1611,20 @@ impl<T: 'static> Dispatch<wl_registry::WlRegistry, ()> for WindowState<T> {
                 {
                     state.last_wloutput.take();
                 }
-
                 let outputs_removed = state.outputs.extract_if(.., |o| o.0 == name);
                 for output_removed in outputs_removed {
                     state
                         .xdg_info_cache
                         .retain(|info| info.0.id() != output_removed.1.id());
                 }
 
-                let removed_states = state
-                    .units
-                    .extract_if(.., |unit| !unit.wl_surface.is_alive());
+                let removed_states = state.units.extract_if(.., |unit| {
+                    !unit.wl_surface.is_alive()
+                        || unit
+                            .wl_output
+                            .as_ref()
+                            .is_some_and(|o| !state.outputs.iter().any(|(_, storage)| storage == o))
+                });
                 for deleled in removed_states.into_iter() {
                     state.closed_ids.push(deleled.id);
                 }
@@ -2352,6 +2356,40 @@ impl<T> Dispatch<wp_fractional_scale_v1::WpFractionalScaleV1, ()> for WindowStat
         }
     }
 }
+impl<T> Dispatch<WlSurface, ()> for WindowState<T> {
+    fn event(
+        state: &mut Self,
+        proxy: &WlSurface,
+        event: <WlSurface as Proxy>::Event,
+        _data: &(),
+        _conn: &Connection,
+        _qhandle: &QueueHandle<Self>,
+    ) {
+        let Some(unit) = state
+            .units
+            .iter_mut()
+            .find(|unit| unit.wl_surface == *proxy)
+        else {
+            return;
+        };
+        match event {
+            wl_surface::Event::Enter { output } => {
+                unit.wl_output.replace(output);
+            }
+            wl_surface::Event::Leave { output } => {
+                if !matches!(unit.shell, Shell::LayerShell(..))
+                    && unit
+                        .wl_output
+                        .as_ref()
+                        .is_some_and(|i_output| i_output == &output)
+                {
+                    unit.wl_output.take();
+                }
+            }
+            _ => {}
+        }
+    }
+}
 
 #[derive(Default)]
 pub struct TextInputData {
@@ -2503,7 +2541,6 @@ impl<T> Dispatch<WlCallback, (id::Id, PresentAvailableState)> for WindowState<T>
 }
 
 delegate_noop!(@<T> WindowState<T>: ignore WlCompositor); // WlCompositor is need to create a surface
-delegate_noop!(@<T> WindowState<T>: ignore WlSurface); // surface is the base needed to show buffer
 delegate_noop!(@<T> WindowState<T>: ignore WlOutput); // output is need to place layer_shell, although here
 // it is not used
 delegate_noop!(@<T> WindowState<T>: ignore WlShm); // shm is used to create buffer pool
@@ -3374,6 +3411,10 @@ impl<T: 'static> WindowState<T> {
                 );
             }
             window_state.closed_ids.clear();
+            if window_state.units.is_empty() && !window_state.is_allscreens() {
+                signal.stop();
+                return true;
+            }
 
             for idx in 0..window_state.units.len() {
                 let unit = &mut window_state.units[idx];

sessionlockev/src/lib.rs

@@ -309,6 +309,7 @@ impl rwh_06::HasDisplayHandle for WindowWrapper {
 pub struct WindowStateUnit<T> {
     id: id::Id,
     display: WlDisplay,
+    wl_output: wl_output::WlOutput,
     wl_surface: WlSurface,
     size: (u32, u32),
     buffer: Option<WlBuffer>,
@@ -793,9 +794,14 @@ impl<T: 'static> Dispatch<wl_registry::WlRegistry, ()> for WindowState<T> {
             }
             wl_registry::Event::GlobalRemove { name } => {
                 state.outputs.retain(|x| x.0 != name);
-                let removed_states = state
-                    .units
-                    .extract_if(.., |unit| !unit.wl_surface.is_alive());
+
+                let removed_states = state.units.extract_if(.., |unit| {
+                    !unit.wl_surface.is_alive()
+                        && !state
+                            .outputs
+                            .iter()
+                            .any(|(_, storage)| storage == &unit.wl_output)
+                });
                 for deleled in removed_states.into_iter() {
                     state.closed_ids.push(deleled.id);
                 }
@@ -1465,11 +1471,11 @@ impl<T: 'static> WindowState<T> {
         let lock_manager = globals.bind::<ExtSessionLockManagerV1, _, _>(&qh, 1..=1, ())?;
         event_queue.blocking_dispatch(&mut self)?; // then make a dispatch
         let lock = lock_manager.lock(&qh, ());
-        let displays = self.outputs.clone();
-        for (_, display) in displays.iter() {
+        let wl_outputs = self.outputs.clone();
+        for (_, wl_output) in wl_outputs.iter() {
             let wl_surface = wmcompositer.create_surface(&qh, ()); // and create a surface. if two or more,
             wl_surface.commit();
-            let session_lock_surface = lock.get_lock_surface(&wl_surface, display, &qh, ());
+            let session_lock_surface = lock.get_lock_surface(&wl_surface, wl_output, &qh, ());
 
             // so during the init Configure of the shell, a buffer, atleast a buffer is needed.
             // and if you need to reconfigure it, you need to commit the wl_surface again
@@ -1488,6 +1494,7 @@ impl<T: 'static> WindowState<T> {
                 id: id::Id::unique(),
                 display: connection.display(),
                 wl_surface,
+                wl_output: wl_output.clone(),
                 size: (0, 0),
                 buffer: None,
                 session_shell: session_lock_surface,
@@ -1637,11 +1644,11 @@ impl<T: 'static> WindowState<T> {
             std::mem::swap(&mut messages, &mut window_state.message);
             for msg in messages.iter() {
                 match msg {
-                    (_, DispatchMessageInner::NewDisplay(display)) => {
+                    (_, DispatchMessageInner::NewDisplay(wl_output)) => {
                         let wl_surface = wmcompositer.create_surface(&qh, ());
                         wl_surface.commit();
                         let session_lock_surface =
-                            lock.get_lock_surface(&wl_surface, display, &qh, ());
+                            lock.get_lock_surface(&wl_surface, wl_output, &qh, ());
 
                         let mut fractional_scale = None;
                         if let Some(ref fractional_scale_manager) = fractional_scale_manager {
@@ -1657,6 +1664,7 @@ impl<T: 'static> WindowState<T> {
                         window_state.push_window(WindowStateUnit {
                             id: id::Id::unique(),
                             display: connection.display(),
+                            wl_output: wl_output.clone(),
                             wl_surface,
                             size: (0, 0),
                             buffer: None,