From 2e07818072936058656def2ceca73d21c0b3ebf4 Mon Sep 17 00:00:00 2001
From: galister <22305755+galister@users.noreply.github.com>
Date: Sun, 2 Aug 2026 23:53:59 +0900
Subject: [PATCH] use xkb style for variants

---
 wayvr/src/overlays/keyboard/mod.rs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/wayvr/src/overlays/keyboard/mod.rs b/wayvr/src/overlays/keyboard/mod.rs
index 53e9597b..4acc728d 100644
--- a/wayvr/src/overlays/keyboard/mod.rs
+++ b/wayvr/src/overlays/keyboard/mod.rs
@@ -89,6 +89,7 @@ pub fn create_keyboard(app: &mut AppState) -> anyhow::Result<OverlayWindowConfig
         wlx_layout: layout,
         wayland: app.feats.desktop_backend.is_wayland(),
         re_fcitx: Regex::new(r"^keyboard-([^-]+)(?:-([^-]+))?$").unwrap(),
+        re_keymap: Regex::new(r"^([a-zA-Z][a-zA-Z0-9]*)(?:\(([^)]+)\))?$").unwrap(),
     };
 
     backend.active_layout = backend.add_new_keymap(maybe_keymap.as_ref(), app)?;
@@ -136,6 +137,7 @@ struct KeyboardBackend {
     wlx_layout: layout::Layout,
     wayland: bool,
     re_fcitx: Regex,
+    re_keymap: Regex,
 }
 
 impl KeyboardBackend {
@@ -234,9 +236,11 @@ impl KeyboardBackend {
         keymap_name: &str,
         app: &mut AppState,
     ) -> anyhow::Result<bool> {
-        let mut parts = keymap_name.splitn(2, '/');
-        let layout = parts.next().unwrap_or("");
-        let variant = parts.next().unwrap_or("");
+        let Some(captures) = self.re_keymap.captures(keymap_name) else {
+            anyhow::bail!("invalid layout name for keymap switch: {keymap_name}");
+        };
+        let layout = captures.get(1).map_or("", |g| g.as_str());
+        let variant = captures.get(2).map_or("", |g| g.as_str());
         let keymap = XkbKeymap::from_layout_variant(layout, variant)
             .context("invalid layout/variant for keymap switch")?;
         app.hid_provider