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

Make KDE active window retrieval work when running as root as well

Browse source
This commit is contained in:
cyber-sushi 2024-05-30 04:52:51 +02:00
parent 58fba9902e
commit ebdc2eac00
1 changed files with 44 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
src/active_client.rs
View file

@ -1,12 +1,12 @@
use crate::Config; use crate::Config;
use crate::udev_monitor::{Client, Server}; use crate::udev_monitor::{Client, Server, Environment};
use serde_json; use serde_json;
use swayipc_async::Connection; use swayipc_async::Connection;
use std::process::Command; use std::process::Command;
use x11rb::protocol::xproto::{get_property, get_input_focus, Atom, AtomEnum}; use x11rb::protocol::xproto::{get_property, get_input_focus, Atom, AtomEnum};
pub async fn get_active_window(server: &Server, config: &Vec<Config>) -> Client { pub async fn get_active_window(environment: &Environment, config: &Vec<Config>) -> Client {
match server { match &environment.server {
Server::Connected(server) => { Server::Connected(server) => {
let server_str = server.as_str(); let server_str = server.as_str();
match server_str { match server_str {
@ -14,7 +14,7 @@ pub async fn get_active_window(server: &Server, config: &Vec<Config>) -> Client
let query = Command::new("hyprctl").args(["activewindow", "-j"]).output().unwrap(); let query = Command::new("hyprctl").args(["activewindow", "-j"]).output().unwrap();
if let Ok(reply) = serde_json::from_str::<serde_json::Value>(std::str::from_utf8(query.stdout.as_slice()).unwrap()) { if let Ok(reply) = serde_json::from_str::<serde_json::Value>(std::str::from_utf8(query.stdout.as_slice()).unwrap()) {
let active_window = Client::Class(reply["class"].to_string().replace("\"", "")); let active_window = Client::Class(reply["class"].to_string().replace("\"", ""));
if let Some(_) = config.iter().find(|&x| x.associations.client == active_window ) { if let Some(_) = config.iter().find(|&x| x.associations.client == active_window) {
active_window active_window
} else { } else {
Client::Default Client::Default
@ -34,24 +34,51 @@ pub async fn get_active_window(server: &Server, config: &Vec<Config>) -> Client
}, },
None => Client::Default None => Client::Default
}; };
if let Some(_) = config.iter().find(|&x| x.associations.client == active_window ) { if let Some(_) = config.iter().find(|&x| x.associations.client == active_window) {
active_window active_window
} else { } else {
Client::Default Client::Default
} }
}, },
"KDE" => { "KDE" => {
if let Ok(query) = Command::new("sh").arg("c").arg("kdotool getactivewindow getwindowclassname").output() { let (user, running_as_root) =
let active_window = Client::Class(std::str::from_utf8(query.stdout.as_slice()).unwrap().trim().to_string()); if let Ok(sudo_user) = environment.sudo_user.clone() {
if let Some(_) = config.iter().find(|&x| x.associations.client == active_window ) { (Option::Some(sudo_user), true)
}
else if let Ok(user) = environment.user.clone() {
(Option::Some(user), false)
}
else {
(Option::None, false)
};
let active_window = {
if let Some(user) = user {
if running_as_root {
let output = Command::new("runuser")
.arg(user)
.arg("-c")
.arg("kdotool getactivewindow getwindowclassname")
.output()
.unwrap();
Client::Class(std::str::from_utf8(output.stdout.as_slice()).unwrap().trim().to_string())
} else {
let output = Command::new("sh")
.arg("-c")
.arg(format!("systemd-run --user -M {}@ kdotool getactivewindow getwindowclassname", user))
.output()
.unwrap();
Client::Class(std::str::from_utf8(output.stdout.as_slice()).unwrap().trim().to_string())
}
} else {
Client::Default
}
};
if let Some(_) = config.iter().find(|&x| x.associations.client == active_window) {
active_window active_window
} else { } else {
Client::Default Client::Default
} }
} else { },
Client::Default
}
}
"x11" => { "x11" => {
let connection = x11rb::connect(None).unwrap().0; let connection = x11rb::connect(None).unwrap().0;
let focused_window = get_input_focus(&connection) let focused_window = get_input_focus(&connection)
@ -66,7 +93,7 @@ pub async fn get_active_window(server: &Server, config: &Vec<Config>) -> Client
class = &class[..class.len() -1]; class = &class[..class.len() -1];
} }
let active_window = Client::Class(std::str::from_utf8(class).unwrap().to_string()); let active_window = Client::Class(std::str::from_utf8(class).unwrap().to_string());
if let Some(_) = config.iter().find(|&x| x.associations.client == active_window ) { if let Some(_) = config.iter().find(|&x| x.associations.client == active_window) {
active_window active_window
} else { } else {
Client::Default Client::Default