diff --git a/espanso-inject/src/evdev/keymap.rs b/espanso-inject/src/evdev/keymap.rs index 1c934c3..341bd63 100644 --- a/espanso-inject/src/evdev/keymap.rs +++ b/espanso-inject/src/evdev/keymap.rs @@ -24,12 +24,11 @@ pub struct Keymap { impl Keymap { pub fn new(context: &Context, rmlvo: Option) -> Result { - let owned_rmlvo = rmlvo.map(Self::generate_owned_rmlvo); - let names = owned_rmlvo.as_ref().map(Self::generate_names); + let owned_rmlvo = Self::generate_owned_rmlvo(rmlvo); + let names = Self::generate_names(&owned_rmlvo); - let names_ptr = names.map_or(std::ptr::null(), |names| &names); let raw_keymap = unsafe { - xkb_keymap_new_from_names(context.get_handle(), names_ptr, XKB_KEYMAP_COMPILE_NO_FLAGS) + xkb_keymap_new_from_names(context.get_handle(), &names, XKB_KEYMAP_COMPILE_NO_FLAGS) }; let keymap = scopeguard::guard(raw_keymap, |raw_keymap| unsafe { xkb_keymap_unref(raw_keymap); @@ -48,54 +47,44 @@ impl Keymap { self.keymap } - fn generate_owned_rmlvo(rmlvo: KeyboardConfig) -> OwnedRawKeyboardConfig { + fn generate_owned_rmlvo(rmlvo: Option) -> OwnedRawKeyboardConfig { let rules = rmlvo - .rules - .map(|s| CString::new(s).expect("unable to create CString for keymap")); + .as_ref() + .and_then(|config| config.rules.clone()) + .unwrap_or_default(); let model = rmlvo - .model - .map(|s| CString::new(s).expect("unable to create CString for keymap")); + .as_ref() + .and_then(|config| config.model.clone()) + .unwrap_or_default(); let layout = rmlvo - .layout - .map(|s| CString::new(s).expect("unable to create CString for keymap")); + .as_ref() + .and_then(|config| config.layout.clone()) + .unwrap_or_default(); let variant = rmlvo - .variant - .map(|s| CString::new(s).expect("unable to create CString for keymap")); + .as_ref() + .and_then(|config| config.variant.clone()) + .unwrap_or_default(); let options = rmlvo - .options - .map(|s| CString::new(s).expect("unable to create CString for keymap")); + .as_ref() + .and_then(|config| config.options.clone()) + .unwrap_or_default(); OwnedRawKeyboardConfig { - rules, - model, - layout, - variant, - options, + rules: CString::new(rules).expect("unable to create CString for keymap"), + model: CString::new(model).expect("unable to create CString for keymap"), + layout: CString::new(layout).expect("unable to create CString for keymap"), + variant: CString::new(variant).expect("unable to create CString for keymap"), + options: CString::new(options).expect("unable to create CString for keymap"), } } fn generate_names(owned_config: &OwnedRawKeyboardConfig) -> xkb_rule_names { xkb_rule_names { - rules: owned_config - .rules - .as_ref() - .map_or(std::ptr::null(), |s| s.as_ptr()), - model: owned_config - .model - .as_ref() - .map_or(std::ptr::null(), |s| s.as_ptr()), - layout: owned_config - .layout - .as_ref() - .map_or(std::ptr::null(), |s| s.as_ptr()), - variant: owned_config - .variant - .as_ref() - .map_or(std::ptr::null(), |s| s.as_ptr()), - options: owned_config - .options - .as_ref() - .map_or(std::ptr::null(), |s| s.as_ptr()), + rules: owned_config.rules.as_ptr(), + model: owned_config.model.as_ptr(), + layout: owned_config.layout.as_ptr(), + variant: owned_config.variant.as_ptr(), + options: owned_config.options.as_ptr(), } } } @@ -115,9 +104,9 @@ pub enum KeymapError { } struct OwnedRawKeyboardConfig { - rules: Option, - model: Option, - layout: Option, - variant: Option, - options: Option, + rules: CString, + model: CString, + layout: CString, + variant: CString, + options: CString, }