From 97718b33a6e31cb062b03e6cd4fac2673939ee28 Mon Sep 17 00:00:00 2001
From: fufesou <shuanglongchen@yeah.net>
Date: Mon, 2 Jan 2023 13:11:21 +0800
Subject: [PATCH] remove expect

Signed-off-by: fufesou <shuanglongchen@yeah.net>
---
 Cargo.lock                       | 2 +-
 libs/enigo/Cargo.toml            | 2 +-
 libs/enigo/src/lib.rs            | 5 +++--
 libs/enigo/src/linux/nix_impl.rs | 8 +++++++-
 libs/enigo/src/linux/xdo.rs      | 5 +++--
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 45b7c1eb5..cdccce4cb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5386,7 +5386,7 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
 [[package]]
 name = "tfc"
 version = "0.6.1"
-source = "git+https://github.com/asur4s/The-Fat-Controller#48303c5dacded6ea1873bc5d69bdde3175cf336a"
+source = "git+https://github.com/fufesou/The-Fat-Controller#48303c5dacded6ea1873bc5d69bdde3175cf336a"
 dependencies = [
  "core-graphics 0.22.3",
  "unicode-segmentation",
diff --git a/libs/enigo/Cargo.toml b/libs/enigo/Cargo.toml
index 2c4070ed1..cc4173a97 100644
--- a/libs/enigo/Cargo.toml
+++ b/libs/enigo/Cargo.toml
@@ -23,7 +23,7 @@ serde = { version = "1.0", optional = true }
 serde_derive = { version = "1.0", optional = true }
 log = "0.4"
 rdev = { git = "https://github.com/fufesou/rdev" }
-tfc = { git = "https://github.com/asur4s/The-Fat-Controller" }
+tfc = { git = "https://github.com/fufesou/The-Fat-Controller" }
 hbb_common = { path = "../hbb_common" }
 
 [features]
diff --git a/libs/enigo/src/lib.rs b/libs/enigo/src/lib.rs
index a47f9558d..caa08bd55 100644
--- a/libs/enigo/src/lib.rs
+++ b/libs/enigo/src/lib.rs
@@ -447,8 +447,9 @@ pub trait KeyboardControllable {
     where
         Self: Sized,
     {
-        self.key_sequence_parse_try(sequence)
-            .expect("Could not parse sequence");
+        if let Err(..) = self.key_sequence_parse_try(sequence) {
+            println!("Could not parse sequence");
+        }
     }
     /// Same as key_sequence_parse except returns any errors
     fn key_sequence_parse_try(&mut self, sequence: &str) -> Result<(), dsl::ParseError>
diff --git a/libs/enigo/src/linux/nix_impl.rs b/libs/enigo/src/linux/nix_impl.rs
index 4eb890c29..47e6d53c0 100644
--- a/libs/enigo/src/linux/nix_impl.rs
+++ b/libs/enigo/src/linux/nix_impl.rs
@@ -88,7 +88,13 @@ impl Default for Enigo {
         Self {
             is_x11,
             tfc: if is_x11 {
-                Some(TFC_Context::new().expect("kbd context error"))
+                match TFC_Context::new() {
+                    Ok(ctx) => Some(ctx),
+                    Err(..) => {
+                        println!("kbd context error");
+                        None
+                    }
+                }
             } else {
                 None
             },
diff --git a/libs/enigo/src/linux/xdo.rs b/libs/enigo/src/linux/xdo.rs
index ed2d28dc1..204420adc 100644
--- a/libs/enigo/src/linux/xdo.rs
+++ b/libs/enigo/src/linux/xdo.rs
@@ -391,8 +391,9 @@ impl KeyboardControllable for EnigoXdo {
     where
         Self: Sized,
     {
-        self.key_sequence_parse_try(sequence)
-            .expect("Could not parse sequence");
+        if let Err(..) = self.key_sequence_parse_try(sequence) {
+            println!("Could not parse sequence");
+        }
     }
 
     fn key_sequence_parse_try(&mut self, sequence: &str) -> Result<(), crate::dsl::ParseError>