update engigo

Author: pysrc

dsserver/Cargo.toml

@@ -9,6 +9,6 @@ edition = "2021"
 dscom = {path = "../dscom"}
 
 scrap = "0.5"
-enigo = "0.1.3"
 
 vpx-codec = { path = "../libs/vpx-codec" }
+enigo = {path = "../libs/enigo"}

dsserver/src/key_mouse.rs

@@ -1,74 +1,75 @@
 
 
-pub fn mouse_to_engin(key: u8) -> Option<enigo::MouseButton> {
+pub fn mouse_to_engin(key: u8) -> Option<enigo::Button> {
     match key {
-        233 => Some(enigo::MouseButton::Left),
-        235 => Some(enigo::MouseButton::Right),
+        0 => Some(enigo::Button::Left),
+        1 => Some(enigo::Button::Middle),
+        2 => Some(enigo::Button::Right),
         _ => None,
     }
 }
 
 pub fn key_to_enigo(key: u8) -> Option<enigo::Key> {
     match key {
         27 => Some(enigo::Key::Escape),
-        190 => Some(enigo::Key::F1),
-        191 => Some(enigo::Key::F2),
-        192 => Some(enigo::Key::F3),
-        193 => Some(enigo::Key::F4),
-        194 => Some(enigo::Key::F5),
-        195 => Some(enigo::Key::F6),
-        196 => Some(enigo::Key::F7),
-        197 => Some(enigo::Key::F8),
-        198 => Some(enigo::Key::F9),
-        199 => Some(enigo::Key::F10),
-        200 => Some(enigo::Key::F11),
-        201 => Some(enigo::Key::F12),
+        112 => Some(enigo::Key::F1),
+        113 => Some(enigo::Key::F2),
+        114 => Some(enigo::Key::F3),
+        115 => Some(enigo::Key::F4),
+        116 => Some(enigo::Key::F5),
+        117 => Some(enigo::Key::F6),
+        118 => Some(enigo::Key::F7),
+        119 => Some(enigo::Key::F8),
+        120 => Some(enigo::Key::F9),
+        121 => Some(enigo::Key::F10),
+        122 => Some(enigo::Key::F11),
+        123 => Some(enigo::Key::F12),
         // 19 => Some(enigo::Key::Pause), // Pause
         // 97 => Some(enigo::Key::Print), // Print
-        255 => Some(enigo::Key::Delete),
-        87 => Some(enigo::Key::End),
-        96 => Some(enigo::Key::Layout('`')),
-        48 => Some(enigo::Key::Layout('0')),
-        49 => Some(enigo::Key::Layout('1')),
-        50 => Some(enigo::Key::Layout('2')),
-        51 => Some(enigo::Key::Layout('3')),
-        52 => Some(enigo::Key::Layout('4')),
-        53 => Some(enigo::Key::Layout('5')),
-        54 => Some(enigo::Key::Layout('6')),
-        55 => Some(enigo::Key::Layout('7')),
-        56 => Some(enigo::Key::Layout('8')),
-        57 => Some(enigo::Key::Layout('9')),
-        45 => Some(enigo::Key::Layout('-')),
-        61 => Some(enigo::Key::Layout('=')),
+        46 => Some(enigo::Key::Delete),
+        35 => Some(enigo::Key::End),
+        192 => Some(enigo::Key::Unicode('`')),
+        48 => Some(enigo::Key::Unicode('0')),
+        49 => Some(enigo::Key::Unicode('1')),
+        50 => Some(enigo::Key::Unicode('2')),
+        51 => Some(enigo::Key::Unicode('3')),
+        52 => Some(enigo::Key::Unicode('4')),
+        53 => Some(enigo::Key::Unicode('5')),
+        54 => Some(enigo::Key::Unicode('6')),
+        55 => Some(enigo::Key::Unicode('7')),
+        56 => Some(enigo::Key::Unicode('8')),
+        57 => Some(enigo::Key::Unicode('9')),
+        189 => Some(enigo::Key::Unicode('-')),
+        187 => Some(enigo::Key::Unicode('=')),
         8 => Some(enigo::Key::Backspace),
         9 => Some(enigo::Key::Tab),
-        91 => Some(enigo::Key::Layout('[')),
-        93 => Some(enigo::Key::Layout(']')),
-        92 => Some(enigo::Key::Layout('\\')),
-        229 => Some(enigo::Key::CapsLock),
-        59 => Some(enigo::Key::Layout(';')),
-        39 => Some(enigo::Key::Layout('\'')),
+        219 => Some(enigo::Key::Unicode('[')),
+        221 => Some(enigo::Key::Unicode(']')),
+        220 => Some(enigo::Key::Unicode('\\')),
+        20 => Some(enigo::Key::CapsLock),
+        186 => Some(enigo::Key::Unicode(';')),
+        222 => Some(enigo::Key::Unicode('\'')),
         13 => Some(enigo::Key::Return),
-        225 => Some(enigo::Key::Shift), // ShiftL
-        44 => Some(enigo::Key::Layout(',')),
-        46 => Some(enigo::Key::Layout('.')),
-        47 => Some(enigo::Key::Layout('/')),
-        226 => Some(enigo::Key::Shift), // ShiftR
-        82 => Some(enigo::Key::UpArrow),
-        227 => Some(enigo::Key::Control), // ControlL
-        233 => Some(enigo::Key::Alt),     // AltL
+        16 => Some(enigo::Key::Shift), // ShiftL
+        188 => Some(enigo::Key::Unicode(',')),
+        190 => Some(enigo::Key::Unicode('.')),
+        191 => Some(enigo::Key::Unicode('/')),
+        161 => Some(enigo::Key::Shift), // ShiftR
+        38 => Some(enigo::Key::UpArrow),
+        17 => Some(enigo::Key::Control), // ControlL
+        18 => Some(enigo::Key::Alt),     // AltL
         32 => Some(enigo::Key::Space),
-        234 => Some(enigo::Key::Alt), // AltR
+        165 => Some(enigo::Key::Alt), // AltR
         // 103 => Some(enigo::Key::Menu),
-        228 => Some(enigo::Key::Control), // ControlR
-        81 => Some(enigo::Key::LeftArrow),
-        84 => Some(enigo::Key::DownArrow),
-        83 => Some(enigo::Key::RightArrow),
+        163 => Some(enigo::Key::Control), // ControlR
+        37 => Some(enigo::Key::LeftArrow),
+        40 => Some(enigo::Key::DownArrow),
+        39 => Some(enigo::Key::RightArrow),
         // 99 => Some(enigo::Key::Raw(45)), // Insert
-        86 => Some(enigo::Key::PageDown),
-        80 => Some(enigo::Key::Home),
-        85 => Some(enigo::Key::PageUp),
-        a if a >= 97 && a <= 122 => Some(enigo::Key::Layout((a - 97 + ('a' as u8)) as char)),
+        34 => Some(enigo::Key::PageDown),
+        36 => Some(enigo::Key::Home),
+        33 => Some(enigo::Key::PageUp),
+        a if a >= 65 && a <= 90 => Some(enigo::Key::Unicode((a - 65 + ('a' as u8)) as char)),
         _ => None,
     }
 }

dsserver/src/server.rs

@@ -1,15 +1,23 @@
+use enigo::agent::Agent;
+use enigo::Axis;
+use enigo::Coordinate;
+use enigo::Direction;
+use enigo::Enigo;
+use enigo::Keyboard;
+use enigo::Mouse;
+use enigo::Settings;
+
 use crate::key_mouse;
 use crate::screen;
-use enigo::Enigo;
-use enigo::KeyboardControllable;
-use enigo::MouseControllable;
 use std::collections::hash_map::DefaultHasher;
 use std::hash::Hasher;
 use std::io::Read;
 use std::io::Write;
 use std::net::TcpListener;
 use std::net::TcpStream;
 use std::sync::mpsc::channel;
+use std::sync::LazyLock;
+use std::sync::Mutex;
 use std::thread;
 use std::time;
 
@@ -105,50 +113,77 @@ pub fn run(port: u16, pwd: String) {
     }
 }
 
