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

added logic to detect x11 session

Browse source
This commit is contained in:
cyber-sushi 2024-02-07 21:15:55 +01:00
parent 9965e71c2f
commit 28c1722b7e
2 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/event_reader.rs
View file

@ -299,6 +299,9 @@ impl EventReader {
String::from("default") String::from("default")
} }
}, },
"x11" => {
String::from("default")
},
_ => String::from("default") _ => String::from("default")
} }
} }

20
src/udev_monitor.rs
View file

@ -40,21 +40,31 @@ pub fn launch_tasks(config_files: &Vec<Config>, tasks: &mut Vec<JoinHandle<()>>)
]) ])
) )
); );
let current_desktop: Option<String> = match env::var("XDG_CURRENT_DESKTOP") { let current_desktop: Option<String> = match (env::var("XDG_SESSION_TYPE"), env::var("XDG_CURRENT_DESKTOP")) {
Ok(desktop) if vec!["Hyprland".to_string(), "sway".to_string()].contains(&desktop) => { (Ok(session), Ok(desktop)) if session == "wayland".to_string() && vec!["Hyprland".to_string(), "sway".to_string()].contains(&desktop) => {
println!(">> Running on {}, active window detection enabled.\n", desktop); println!(">> Running on {}, active window detection enabled.\n", desktop);
Option::Some(desktop) Option::Some(desktop)
}, },
Ok(desktop) => { (Ok(session), Ok(desktop)) if session == "wayland".to_string() => {
println!(">> Unsupported desktop: {}, won't be able to change bindings according to active window.\n println!(">> Unsupported compositor: {}, won't be able to change bindings according to active window.\n
Currently supported desktops: Hyprland, Sway.\n", desktop); Currently supported desktops: Hyprland, Sway.\n", desktop);
Option::None Option::None
}, },
Err(_) => { (Ok(session), _) if session == "x11".to_string() => {
println!(">> Running on X11, active window detection enabled.");
Option::Some("x11".to_string())
},
(Ok(session), Err(_)) if session == "wayland".to_string() => {
println!(">> Unable to retrieve the current desktop based on XDG_CURRENT_DESKTOP env var.\n println!(">> Unable to retrieve the current desktop based on XDG_CURRENT_DESKTOP env var.\n
Won't be able to change bindings according to the active window.\n"); Won't be able to change bindings according to the active window.\n");
Option::None Option::None
}, },
(Err(_), _) => {
println!(">> Unable to retrieve the session type based on XDG_SESSION_TYPE env var.\n
Won't be able to change bindings according to the active window.\n");
Option::None
},
_ => Option::None
}; };
let devices: evdev::EnumerateDevices = evdev::enumerate(); let devices: evdev::EnumerateDevices = evdev::enumerate();
for device in devices { for device in devices {