Merge pull request #77 from waycrate/remove_temp_pause

[update] Exit on SIGINT ( Control + c ).
waycrate · Mar 6, 2022 · 6046f14 · 6046f14
2 parents c36bd28 + 185dbd0
commit 6046f14
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -41,7 +41,6 @@ After opening swhkd, you can control the program through signals:
 - `sudo pkill -USR1 swhkd` - Pause key checking
 - `sudo pkill -USR2 swhkd` - Resume key checking
 - `sudo pkill -HUP swhkd` - Reload config file
-- `sudo pkill -INT swhkd` - Pause key checking temporarily (resume by pressing `super+shift+escape`)
 
 ## Configuration
 

diff --git a/src/daemon.rs b/src/daemon.rs
@@ -157,8 +157,6 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         SIGSYS, SIGTERM, SIGTRAP, SIGTSTP, SIGVTALRM, SIGXCPU, SIGXFSZ,
     ])?;
     let mut paused = false;
-    let mut temp_paused = false;
-
     let mut last_hotkey: Option<config::Hotkey> = None;
     let mut keyboard_states: Vec<KeyboardState> = Vec::new();
     let mut keyboard_stream_map = StreamMap::new();
@@ -200,7 +198,8 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
                         hotkeys = load_config();
                     }
                     SIGINT => {
-                        temp_paused = true;
+                        log::warn!("Received SIGINT signal, exiting...");
+                        exit(1);
                     }
                     _ => {
                         let keyboard_devices = evdev::enumerate().filter(check_keyboard);
@@ -272,15 +271,6 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
                 log::debug!("state_modifiers: {:#?}", keyboard_state.state_modifiers);
                 log::debug!("state_keysyms: {:#?}", keyboard_state.state_keysyms);
                 log::debug!("hotkey: {:#?}", possible_hotkeys);
-                if temp_paused {
-                    if keyboard_state.state_modifiers.iter().all(|x| {
-                        vec![config::Modifier::Shift, config::Modifier::Super].contains(x)
-                    }) && keyboard_state.state_keysyms.contains(evdev::Key::KEY_ESC)
-                    {
-                        temp_paused = false;
-                    }
-                    continue;
-                }
 
                 for hotkey in possible_hotkeys {
                     // this should check if state_modifiers and hotkey.modifiers have the same elements