+
+static mut ENIGO: LazyLock<Mutex<Enigo>> =
+    LazyLock::new(|| Mutex::new(Enigo::new(&Settings::default()).unwrap()));
+
 /**
  * 事件处理
  */
 fn event(mut stream: TcpStream) {
     let mut cmd = [0u8];
     let mut move_cmd = [0u8; 4];
-    let mut enigo = Enigo::new();
     while let Ok(_) = stream.read_exact(&mut cmd) {
         match cmd[0] {
             dscom::KEY_UP => {
                 stream.read_exact(&mut cmd).unwrap();
                 if let Some(key) = key_mouse::key_to_enigo(cmd[0]) {
-                    enigo.key_up(key);
+                    unsafe {
+                        if let std::result::Result::Ok(mut eg) = ENIGO.lock() {
+                            let _ = eg.key(key, Direction::Release);
+                        }
+                    }
                 }
             }
             dscom::KEY_DOWN => {
                 stream.read_exact(&mut cmd).unwrap();
                 if let Some(key) = key_mouse::key_to_enigo(cmd[0]) {
-                    enigo.key_down(key);
+                    unsafe {
+                        if let std::result::Result::Ok(mut eg) = ENIGO.lock() {
+                            let _ = eg.key(key, Direction::Press);
+                        }
+                    }
                 }
             }
             dscom::MOUSE_KEY_UP => {
                 stream.read_exact(&mut cmd).unwrap();
-                if let Some(key) = key_mouse::mouse_to_engin(cmd[0]) {
-                    enigo.mouse_up(key);
+                if let Some(button) = key_mouse::mouse_to_engin(cmd[0]) {
+                    unsafe {
+                        if let std::result::Result::Ok(mut eg) = ENIGO.lock() {
+                            let _ = eg.button(button, Direction::Release);
+                        }
+                    }
                 }
             }
             dscom::MOUSE_KEY_DOWN => {
                 stream.read_exact(&mut cmd).unwrap();
-                if let Some(key) = key_mouse::mouse_to_engin(cmd[0]) {
-                    enigo.mouse_down(key);
+                if let Some(button) = key_mouse::mouse_to_engin(cmd[0]) {
+                    unsafe {
+                        if let std::result::Result::Ok(mut eg) = ENIGO.lock() {
+                            let _ = eg.button(button, Direction::Press);
+                        }
+                    }
                 }
             }
-            dscom::MOUSE_WHEEL_UP => {
-                enigo.mouse_scroll_y(-2);
+            dscom::MOUSE_WHEEL_UP => unsafe {
+                if let std::result::Result::Ok(mut eg) = ENIGO.lock() {
+                    let _ = eg.scroll(-2, Axis::Vertical);
+                }
             }
-            dscom::MOUSE_WHEEL_DOWN => {
-                enigo.mouse_scroll_y(2);
+            dscom::MOUSE_WHEEL_DOWN => unsafe {
+                if let std::result::Result::Ok(mut eg) = ENIGO.lock() {
+                    let _ = eg.scroll(2, Axis::Vertical);
+                }
             }
             dscom::MOVE => {
                 stream.read_exact(&mut move_cmd).unwrap();
                 let x = ((move_cmd[0] as i32) << 8) | (move_cmd[1] as i32);
                 let y = ((move_cmd[2] as i32) << 8) | (move_cmd[3] as i32);
-                enigo.mouse_move_to(x, y);
+                unsafe {
+                    if let std::result::Result::Ok(mut eg) = ENIGO.lock() {
+                        let _ = eg.move_mouse(x, y, Coordinate::Abs);
+                    }
+                }
             }
             _ => {
                 return;

libs/enigo/.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,25 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ""
+labels: bug, needs investigation
+assignees: ""
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps or a minimal code example to reproduce the behavior.
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Environment (please complete the following information):**
+
+- OS: [e.g. Linux, Windows, macOS ..]
+- Rust [e.g. rustc --version]
+- Library Version [e.g. enigo 0.0.13 or commit hash fa448be ]
+
+**Additional context**
+Add any other context about the problem here.

libs/enigo/.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,19 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ""
+labels: enhancement, needs investigation
+assignees: ""
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

libs/enigo/.github/ISSUE_TEMPLATE/question.md

@@ -0,0 +1,19 @@
+---
+name: Question
+about: Ask your Question here
+title: ""
+labels: question
+assignees: ""
+---
+
+**Describe your Question**
+A clear and concise description of what you want to know.
+
+**Describe your Goal**
+A clear and concise description of what you want to achieve. Consider the [XYProblem](http://xyproblem.info/)
+
+**Environment (please complete the following information):**
+
+- OS: [e.g. Linux, Windows, macOS ..]
+- Rust [e.g. rustc --version]
+- Library Version [e.g. enigo 0.0.13 or commit hash fa448be ]

libs/enigo/.github/actions/headless_display/action.yml

@@ -0,0 +1,18 @@
+name: "headless_display"
+description: "Creates a virtual display so e.g Firefox can start"
+
+runs:
+  using: "composite"
+  steps:
+    - name: Install Xvfb on Linux
+      if: runner.os == 'Linux'
+      run: |
+          sudo apt-get install -y xvfb
+          which Xvfb
+          # Set DISPLAY env variable
+          echo "DISPLAY=:99.0" >> $GITHUB_ENV
+          # Create virtual display with Xvfb
+          Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
+          # Wait for Xvfb to start
+          sleep 3
+      shell: bash

libs/enigo/.github/actions/install_deps/action.yml

@@ -0,0 +1,21 @@
+name: "Install_deps"
+description: "Installs the dependencies and updates the system"
+
+runs:
+  using: "composite"
+  steps:
+    - name:  Install dependencies
+      run:   |
+        if [ "$RUNNER_OS" == "Linux" ]; then
+          sudo apt-get update -q -y && sudo apt-get upgrade -y
+          sudo apt-get install -y libxdo-dev libxkbcommon-dev libxi-dev libxtst-dev
+          echo "$RUNNER_OS"
+        elif [ "$RUNNER_OS" == "Windows" ]; then
+          echo "$RUNNER_OS"
+        elif [ "$RUNNER_OS" == "macOS" ]; then
+          echo "$RUNNER_OS"
+        else
+          echo "$RUNNER_OS not supported"
+          exit 1
+        fi
+      shell: bash

libs/enigo/.github/actions/screenshot/action.yml

@@ -0,0 +1,33 @@
+name: "screenshot"
+description: "Creates a screenshot"
+inputs:
+  rust:
+    description: 'Name of the Rust version'     
+    required: true
+  platform:
+    description: 'Name of the OS'     
+    required: true
+  feature:
+    description: 'Activated features'     
+    required: true
+
+runs:
+  using: "composite"
+  steps:
+    - name: Echo inputs
+      shell: bash
+      run: echo "${{ inputs.platform }}_${{ inputs.rust }}_${{ inputs.feature }}"
+    - uses: OrbitalOwen/desktop-screenshot-action@7f96d072f57e00c3bad73e9f3282f1258262b85d
+      if: runner.os != 'Linux'
+      with:
+        file-name: '${{ inputs.platform }}_${{ inputs.rust }}_${{ inputs.feature }}.jpg'
+    - name: Take screenshot on Linux
+      if: runner.os == 'Linux'
+      shell: bash
+      run: DISPLAY=$DISPLAY import -window root -quality 90 ./'${{ inputs.platform }}_${{ inputs.rust }}_${{ inputs.feature }}.jpg'
+    - uses: actions/upload-artifact@v4
+      if: runner.os == 'Linux'
+      with:
+        name: '${{ inputs.platform }}_${{ inputs.rust }}_${{ inputs.feature }}.jpg'
+        path: '${{ inputs.platform }}_${{ inputs.rust }}_${{ inputs.feature }}.jpg'
+        overwrite: true