touchscreen: Allow turning touch on and off

Signed-off-by: Daniel Schaefer <[email protected]>

Author: JohnAZoidberg

framework_lib/src/commandline/clap_std.rs

@@ -162,6 +162,11 @@ struct ClapCli {
     #[arg(long)]
     tablet_mode: Option<TabletModeArg>,
 
+    /// Enable/disable touchscreen
+    #[clap(value_enum)]
+    #[arg(long)]
+    touchscreen_enable: Option<bool>,
+
     /// Get EC console, choose whether recent or to follow the output
     #[clap(value_enum)]
     #[arg(long)]
@@ -284,6 +289,7 @@ pub fn parse(args: &[String]) -> Cli {
         kblight: args.kblight,
         rgbkbd: args.rgbkbd,
         tablet_mode: args.tablet_mode,
+        touchscreen_enable: args.touchscreen_enable,
         console: args.console,
         reboot_ec: args.reboot_ec,
         hash: args.hash.map(|x| x.into_os_string().into_string().unwrap()),

framework_lib/src/commandline/mod.rs

@@ -52,8 +52,8 @@ use crate::smbios::ConfigDigit0;
 use crate::smbios::{dmidecode_string_val, get_smbios, is_framework};
 #[cfg(feature = "hidapi")]
 use crate::touchpad::print_touchpad_fw_ver;
-#[cfg(feature = "hidapi")]
-use crate::touchscreen::print_touchscreen_fw_ver;
+#[cfg(any(feature = "hidapi", feature = "windows"))]
+use crate::touchscreen;
 #[cfg(feature = "uefi")]
 use crate::uefi::enable_page_break;
 use crate::util;
@@ -175,6 +175,7 @@ pub struct Cli {
     pub kblight: Option<Option<u8>>,
     pub rgbkbd: Vec<u64>,
     pub tablet_mode: Option<TabletModeArg>,
+    pub touchscreen_enable: Option<bool>,
     pub console: Option<ConsoleArg>,
     pub reboot_ec: Option<RebootEcArg>,
     pub hash: Option<String>,
@@ -483,7 +484,7 @@ fn print_versions(ec: &CrosEc) {
     let _ignore_err = print_touchpad_fw_ver();
 
     #[cfg(feature = "hidapi")]
-    let _ignore_err = print_touchscreen_fw_ver();
+    let _ignore_err = touchscreen::print_fw_ver();
 }
 
 fn print_esrt() {
@@ -798,6 +799,11 @@ pub fn run_with_args(args: &Cli, _allupdate: bool) -> i32 {
             TabletModeArg::Laptop => TabletModeOverride::ForceClamshell,
         };
         ec.set_tablet_mode(mode);
+    } else if let Some(_enable) = &args.touchscreen_enable {
+        #[cfg(any(feature = "hidapi", feature = "windows"))]
+        if touchscreen::enable_touch(*_enable).is_none() {
+            error!("Failed to enable/disable touch");
+        }
     } else if let Some(console_arg) = &args.console {
         match console_arg {
             ConsoleArg::Follow => {

framework_lib/src/commandline/uefi.rs

@@ -89,6 +89,7 @@ pub fn parse(args: &[String]) -> Cli {
         kblight: None,
         rgbkbd: vec![],
         tablet_mode: None,
+        touchscreen_enable: None,
         console: None,
         reboot_ec: None,
         hash: None,

framework_lib/src/touchscreen.rs

@@ -130,13 +130,27 @@ pub trait TouchScreen {
 
         Some(())
     }
+
+    fn enable_touch(&self, enable: bool) -> Option<()> {
+        self.send_message(0x38, 0, vec![0, !enable as u8])?;
+        Some(())
+    }
 }
 
-pub fn print_touchscreen_fw_ver() -> Option<()> {
+pub fn print_fw_ver() -> Option<()> {
     #[cfg(target_os = "windows")]
     let device = touchscreen_win::NativeWinTouchScreen::open_device()?;
     #[cfg(not(target_os = "windows"))]
     let device = HidapiTouchScreen::open_device()?;
 
     device.check_fw_version()
 }
+
+pub fn enable_touch(enable: bool) -> Option<()> {
+    #[cfg(target_os = "windows")]
+    let device = touchscreen_win::NativeWinTouchScreen::open_device()?;
+    #[cfg(not(target_os = "windows"))]
+    let device = HidapiTouchScreen::open_device()?;
+
+    device.enable_touch(enable)
+}