mirror of https://github.com/k0kubun/xremap
Revert "Workaround for xremap crate v0.1.0"
This reverts commit ef49f84f905ab088a7dcd95ee4d612e5af0aa419.pull/42/head
parent
26c8c8429f
commit
cb4f735d2a
@ -0,0 +1,65 @@
|
||||
use crate::client::Client;
|
||||
use std::fs::read_dir;
|
||||
use std::os::unix::ffi::OsStrExt;
|
||||
use std::os::unix::net::UnixStream;
|
||||
use swayipc::Connection;
|
||||
|
||||
pub struct SwayClient {
|
||||
connection: Option<Connection>,
|
||||
}
|
||||
|
||||
impl SwayClient {
|
||||
pub fn new() -> SwayClient {
|
||||
SwayClient { connection: None }
|
||||
}
|
||||
|
||||
fn connect(&mut self) {
|
||||
if let None = self.connection {
|
||||
if let Some(socket) = find_socket() {
|
||||
if let Ok(unix_stream) = UnixStream::connect(socket) {
|
||||
self.connection = Some(Connection(unix_stream));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Client for SwayClient {
|
||||
fn supported(&mut self) -> bool {
|
||||
self.connect();
|
||||
self.connection.is_some()
|
||||
}
|
||||
|
||||
fn current_application(&mut self) -> Option<String> {
|
||||
self.connect();
|
||||
let connection = match &mut self.connection {
|
||||
Some(connection) => connection,
|
||||
None => return None,
|
||||
};
|
||||
|
||||
if let Ok(node) = connection.get_tree() {
|
||||
if let Some(node) = node.find_focused(|n| n.focused) {
|
||||
return node.app_id;
|
||||
}
|
||||
}
|
||||
None
|
||||
}
|
||||
}
|
||||
|
||||
// e.g. "/run/user/1000/sway-ipc.1000.2575.sock"
|
||||
fn find_socket() -> Option<String> {
|
||||
let uid = 1000; // Assume a first nornal Linux user. TODO: Make it configurable
|
||||
if let Some(run_user) = read_dir(format!("/run/user/{}", uid)).as_mut().ok() {
|
||||
while let Some(entry) = run_user.next() {
|
||||
let path = entry.ok()?.path();
|
||||
if let Some(fname) = path.file_name() {
|
||||
if fname.as_bytes().starts_with(b"sway-ipc.") {
|
||||
if let Ok(path) = path.into_os_string().into_string() {
|
||||
return Some(path);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
None
|
||||
}
|
Loading…
Reference in New Issue