feat: add xkeyboardconfig settings

Author: eatradish

src-tauri/Cargo.lock

@@ -22,7 +22,6 @@ zbus = { version = "5.1.0", features = ["tokio"] }
 tokio = { version = "1.42.0", features = ["rt-multi-thread", "process"] }
 eyre = "0.6.12"
 nom = "8"
-url = "2.5.2"
 reqwest = { version = "0.12.8", features = ["json"] }
 thiserror = "2"
 libc = "0.2.159"
@@ -37,6 +36,7 @@ sysinfo = "0.35"
 tauri-plugin-shell = "2.0.0"
 tauri-plugin-dialog = "2.0.0"
 tauri-plugin-cli = "2.0.0"
+serde-xml-rs = "0.8.0"
 
 [features]
 # this feature is used for production builds or when `devPath` points to the filesystem

src-tauri/Cargo.toml

@@ -6,8 +6,10 @@ use axum::Router;
 use eyre::ContextCompat;
 use eyre::OptionExt;
 use eyre::Result;
-use parser::list_zoneinfo;
-use parser::ZoneInfo;
+use parser::timezone::list_zoneinfo;
+use parser::timezone::ZoneInfo;
+use parser::xkeyboard::get_keyboard_layouts;
+use parser::xkeyboard::KeyboardLayouts;
 use rand::prelude::SliceRandom;
 use rand::rng;
 use reqwest::Client;
@@ -302,6 +304,11 @@ fn list_timezone() -> TauriResult<Vec<ZoneInfo>> {
     Ok(list_zoneinfo()?)
 }
 
+#[tauri::command]
+fn list_xkeyboard_config() -> TauriResult<KeyboardLayouts> {
+    Ok(get_keyboard_layouts()?)
+}
+
 #[tauri::command]
 async fn set_config(state: State<'_, DkState<'_>>, config: &str) -> TauriResult<()> {
     let proxy = &state.proxy;
@@ -928,6 +935,7 @@ pub async fn run() {
                     is_lang_already_set,
                     is_offline_install,
                     is_block_username,
+                    list_xkeyboard_config,
                 ])
                 .run(tauri::generate_context!())
                 .expect("error while running tauri application");

src-tauri/src/lib.rs

@@ -0,0 +1,2 @@
+pub mod timezone;
+pub mod xkeyboard;

src-tauri/src/parser/mod.rs

@@ -0,0 +1,100 @@
+// Copy from https://github.com/pop-os/distinst/blob/8322c936a91ba5812ac9cbef79282a04bad738ea/crates/locales/src/keyboard_layout.rs#L82
+
+use eyre::Result;
+use serde::{Deserialize, Serialize};
+use serde_xml_rs as xml;
+use std::{fs::File, io::BufReader};
+
+/// A list of keyboard layouts parsed from `/usr/share/X11/xkb/rules/base.xml`.
+#[derive(Debug, Deserialize, Serialize)]
+pub struct KeyboardLayouts {
+    #[serde(rename = "layoutList")]
+    pub layout_list: LayoutList,
+}
+
+impl KeyboardLayouts {
+    /// Fetch the layouts from the layout list.
+    pub fn get_layouts(&self) -> &[KeyboardLayout] {
+        &self.layout_list.layout
+    }
+
+    /// Fetch the layouts from the layout list.
+    pub fn get_layouts_mut(&mut self) -> &mut [KeyboardLayout] {
+        &mut self.layout_list.layout
+    }
+}
+
+/// A list of keyboard layouts.
+#[derive(Debug, Deserialize, Serialize)]
+pub struct LayoutList {
+    pub layout: Vec<KeyboardLayout>,
+}
+
+/// A keyboard layout, which contains an optional list of variants, a name, and a description.
+#[derive(Debug, Deserialize, Serialize)]
+pub struct KeyboardLayout {
+    #[serde(rename = "configItem")]
+    pub config_item: ConfigItem,
+    #[serde(rename = "variantList")]
+    pub variant_list: Option<VariantList>,
+}
+
+impl KeyboardLayout {
+    /// Fetches the name of the keyboard layout.
+    pub fn get_name(&self) -> &str {
+        &self.config_item.name
+    }
+
+    /// Fetches a description of the layout.
+    pub fn get_description(&self) -> &str {
+        &self.config_item.description
+    }
+
+    /// Fetches a list of possible layout variants.
+    pub fn get_variants(&self) -> Option<&Vec<KeyboardVariant>> {
+        self.variant_list.as_ref().and_then(|x| x.variant.as_ref())
+    }
+}
+
+/// Contains the name and description of a keyboard layout.
+#[derive(Debug, Deserialize, Serialize)]
+pub struct ConfigItem {
+    pub name: String,
+    #[serde(rename = "shortDescription")]
+    pub short_description: Option<String>,
+    pub description: String,
+}
+
+/// A list of possible variants of a keyboard layout.
+#[derive(Debug, Deserialize, Serialize)]
+pub struct VariantList {
+    pub variant: Option<Vec<KeyboardVariant>>,
+}
+
+/// A variant of a keyboard layout.
+#[derive(Debug, Deserialize, Serialize)]
+pub struct KeyboardVariant {
+    #[serde(rename = "configItem")]
+    pub config_item: ConfigItem,
+}
+
+impl KeyboardVariant {
+    /// The name of this variant of a keybaord layout.
+    pub fn get_name(&self) -> &str {
+        &self.config_item.name
+    }
+
+    /// A description of this variant of a keyboard layout.
+    pub fn get_description(&self) -> &str {
+        &self.config_item.description
+    }
+}
+
+const X11_BASE_RULES: &str = "/usr/share/X11/xkb/rules/base.xml";
+
+/// Fetches a list of keyboard layouts from `/usr/share/X11/xkb/rules/base.xml`.
+pub fn get_keyboard_layouts() -> Result<KeyboardLayouts> {
+    Ok(xml::from_reader(BufReader::new(File::open(
+        X11_BASE_RULES,
+    )?))?)
+}

src-tauri/src/parser.rs src-tauri/src/parser/timezone.rssrc-tauri/src/parser.rs renamed to src-tauri/src/parser/timezone.rs

@@ -3,11 +3,11 @@ use std::path::Path;
 
 use eyre::{OptionExt, Result};
 use reqwest::Client;
+use reqwest::Url;
 use serde::de::DeserializeOwned;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 use std::time::Instant;
-use url::Url;
 use x11rb::connection::Connection;
 use x11rb::protocol::xproto::{
     AtomEnum, ClientMessageEvent, ConnectionExt as ConnectionExtB, EventMask,