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

Associated application and layout is now stored inside Config struct

Browse source
This commit is contained in:
cyber-sushi 2024-05-29 06:04:38 +02:00
parent 881318b867
commit b4dd6a8989
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/config.rs
View file

@ -1,6 +1,7 @@
use std::{collections::HashMap, str::FromStr}; use std::{collections::HashMap, str::FromStr};
use evdev::Key; use evdev::Key;
use serde; use serde;
use crate::udev_monitor::Client;
#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Clone, Copy)] #[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Clone, Copy)]
@ -60,6 +61,12 @@ impl FromStr for Axis {
} }
} }
#[derive(Debug, PartialEq, Eq, Default, Clone)]
pub struct Associations {
pub client: Client,
pub layout: u16,
}
#[derive(Default, Debug, Clone)] #[derive(Default, Debug, Clone)]
pub struct Bindings { pub struct Bindings {
pub remap: HashMap<Event, HashMap<Vec<Event>, Vec<Key>>>, pub remap: HashMap<Event, HashMap<Vec<Event>, Vec<Key>>>,
@ -103,6 +110,7 @@ impl RawConfig {
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct Config { pub struct Config {
pub name: String, pub name: String,
pub associations: Associations,
pub bindings: Bindings, pub bindings: Bindings,
pub settings: HashMap<String, String>, pub settings: HashMap<String, String>,
pub mapped_modifiers: MappedModifiers, pub mapped_modifiers: MappedModifiers,
@ -112,9 +120,11 @@ impl Config {
pub fn new_from_file(file: &str, file_name: String) -> Self { pub fn new_from_file(file: &str, file_name: String) -> Self {
let raw_config = RawConfig::new_from_file(file); let raw_config = RawConfig::new_from_file(file);
let (bindings, settings, mapped_modifiers) = parse_raw_config(raw_config); let (bindings, settings, mapped_modifiers) = parse_raw_config(raw_config);
let associations = Default::default();
Self { Self {
name: file_name, name: file_name,
associations,
bindings, bindings,
settings, settings,
mapped_modifiers, mapped_modifiers,
@ -124,6 +134,7 @@ impl Config {
pub fn new_empty(file_name: String) -> Self { pub fn new_empty(file_name: String) -> Self {
Self { Self {
name: file_name, name: file_name,
associations: Default::default(),
bindings: Default::default(), bindings: Default::default(),
settings: Default::default(), settings: Default::default(),
mapped_modifiers: Default::default(), mapped_modifiers: Default::default(),