chore: handle when monitor is dead

this time we also need to send close event

Author: Decodetalkers

iced_sessionlock/src/event.rs

@@ -94,6 +94,7 @@ pub enum WindowEvent {
         y: f64,
     },
     Refresh,
+    Closed,
     ThemeChanged(iced::theme::Mode),
 }
 
@@ -108,6 +109,7 @@ impl From<&DispatchMessage> for WindowEvent {
     fn from(value: &DispatchMessage) -> Self {
         match value {
             DispatchMessage::RequestRefresh { .. } => WindowEvent::Refresh,
+            DispatchMessage::Closed => WindowEvent::Closed,
             DispatchMessage::MouseEnter {
                 surface_x: x,
                 surface_y: y,

iced_sessionlock/src/multi_window.rs

@@ -278,7 +278,6 @@ where
         self
     }
 
-    #[allow(unused)]
     fn remove_compositor(&mut self) {
         self.compositor = None;
         self.clipboard = SessionLockClipboard::unconnected();
@@ -314,7 +313,9 @@ where
             IcedSessionLockEvent::Window(WindowEvent::Refresh) => {
                 self.handle_refresh_event(ev, session_lock_id)
             }
-
+            IcedSessionLockEvent::Window(WindowEvent::Closed) => {
+                self.handle_closed_event(session_lock_id)
+            }
             IcedSessionLockEvent::Window(window_event) => {
                 self.handle_window_event(session_lock_id, window_event)
             }
@@ -488,6 +489,28 @@ where
             },
         }
     }
+
+    fn handle_closed_event(&mut self, session_lock_id: Option<SessionLockId>) {
+        let Some(session_lock_id) = session_lock_id else {
+            return;
+        };
+        let Some(iced_id) = self.window_manager.get_iced_id(session_lock_id) else {
+            return;
+        };
+        self.cached_layer_dimensions.remove(&iced_id);
+        self.window_manager.remove(iced_id);
+        self.user_interfaces.remove(&iced_id);
+        self.runtime
+            .broadcast(iced_futures::subscription::Event::Interaction {
+                window: iced_id,
+                event: IcedEvent::Window(IcedWindowEvent::Closed),
+                status: iced_core::event::Status::Ignored,
+            });
+        if self.window_manager.is_empty() {
+            self.remove_compositor();
+        }
+    }
+
     fn handle_window_event(&mut self, session_lock_id: Option<SessionLockId>, event: WindowEvent) {
         let id_and_window = if let Some(layer_shell_id) = session_lock_id {
             self.window_manager.get_mut_alias(layer_shell_id)

iced_sessionlock/src/multi_window/window_manager.rs

@@ -56,7 +56,18 @@ where
             entries: BTreeMap::new(),
         }
     }
-
+    pub fn remove(&mut self, id: IcedId) {
+        let remove_alias = self
+            .aliases
+            .iter()
+            .find(|(_, oriid)| **oriid == id)
+            .map(|(layid, _)| *layid);
+        if let Some(oriid) = remove_alias {
+            self.aliases.remove(&oriid);
+        }
+        self.back_aliases.remove(&id);
+        self.entries.remove(&id);
+    }
     #[allow(clippy::too_many_arguments)]
     pub fn insert(
         &mut self,
@@ -108,7 +119,11 @@ where
         Some((id, self.get_mut(id)?))
     }
 
-    pub fn get_iced_id(&self, id: IcedId) -> Option<SessionId> {
+    pub fn get_iced_id(&self, id: SessionId) -> Option<IcedId> {
+        self.aliases.get(&id).copied()
+    }
+
+    pub fn get_session_id(&self, id: IcedId) -> Option<SessionId> {
         self.back_aliases.get(&id).copied()
     }
 

layershellev/src/lib.rs

@@ -879,6 +879,7 @@ pub struct WindowState<T> {
     use_display_handle: bool,
     repeat_delay: Option<KeyboardTokenState>,
     to_remove_tokens: Vec<RegistrationToken>,
+    closed_ids: Vec<id::Id>,
 
     to_be_released_key: Option<VirtualKeyRelease>,
 
@@ -1361,6 +1362,7 @@ impl<T> Default for WindowState<T> {
             repeat_delay: None,
             to_remove_tokens: Vec::new(),
             to_be_released_key: None,
+            closed_ids: Vec::new(),
 
             last_wloutput: None,
             last_unit_index: 0,
@@ -1530,7 +1532,12 @@ impl<T: 'static> Dispatch<wl_registry::WlRegistry, ()> for WindowState<T> {
                     state.last_wloutput.take();
                 }
                 state.outputs.retain(|x| x.0 != name);
-                state.units.retain(|unit| unit.wl_surface.is_alive());
+                let removed_states = state
+                    .units
+                    .extract_if(.., |unit| !unit.wl_surface.is_alive());
+                for deleled in removed_states.into_iter() {
+                    state.closed_ids.push(deleled.id);
+                }
             }
 
             _ => {}
@@ -3280,6 +3287,18 @@ impl<T: 'static> WindowState<T> {
                         window_state.remove_shell(id);
                     }
 
+                    // NOTE: this is for those closed because wl_output is dead.
+                    let closed_ids = window_state.closed_ids.clone();
+                    for id in closed_ids {
+                        window_state.handle_event(
+                            &mut *event_handler,
+                            LayerShellEvent::RequestMessages(&DispatchMessage::Closed),
+                            Some(id),
+                        );
+                    }
+                    window_state.closed_ids.clear();
+
+
                     for idx in 0..window_state.units.len() {
                         let unit = &mut window_state.units[idx];
                         let (width, height) = unit.size;

sessionlockev/src/events.rs

@@ -267,6 +267,8 @@ pub enum DispatchMessage {
         scale_float: f64,
         scale_u32: u32,
     },
+    // because wlouput is dead, the window is closed
+    Closed,
 }
 
 impl From<DispatchMessageInner> for DispatchMessage {

sessionlockev/src/lib.rs

@@ -508,6 +508,7 @@ pub struct WindowState<T> {
     // settings:
     to_remove_tokens: Vec<RegistrationToken>,
     repeat_delay: Option<KeyboardTokenState>,
+    closed_ids: Vec<id::Id>,
 
     // keyboard
     use_display_handle: bool,
@@ -631,6 +632,7 @@ impl<T> Default for WindowState<T> {
 
             to_remove_tokens: Vec::new(),
             repeat_delay: None,
+            closed_ids: Vec::new(),
 
             use_display_handle: false,
 
@@ -761,7 +763,12 @@ impl<T: 'static> Dispatch<wl_registry::WlRegistry, ()> for WindowState<T> {
             }
             wl_registry::Event::GlobalRemove { name } => {
                 state.outputs.retain(|x| x.0 != name);
-                state.units.retain(|unit| unit.wl_surface.is_alive());
+                let removed_states = state
+                    .units
+                    .extract_if(.., |unit| !unit.wl_surface.is_alive());
+                for deleled in removed_states.into_iter() {
+                    state.closed_ids.push(deleled.id);
+                }
             }
 
             _ => {}
@@ -1729,6 +1736,16 @@ impl<T: 'static> WindowState<T> {
                             break;
                         }
                     }
+                    let closed_ids = window_state.closed_ids.clone();
+                    for id in closed_ids {
+                        window_state.handle_event(
+                            &mut *event_handler,
+                            SessionLockEvent::RequestMessages(&DispatchMessage::Closed),
+                            Some(id),
+                        );
+                    }
+                    window_state.closed_ids.clear();
+
                     for idx in 0..window_state.units.len() {
                         let unit = &mut window_state.units[idx];
                         let (width, height) = unit.size;