Extract to_xkb_config() to a method

1 files changed, 13 insertions, 1 deletions

diff --git a/src/config.rs b/src/config.rs
index a76bf348..966fd85b 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -6,7 +6,7 @@ use directories::ProjectDirs;
 use miette::{miette, Context, IntoDiagnostic};
 use smithay::input::keyboard::keysyms::KEY_NoSymbol;
 use smithay::input::keyboard::xkb::{keysym_from_name, KEYSYM_CASE_INSENSITIVE};
-use smithay::input::keyboard::Keysym;
+use smithay::input::keyboard::{Keysym, XkbConfig};
 
 #[derive(knuffel::Decode, Debug, PartialEq)]
 pub struct Config {
@@ -80,6 +80,18 @@ pub struct Xkb {
     pub options: Option<String>,
 }
 
+impl Xkb {
+    pub fn to_xkb_config(&self) -> XkbConfig {
+        XkbConfig {
+            rules: &self.rules,
+            model: &self.model,
+            layout: self.layout.as_deref().unwrap_or("us"),
+            variant: &self.variant,
+            options: self.options.clone(),
+        }
+    }
+}
+
 #[derive(knuffel::DecodeScalar, Debug, Default, PartialEq, Eq)]
 pub enum TrackLayout {
     /// The layout change is global.