From 94e79a0d2ba88f1a618aadf9601798c11fc37c14 Mon Sep 17 00:00:00 2001
From: William Edwards <shadowapex@gmail.com>
Date: Wed, 7 Aug 2024 11:48:01 -0700
Subject: [PATCH] feat(TargetMouse): add MoveCursor method to virtual mouse
 interface

---
 src/dbus/interface/target/mouse.rs | 39 +++++++++++++++++++++++-------
 src/input/target/mouse.rs          |  9 ++-----
 2 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/src/dbus/interface/target/mouse.rs b/src/dbus/interface/target/mouse.rs
index 0292d65a..6ca18317 100644
--- a/src/dbus/interface/target/mouse.rs
+++ b/src/dbus/interface/target/mouse.rs
@@ -1,20 +1,22 @@
 use zbus::fdo;
 use zbus_macros::interface;
 
+use crate::input::{
+    capability::{Capability, Mouse},
+    event::{native::NativeEvent, value::InputValue},
+    target::client::TargetDeviceClient,
+};
+
 /// The [TargetMouseInterface] provides a DBus interface that can be exposed for managing
 /// a [MouseDevice]. It works by sending command messages to a channel that the
 /// [MouseDevice] is listening on.
-pub struct TargetMouseInterface {}
-
-impl TargetMouseInterface {
-    pub fn new() -> TargetMouseInterface {
-        TargetMouseInterface {}
-    }
+pub struct TargetMouseInterface {
+    target_device: TargetDeviceClient,
 }
 
-impl Default for TargetMouseInterface {
-    fn default() -> Self {
-        Self::new()
+impl TargetMouseInterface {
+    pub fn new(target_device: TargetDeviceClient) -> TargetMouseInterface {
+        TargetMouseInterface { target_device }
     }
 }
 
@@ -25,4 +27,23 @@ impl TargetMouseInterface {
     async fn name(&self) -> fdo::Result<String> {
         Ok("Mouse".into())
     }
+
+    /// Move the virtual mouse by the given amount relative to the cursor's
+    /// relative position.
+    async fn move_cursor(&self, x: i32, y: i32) -> fdo::Result<()> {
+        // Create a mouse motion event
+        let value = InputValue::Vector2 {
+            x: Some(x as f64),
+            y: Some(y as f64),
+        };
+        let event = NativeEvent::new(Capability::Mouse(Mouse::Motion), value);
+
+        // Write the event to the virtual mouse
+        self.target_device
+            .write_event(event)
+            .await
+            .map_err(|err| fdo::Error::Failed(err.to_string()))?;
+
+        Ok(())
+    }
 }
diff --git a/src/input/target/mouse.rs b/src/input/target/mouse.rs
index d7ae027b..090fb644 100644
--- a/src/input/target/mouse.rs
+++ b/src/input/target/mouse.rs
@@ -102,15 +102,10 @@ impl MouseDevice {
 }
 
 impl TargetInputDevice for MouseDevice {
-    fn start_dbus_interface(
-        &mut self,
-        dbus: Connection,
-        path: String,
-        _client: TargetDeviceClient,
-    ) {
+    fn start_dbus_interface(&mut self, dbus: Connection, path: String, client: TargetDeviceClient) {
         log::debug!("Starting dbus interface: {path}");
         tokio::task::spawn(async move {
-            let iface = TargetMouseInterface::new();
+            let iface = TargetMouseInterface::new(client);
             if let Err(e) = dbus.object_server().at(path.clone(), iface).await {
                 log::debug!("Failed to start dbus interface {path}: {e:?}");
             } else {