Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: move send_command macro into a function #255

Merged
merged 3 commits into from
Apr 6, 2024
Merged

refactor: move send_command macro into a function #255

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d17194
refactor: move send_command macro into a function
lavafroth Mar 20, 2024
bb51b7b
Merge branch 'main' into send-command-fn
lavafroth Apr 3, 2024
a8521c9
lint: cargo fmt
lavafroth Apr 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
98 changes: 50 additions & 48 deletions swhkd/src/daemon.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use crate::config::Value;
use clap::{arg, Command};
use config::Hotkey;
use evdev::{AttributeSet, Device, InputEventKind, Key};
use nix::{
sys::stat::{umask, Mode},
Expand Down Expand Up @@ -98,51 +99,6 @@ async fn main() -> Result<(), Box<dyn Error>> {
let mut modes = load_config();
let mut mode_stack: Vec<usize> = vec![0];

macro_rules! send_command {
($hotkey: expr, $socket_path: expr) => {
log::info!("Hotkey pressed: {:#?}", $hotkey);
let command = $hotkey.command;
let mut commands_to_send = String::new();
if modes[mode_stack[mode_stack.len() - 1]].options.oneoff {
mode_stack.pop();
}
if command.contains('@') {
let commands = command.split("&&").map(|s| s.trim()).collect::<Vec<_>>();
for cmd in commands {
match cmd.split(' ').next().unwrap() {
config::MODE_ENTER_STATEMENT => {
let enter_mode = cmd.split(' ').nth(1).unwrap();
for (i, mode) in modes.iter().enumerate() {
if mode.name == enter_mode {
mode_stack.push(i);
break;
}
}
log::info!(
"Entering mode: {}",
modes[mode_stack[mode_stack.len() - 1]].name
);
}
config::MODE_ESCAPE_STATEMENT => {
mode_stack.pop();
}
_ => commands_to_send.push_str(format!("{cmd} &&").as_str()),
}
}
} else {
commands_to_send = command;
}
if commands_to_send.ends_with(" &&") {
commands_to_send = commands_to_send.strip_suffix(" &&").unwrap().to_string();
}
if let Err(e) = socket_write(&commands_to_send, $socket_path.to_path_buf()) {
log::error!("Failed to send command to swhks through IPC.");
log::error!("Please make sure that swhks is running.");
log::error!("Err: {:#?}", e)
}
};
}

let arg_devices: Vec<&str> = args.values_of("device").unwrap_or_default().collect();

let keyboard_devices: Vec<_> = {
Expand Down Expand Up @@ -239,7 +195,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
if hotkey.keybinding.on_release {
continue;
}
send_command!(hotkey.clone(), &socket_file_path);
send_command(hotkey.clone(), &socket_file_path, &modes, &mut mode_stack);
hotkey_repeat_timer.as_mut().reset(Instant::now() + Duration::from_millis(repeat_cooldown_duration));
}

Expand Down Expand Up @@ -359,7 +315,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
0 => {
if last_hotkey.is_some() && pending_release {
pending_release = false;
send_command!(last_hotkey.clone().unwrap(), &socket_file_path);
send_command(last_hotkey.clone().unwrap(), &socket_file_path, &modes, &mut mode_stack);
last_hotkey = None;
}
if let Some(modifier) = modifiers_map.get(&key) {
Expand Down Expand Up @@ -422,7 +378,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
pending_release = true;
break;
}
send_command!(hotkey.clone(), &socket_file_path);
send_command(hotkey.clone(), &socket_file_path, &modes, &mut mode_stack);
hotkey_repeat_timer.as_mut().reset(Instant::now() + Duration::from_millis(repeat_cooldown_duration));
continue;
}
Expand Down Expand Up @@ -598,3 +554,49 @@ pub fn setup_swhkd(invoking_uid: u32) {
exit(1);
}
}

pub fn send_command(
hotkey: Hotkey,
socket_path: &Path,
modes: &[config::Mode],
mode_stack: &mut Vec<usize>,
) {
log::info!("Hotkey pressed: {:#?}", hotkey);
let command = hotkey.command;
let mut commands_to_send = String::new();
if modes[mode_stack[mode_stack.len() - 1]].options.oneoff {
mode_stack.pop();
}
if command.contains('@') {
let commands = command.split("&&").map(|s| s.trim()).collect::<Vec<_>>();
for cmd in commands {
let mut words = cmd.split_whitespace();
match words.next().unwrap() {
config::MODE_ENTER_STATEMENT => {
let enter_mode = cmd.split(' ').nth(1).unwrap();
for (i, mode) in modes.iter().enumerate() {
if mode.name == enter_mode {
mode_stack.push(i);
break;
}
}
log::info!("Entering mode: {}", modes[mode_stack[mode_stack.len() - 1]].name);
}
config::MODE_ESCAPE_STATEMENT => {
mode_stack.pop();
}
_ => commands_to_send.push_str(format!("{cmd} &&").as_str()),
}
}
} else {
commands_to_send = command;
}
if commands_to_send.ends_with(" &&") {
commands_to_send = commands_to_send.strip_suffix(" &&").unwrap().to_string();
}
if let Err(e) = socket_write(&commands_to_send, socket_path.to_path_buf()) {
log::error!("Failed to send command to swhks through IPC.");
log::error!("Please make sure that swhks is running.");
log::error!("Err: {:#?}", e)
};
}
Loading