config: Allow overriding touchpad state

cosmic-comp-config/src/input.rs

@@ -56,6 +56,13 @@ pub enum DeviceState {
     DisabledOnExternalMouse,
 }
 
+#[derive(Debug, Default, Deserialize, Serialize, Clone, Copy, PartialEq, Eq, Hash)]
+pub enum TouchpadOverride {
+    #[default]
+    None,
+    ForceDisable,
+}
+
 impl Default for DeviceState {
     fn default() -> Self {
         Self::Enabled

cosmic-comp-config/src/lib.rs

@@ -4,6 +4,8 @@ use cosmic_config::{cosmic_config_derive::CosmicConfigEntry, CosmicConfigEntry};
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 
+use crate::input::TouchpadOverride;
+
 pub mod input;
 pub mod output;
 pub mod workspace;
@@ -29,6 +31,7 @@ pub struct CosmicCompConfig {
     pub pinned_workspaces: Vec<workspace::PinnedWorkspace>,
     pub input_default: input::InputConfig,
     pub input_touchpad: input::InputConfig,
+    pub input_touchpad_override: TouchpadOverride,
     pub input_devices: HashMap<String, input::InputConfig>,
     pub xkb_config: XkbConfig,
     pub keyboard_config: KeyboardConfig,
@@ -74,6 +77,7 @@ impl Default for CosmicCompConfig {
                 }),
                 ..Default::default()
             },
+            input_touchpad_override: Default::default(),
             input_devices: Default::default(),
             xkb_config: Default::default(),
             keyboard_config: Default::default(),

src/config/mod.rs

@@ -45,8 +45,10 @@ pub use self::types::*;
 use cosmic::config::CosmicTk;
 pub use cosmic_comp_config::output::EdidProduct;
 use cosmic_comp_config::{
-    input::InputConfig, workspace::WorkspaceConfig, CosmicCompConfig, KeyboardConfig, TileBehavior,
+    input::{DeviceState as InputDeviceState, InputConfig, TouchpadOverride},
-    XkbConfig, XwaylandDescaling, XwaylandEavesdropping, ZoomConfig,
+    workspace::WorkspaceConfig,
+    CosmicCompConfig, KeyboardConfig, TileBehavior, XkbConfig, XwaylandDescaling,
+    XwaylandEavesdropping, ZoomConfig,
 };
 
 #[derive(Debug)]
@@ -678,34 +680,46 @@ impl Config {
 
     pub fn read_device(&self, device: &mut InputDevice) {
         let (device_config, default_config) = self.get_device_config(device);
-        input_config::update_device(device, device_config, default_config);
+        input_config::update_device(device, device_config.as_ref(), default_config);
     }
 
     pub fn scroll_factor(&self, device: &InputDevice) -> f64 {
         let (device_config, default_config) = self.get_device_config(device);
-        input_config::get_config(device_config, default_config, |x| {
+        input_config::get_config(device_config.as_ref(), default_config, |x| {
             x.scroll_config.as_ref()?.scroll_factor
         })
         .map_or(1.0, |x| x.0)
     }
 
-    pub fn map_to_output(&self, device: &InputDevice) -> Option<&str> {
+    pub fn map_to_output(&self, device: &InputDevice) -> Option<String> {
         let (device_config, default_config) = self.get_device_config(device);
         Some(
-            input_config::get_config(device_config, default_config, |x| {
+            input_config::get_config(device_config.as_ref(), default_config, |x| {
-                x.map_to_output.as_deref()
+                x.map_to_output.clone()
             })?
             .0,
         )
     }
 
-    fn get_device_config(&self, device: &InputDevice) -> (Option<&InputConfig>, &InputConfig) {
+    fn get_device_config(&self, device: &InputDevice) -> (Option<InputConfig>, &InputConfig) {
-        let default_config = if device.config_tap_finger_count() > 0 {
+        let is_touchpad = device.config_tap_finger_count() > 0;
+
+        let default_config = if is_touchpad {
             &self.cosmic_conf.input_touchpad
         } else {
             &self.cosmic_conf.input_default
         };
-        let device_config = self.cosmic_conf.input_devices.get(device.name());
+
+        let mut device_config = self.cosmic_conf.input_devices.get(device.name()).cloned();
+        if is_touchpad && self.cosmic_conf.input_touchpad_override == TouchpadOverride::ForceDisable
+        {
+            device_config = Some({
+                let mut config = device_config.unwrap_or_default();
+                config.state = InputDeviceState::Disabled;
+                config
+            });
+        }
+
         (device_config, default_config)
     }
 }
@@ -886,6 +900,11 @@ fn config_changed(config: cosmic_config::Config, keys: Vec<String>, state: &mut
                 state.common.config.cosmic_conf.input_touchpad = value;
                 update_input(state);
             }
+            "input_touchpad_override" => {
+                let value = get_config::<TouchpadOverride>(&config, "input_touchpad_override");
+                state.common.config.cosmic_conf.input_touchpad_override = value;
+                update_input(state)
+            }
             "input_devices" => {
                 let value = get_config::<HashMap<String, InputConfig>>(&config, "input_devices");
                 state.common.config.cosmic_conf.input_devices = value;