Fix #63

flake.nix

@@ -34,7 +34,7 @@
         # `nix develop`
         devShell = pkgs.mkShell {
           buildInputs = buildInputs;
-          nativeBuildInputs = nativeBuildInputs ++ (with pkgs; [ rustc cargo gnome3.zenity ]);
+          nativeBuildInputs = nativeBuildInputs ++ (with pkgs; [ rustc cargo gnome3.zenity pipes ]);
         };
       });
 }

test-pid.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+cargo run -- \
+    --timer 2 'pipes.sh' 'kill "$XIDLEHOOK_PID"'

xidlehook-core/src/lib.rs

@@ -348,9 +348,6 @@ where
                 );
                 max_sleep = cmp::min(max_sleep, remaining)
             }
-        } else {
-            // No timer was enabled!
-            return Ok(Action::Forever);
         }
 
         if self.aborted {
@@ -414,7 +411,11 @@ where
             }
         }
 
-        Ok(Action::Sleep(max_sleep))
+        if max_sleep == Duration::from_secs(u64::MAX) {
+            Ok(Action::Forever)
+        } else {
+            Ok(Action::Sleep(max_sleep))
+        }
     }
 
     /// Runs a standard poll-sleep-repeat loop.

xidlehook-core/src/timers.rs

@@ -74,7 +74,17 @@ impl Timer for CmdTimer {
 
     fn activate(&mut self) -> Result<()> {
         if let Some(ref mut activation) = self.activation {
-            self.activation_child = Some(activation.spawn()?);
+            let child = activation.spawn()?;
+            let pid = child.id().to_string();
+
+            if let Some(ref mut abortion) = self.abortion {
+                abortion.env("XIDLEHOOK_PID", &pid);
+            }
+            if let Some(ref mut deactivation) = self.deactivation {
+                deactivation.env("XIDLEHOOK_PID", &pid);
+            }
+
+            self.activation_child = Some(child);
         }
         Ok(())
     }