feat(detect): add active keyboard layout detection on X11
This commit is contained in:
parent
733d7e2ff4
commit
e9d4dde750
40
espanso-detect/src/layout/mod.rs
Normal file
40
espanso-detect/src/layout/mod.rs
Normal file
|
@ -0,0 +1,40 @@
|
||||||
|
/*
|
||||||
|
* This file is part of espanso.
|
||||||
|
*
|
||||||
|
* Copyright (C) 2019-2021 Federico Terzi
|
||||||
|
*
|
||||||
|
* espanso is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* espanso is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with espanso. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#[cfg(target_os = "linux")]
|
||||||
|
#[cfg(not(feature = "wayland"))]
|
||||||
|
mod x11;
|
||||||
|
|
||||||
|
#[cfg(target_os = "linux")]
|
||||||
|
#[cfg(not(feature = "wayland"))]
|
||||||
|
pub fn get_active_layout() -> Option<String> {
|
||||||
|
x11::get_active_layout()
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(target_os = "linux")]
|
||||||
|
#[cfg(feature = "wayland")]
|
||||||
|
pub fn get_active_layout() -> Option<String> {
|
||||||
|
todo!()
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(not(target_os = "linux"))]
|
||||||
|
pub fn get_active_layout() -> Option<String> {
|
||||||
|
// Not available on Windows and macOS yet
|
||||||
|
None
|
||||||
|
}
|
43
espanso-detect/src/layout/x11.rs
Normal file
43
espanso-detect/src/layout/x11.rs
Normal file
|
@ -0,0 +1,43 @@
|
||||||
|
/*
|
||||||
|
* This file is part of espanso.
|
||||||
|
*
|
||||||
|
* Copyright (C) 2019-2021 Federico Terzi
|
||||||
|
*
|
||||||
|
* espanso is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* espanso is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with espanso. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
use std::process::Command;
|
||||||
|
|
||||||
|
use log::error;
|
||||||
|
|
||||||
|
pub fn get_active_layout() -> Option<String> {
|
||||||
|
match Command::new("setxkbmap")
|
||||||
|
.arg("-query")
|
||||||
|
.output()
|
||||||
|
{
|
||||||
|
Ok(output) => {
|
||||||
|
let output_str = String::from_utf8_lossy(&output.stdout);
|
||||||
|
let layout_line = output_str.lines().find(|line| line.contains("layout:"))?;
|
||||||
|
let layout_raw: Vec<&str> = layout_line.split("layout:").collect();
|
||||||
|
Some(layout_raw.get(1)?.trim().to_string())
|
||||||
|
},
|
||||||
|
Err(err) => {
|
||||||
|
error!(
|
||||||
|
"unable to retrieve current keyboard layout with 'setxkbmap': {}",
|
||||||
|
err
|
||||||
|
);
|
||||||
|
None
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -23,6 +23,7 @@ use log::info;
|
||||||
|
|
||||||
pub mod event;
|
pub mod event;
|
||||||
pub mod hotkey;
|
pub mod hotkey;
|
||||||
|
pub mod layout;
|
||||||
|
|
||||||
#[cfg(target_os = "windows")]
|
#[cfg(target_os = "windows")]
|
||||||
pub mod win32;
|
pub mod win32;
|
||||||
|
@ -113,3 +114,5 @@ pub fn get_source(options: SourceCreationOptions) -> Result<Box<dyn Source>> {
|
||||||
info!("using EVDEVSource");
|
info!("using EVDEVSource");
|
||||||
Ok(Box::new(evdev::EVDEVSource::new(options)))
|
Ok(Box::new(evdev::EVDEVSource::new(options)))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub use layout::get_active_layout;
|
Loading…
Reference in New Issue
Block a user