refactor: better names for delay actions, fix on-release

parser/src/cfg/list_actions.rs

@@ -55,6 +55,8 @@ pub const ON_PRESS_FAKEKEY: &str = "on-press-fakekey";
 pub const ON_PRESS_FAKEKEY_A: &str = "on↓fakekey";
 pub const ON_RELEASE_FAKEKEY: &str = "on-release-fakekey";
 pub const ON_RELEASE_FAKEKEY_A: &str = "on↑fakekey";
+pub const ON_PRESS_DELAY: &str = "on-press-delay";
+pub const ON_RELEASE_DELAY: &str = "on-release-delay";
 pub const ON_PRESS_FAKEKEY_DELAY: &str = "on-press-fakekey-delay";
 pub const ON_PRESS_FAKEKEY_DELAY_A: &str = "on↓fakekey-delay";
 pub const ON_RELEASE_FAKEKEY_DELAY: &str = "on-release-fakekey-delay";
@@ -174,6 +176,8 @@ pub fn is_list_action(ac: &str) -> bool {
         ON_PRESS_FAKEKEY_A,
         ON_RELEASE_FAKEKEY,
         ON_RELEASE_FAKEKEY_A,
+        ON_PRESS_DELAY,
+        ON_RELEASE_DELAY,
         ON_PRESS_FAKEKEY_DELAY,
         ON_PRESS_FAKEKEY_DELAY_A,
         ON_RELEASE_FAKEKEY_DELAY,

parser/src/cfg/mod.rs

@@ -1828,8 +1828,10 @@ fn parse_action_list(ac: &[SExpr], s: &ParserState) -> Result<&'static KanataAct
         RELEASE_LAYER | RELEASE_LAYER_A => parse_release_layer(&ac[1..], s),
         ON_PRESS_FAKEKEY | ON_PRESS_FAKEKEY_A => parse_on_press_fake_key_op(&ac[1..], s),
         ON_RELEASE_FAKEKEY | ON_RELEASE_FAKEKEY_A => parse_on_release_fake_key_op(&ac[1..], s),
-        ON_PRESS_FAKEKEY_DELAY | ON_PRESS_FAKEKEY_DELAY_A => parse_fake_key_delay(&ac[1..], s),
-        ON_RELEASE_FAKEKEY_DELAY | ON_RELEASE_FAKEKEY_DELAY_A => {
+        ON_PRESS_DELAY | ON_PRESS_FAKEKEY_DELAY | ON_PRESS_FAKEKEY_DELAY_A => {
+            parse_fake_key_delay(&ac[1..], s)
+        }
+        ON_RELEASE_DELAY | ON_RELEASE_FAKEKEY_DELAY | ON_RELEASE_FAKEKEY_DELAY_A => {
             parse_on_release_fake_key_delay(&ac[1..], s)
         }
         ON_IDLE_FAKEKEY => parse_on_idle_fakekey(&ac[1..], s),

src/kanata/mod.rs

@@ -1723,8 +1723,8 @@ impl Kanata {
                             );
                             pbtn
                         }
-                        CustomAction::Delay(delay) => {
-                            log::debug!("on-press: sleeping for {delay} ms");
+                        CustomAction::DelayOnRelease(delay) => {
+                            log::debug!("on-release: sleeping for {delay} ms");
                             std::thread::sleep(time::Duration::from_millis((*delay).into()));
                             pbtn
                         }

src/tests/sim_tests/delay_tests.rs

@@ -0,0 +1,42 @@
+use super::*;
+
+#[test]
+#[ignore] // timing-based: fails intermittently
+fn on_press_delay() {
+    let start = std::time::Instant::now();
+    let result = simulate(
+        "(defsrc) (deflayermap (base) a (on-press-delay 10))",
+        "d:a t:50 u:a t:50",
+    );
+    assert_eq!("", result);
+    let end = std::time::Instant::now();
+    let duration = end - start;
+    assert!(duration > std::time::Duration::from_millis(9));
+    assert!(duration < std::time::Duration::from_millis(19));
+}
+
+#[test]
+#[ignore] // timing-based: fails intermittently
+fn on_release_delay() {
+    let start = std::time::Instant::now();
+    let result = simulate(
+        "(defsrc) (deflayermap (base) a (on-release-delay 10))",
+        "d:a t:50 u:a t:50",
+    );
+    assert_eq!("", result);
+    let end = std::time::Instant::now();
+    let duration = end - start;
+    assert!(duration > std::time::Duration::from_millis(9));
+    assert!(duration < std::time::Duration::from_millis(19));
+}
+
+#[test]
+#[ignore] // timing-based: fails intermittently
+fn no_delay() {
+    let start = std::time::Instant::now();
+    let result = simulate("(defsrc) (deflayermap (base) a XX)", "d:a t:50 u:a t:50");
+    assert_eq!("", result);
+    let end = std::time::Instant::now();
+    let duration = end - start;
+    assert!(duration < std::time::Duration::from_millis(10));
+}

src/tests/sim_tests/mod.rs

@@ -15,6 +15,7 @@ use rustc_hash::FxHashMap;
 mod block_keys_tests;
 mod capsword_sim_tests;
 mod chord_sim_tests;
+mod delay_tests;
 mod layer_sim_tests;
 mod macro_sim_tests;
 mod oneshot_tests;