pogmommy/makima
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added type Hold to Event enum, and parsing support for mixed bindings

Browse source
This commit is contained in:
cyber-sushi 2024-05-19 05:54:09 +02:00
parent 8bc1016f4a
commit 06402cadee
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/config.rs
View file

@ -7,6 +7,7 @@ use serde;
pub enum Event {
Axis(Axis),
Key(Key),
Hold,
}
#[allow(non_camel_case_types)]
@ -157,7 +158,7 @@ fn parse_raw_config(raw_config: RawConfig) -> (Bindings, HashMap<String, String>
if let Some((mods, event)) = input.rsplit_once("-") {
let str_modifiers = mods.split("-").collect::<Vec<&str>>();
let mut modifiers: Vec<Event> = Vec::new();
for event in str_modifiers {
for event in str_modifiers.clone() {
if let Ok(axis) = Axis::from_str(event) {
modifiers.push(Event::Axis(axis));
} else if let Ok(key) = Key::from_str(event) {
@ -171,6 +172,10 @@ fn parse_raw_config(raw_config: RawConfig) -> (Bindings, HashMap<String, String>
mapped_modifiers.custom.push(modifier.clone());
}
}
if str_modifiers[0] == "" {
modifiers.push(Event::Hold);
modifiers.sort();
}
if let Ok(event) = Axis::from_str(event) {
if !bindings.remap.contains_key(&Event::Axis(event)) {
bindings.remap.insert(Event::Axis(event), HashMap::from([(modifiers, output)]));
@ -281,3 +286,4 @@ pub fn parse_modifiers(settings: &HashMap<String, String>, parameter: &str) -> V
None => Vec::new(),
}
}