feat: follow the change of layershellev

waycrate · Nov 8, 2024 · 0cb7a19 · 0cb7a19
1 parent 7393b26
commit 0cb7a19
Showing 1 changed file with 33 additions and 0 deletions.
diff --git a/sessionlockev/src/lib.rs b/sessionlockev/src/lib.rs
@@ -656,12 +656,26 @@ impl<T> Dispatch<wl_keyboard::WlKeyboard, ()> for WindowState<T> {
                 }
                 _ => unreachable!(),
             },
+            wl_keyboard::Event::Enter { .. } => {
+                if let (Some(token), Some(loop_handle)) = (
+                    keyboard_state.repeat_token.take(),
+                    state.loop_handler.as_ref(),
+                ) {
+                    loop_handle.remove(token);
+                }
+            }
             wl_keyboard::Event::Leave { .. } => {
                 keyboard_state.current_repeat = None;
                 state.message.push((
                     surface_id,
                     DispatchMessageInner::ModifiersChanged(ModifiersState::empty()),
                 ));
+                if let (Some(token), Some(loop_handle)) = (
+                    keyboard_state.repeat_token.take(),
+                    state.loop_handler.as_ref(),
+                ) {
+                    loop_handle.remove(token);
+                }
             }
             wl_keyboard::Event::Key {
                 state: keystate,
@@ -700,6 +714,13 @@ impl<T> Dispatch<wl_keyboard::WlKeyboard, ()> for WindowState<T> {
                         }
 
                         keyboard_state.current_repeat = Some(key);
+
+                        if let (Some(token), Some(loop_handle)) = (
+                            keyboard_state.repeat_token.take(),
+                            state.loop_handler.as_ref(),
+                        ) {
+                            loop_handle.remove(token);
+                        }
                         let timer = Timer::from_duration(delay);
 
                         if let Some(looph) = state.loop_handler.as_ref() {
@@ -751,6 +772,12 @@ impl<T> Dispatch<wl_keyboard::WlKeyboard, ()> for WindowState<T> {
                             && Some(key) == keyboard_state.current_repeat
                         {
                             keyboard_state.current_repeat = None;
+                            if let (Some(token), Some(loop_handle)) = (
+                                keyboard_state.repeat_token.take(),
+                                state.loop_handler.as_ref(),
+                            ) {
+                                loop_handle.remove(token);
+                            }
                         }
                     }
                 }
@@ -779,6 +806,12 @@ impl<T> Dispatch<wl_keyboard::WlKeyboard, ()> for WindowState<T> {
                 keyboard_state.repeat_info = if rate == 0 {
                     // Stop the repeat once we get a disable event.
                     keyboard_state.current_repeat = None;
+                    if let (Some(token), Some(loop_handle)) = (
+                        keyboard_state.repeat_token.take(),
+                        state.loop_handler.as_ref(),
+                    ) {
+                        loop_handle.remove(token);
+                    }
                     RepeatInfo::Disable
                 } else {
                     let gap = Duration::from_micros(1_000_000 / rate as u64);