fix: duplication keyboard

resolve: #123

keyboard release only happened after v3, and v1 will always live. So in
order to fix the problem under low version keyboard, we need to keep the
keyboard as only one

Author: Decodetalkers

Cargo.lock

@@ -19,23 +19,23 @@ authors = [
   "Aakash Sen Sharma <aakashsensharma@gmail.com>",
 ]
 edition = "2024"
-version = "0.14.1"
+version = "0.14.2"
 license = "MIT"
 repository = "https://github.com/waycrate/exwlshelleventloop"
 description = "Wayland extra shell lib"
 keywords = ["wayland", "wlroots"]
 readme = "README.md"
 
 [workspace.dependencies]
-layershellev = { version = "0.14.1", path = "./layershellev" }
-sessionlockev = { version = "0.14.1", path = "./sessionlockev" }
-
-iced_layershell = { version = "0.14.1", path = "./iced_layershell" }
-iced_exdevtools = { version = "0.14.1", path = "./iced_exdevtools" }
-iced_layershell_macros = { version = "0.14.1", path = "./iced_layershell_macros" }
-iced_sessionlock = { version = "0.14.1", path = "./iced_sessionlock" }
-iced_sessionlock_macros = { version = "0.14.1", path = "./iced_sessionlock_macros" }
-waycrate_xkbkeycode = { version = "0.14.1", path = "./waycrate_xkbkeycode" }
+layershellev = { version = "0.14.2", path = "./layershellev" }
+sessionlockev = { version = "0.14.2", path = "./sessionlockev" }
+
+iced_layershell = { version = "0.14.2", path = "./iced_layershell" }
+iced_exdevtools = { version = "0.14.2", path = "./iced_exdevtools" }
+iced_layershell_macros = { version = "0.14.2", path = "./iced_layershell_macros" }
+iced_sessionlock = { version = "0.14.2", path = "./iced_sessionlock" }
+iced_sessionlock_macros = { version = "0.14.2", path = "./iced_sessionlock_macros" }
+waycrate_xkbkeycode = { version = "0.14.2", path = "./waycrate_xkbkeycode" }
 
 tempfile = "3.23.0"
 thiserror = "2.0.12"

Cargo.toml

@@ -1559,7 +1559,7 @@ impl<T: 'static> Dispatch<wl_seat::WlSeat, ()> for WindowState<T> {
                 } else {
                     keyboard_installing = false;
                     let keyboard = state.keyboard_state.take().unwrap();
-                    drop(keyboard);
+                    state.keyboard_state = Some(keyboard.update(seat, qh, ()));
                     if let Some(surface_id) = state.current_surface_id() {
                         state
                             .message

layershellev/src/lib.rs

@@ -792,8 +792,7 @@ impl<T: 'static> Dispatch<wl_seat::WlSeat, ()> for WindowState<T> {
                     state.keyboard_state = Some(KeyboardState::new(seat.get_keyboard(qh, ())));
                 } else {
                     let keyboard = state.keyboard_state.take().unwrap();
-                    drop(keyboard);
-                    state.keyboard_state = Some(KeyboardState::new(seat.get_keyboard(qh, ())));
+                    state.keyboard_state = Some(keyboard.update(seat, qh, ()));
                 }
                 if let Some(surface_id) = state.current_surface_id() {
                     state

sessionlockev/src/lib.rs

@@ -10,7 +10,11 @@ use std::{
     ptr::{self, NonNull},
     time::Duration,
 };
-use wayland_client::{Proxy, protocol::wl_keyboard::WlKeyboard};
+use wayland_client::{Dispatch, QueueHandle};
+use wayland_client::{
+    Proxy,
+    protocol::{wl_keyboard::WlKeyboard, wl_seat::WlSeat},
+};
 
 use crate::keymap;
 
@@ -82,6 +86,17 @@ impl KeyboardState {
             repeat_token: None,
         }
     }
+    pub fn update<U, D>(self, seat: &WlSeat, qh: &QueueHandle<D>, udata: U) -> Self
+    where
+        D: Dispatch<WlKeyboard, U> + 'static,
+        U: Send + Sync + 'static,
+    {
+        if self.keyboard.version() >= 3 {
+            drop(self);
+            return Self::new(seat.get_keyboard(qh, udata));
+        }
+        self
+    }
 }
 
 impl Drop for KeyboardState {