add config options for waking dpms on mouse and keyboard interaction

toml-config/src/config.rs

@@ -560,6 +560,8 @@ pub struct Config {
     pub inputs: Vec<Input>,
     pub idle: Option<Duration>,
     pub grace_period: Option<Duration>,
+    pub key_press_enables_dpms: Option<bool>,
+    pub mouse_move_enables_dpms: Option<bool>,
     pub explicit_sync_enabled: Option<bool>,
     pub focus_follows_mouse: bool,
     pub window_management_key: Option<ModifiedKeySym>,

toml-config/src/config/parsers/config.rs

@@ -367,11 +367,15 @@ impl Parser for ConfigParser<'_> {
         }
         let mut idle = None;
         let mut grace_period = None;
+        let mut key_press_enables_dpms = None;
+        let mut mouse_move_enables_dpms = None;
         if let Some(value) = idle_val {
             match value.parse(&mut IdleParser(self.0)) {
                 Ok(v) => {
                     idle = v.timeout;
                     grace_period = v.grace_period;
+                    key_press_enables_dpms = v.key_press_enables_dpms;
+                    mouse_move_enables_dpms = v.mouse_move_enables_dpms;
                 }
                 Err(e) => {
                     log::warn!("Could not parse the idle timeout: {}", self.0.error(e));
@@ -581,6 +585,8 @@ impl Parser for ConfigParser<'_> {
             inputs,
             idle,
             grace_period,
+            key_press_enables_dpms,
+            mouse_move_enables_dpms,
             focus_follows_mouse: focus_follows_mouse.despan().unwrap_or(true),
             window_management_key,
             vrr,

toml-config/src/config/parsers/idle.rs

@@ -2,7 +2,7 @@ use {
     crate::{
         config::{
             context::Context,
-            extractor::{Extractor, ExtractorError, n64, opt, val},
+            extractor::{Extractor, ExtractorError, bol, n64, opt, recover, val},
             parser::{DataType, ParseResult, Parser, UnexpectedDataType},
         },
         toml::{
@@ -28,6 +28,8 @@ pub struct IdleParser<'a>(pub &'a Context<'a>);
 pub struct Idle {
     pub timeout: Option<Duration>,
     pub grace_period: Option<Duration>,
+    pub key_press_enables_dpms: Option<bool>,
+    pub mouse_move_enables_dpms: Option<bool>,
 }
 
 impl Parser for IdleParser<'_> {
@@ -41,10 +43,18 @@ impl Parser for IdleParser<'_> {
         table: &IndexMap<Spanned<String>, Spanned<Value>>,
     ) -> ParseResult<Self> {
         let mut ext = Extractor::new(self.0, span, table);
-        let (minutes, seconds, grace_period_val) = ext.extract((
+        let (
+            minutes,
+            seconds,
+            grace_period_val,
+            key_press_enables_dpms,
+            mouse_move_enables_dpms,
+        ) = ext.extract((
             opt(n64("minutes")),
             opt(n64("seconds")),
             opt(val("grace-period")),
+            recover(opt(bol("key-press-enables-dpms"))),
+            recover(opt(bol("mouse-move-enables-dpms"))),
         ))?;
         let mut timeout = None;
         if minutes.is_some() || seconds.is_some() {
@@ -57,6 +67,8 @@ impl Parser for IdleParser<'_> {
         Ok(Idle {
             timeout,
             grace_period,
+            key_press_enables_dpms: key_press_enables_dpms.despan(),
+            mouse_move_enables_dpms: mouse_move_enables_dpms.despan(),
         })
     }
 }

toml-config/src/lib.rs

@@ -40,9 +40,9 @@ use {
         on_devices_enumerated, on_idle, on_unload, quit, reload, set_autotile,
         set_color_management_enabled, set_corner_radius, set_default_workspace_capture,
         set_explicit_sync_enabled, set_float_above_fullscreen, set_floating_titles, set_idle,
-        set_idle_grace_period, set_middle_click_paste_enabled, set_show_bar,
-        set_show_float_pin_icon, set_show_titles, set_tab_title_align, set_ui_drag_enabled,
-        set_ui_drag_threshold,
+        set_idle_grace_period, set_key_press_enables_dpms, set_middle_click_paste_enabled,
+        set_mouse_move_enables_dpms, set_show_bar, set_show_float_pin_icon, set_show_titles,
+        set_tab_title_align, set_ui_drag_enabled, set_ui_drag_threshold,
         status::{set_i3bar_separator, set_status, set_status_command, unset_status_command},
         switch_to_vt,
         tasks::{self, JoinHandle},
@@ -1657,6 +1657,8 @@ fn load_config(initial_load: bool, auto_reload: bool, persistent: &Rc<Persistent
             set_x_scaling_mode(mode);
         }
     }
+    set_key_press_enables_dpms(config.key_press_enables_dpms.unwrap_or(false));
+    set_mouse_move_enables_dpms(config.mouse_move_enables_dpms.unwrap_or(false));
     if let Some(cm) = config.color_management
         && let Some(enabled) = cm.enabled
     {