all: Renamed variants of Coordinate enum

enigo-rs · Nov 8, 2023 · cb6089c · cb6089c
1 parent 4097d59
commit cb6089c
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -136,7 +136,7 @@ where
     /// enigo.mouse_move_to(500, 200);
     /// ```
     fn mouse_move_to(&mut self, x: i32, y: i32) {
-        match self.move_mouse(x, y, Coordinate::Absolute) {
+        match self.move_mouse(x, y, Coordinate::Abs) {
             Ok(()) => {}
             Err(e) => {
                 error!("{e}");
@@ -159,7 +159,7 @@ where
     /// enigo.mouse_move_relative(100, 100);
     /// ```
     fn mouse_move_relative(&mut self, x: i32, y: i32) {
-        match self.move_mouse(x, y, Coordinate::Relative) {
+        match self.move_mouse(x, y, Coordinate::Rel) {
             Ok(()) => {}
             Err(e) => {
                 error!("{e}");
@@ -458,8 +458,8 @@ pub enum Axis {
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 /// Specifies if a coordinate is relative or absolute
 pub enum Coordinate {
-    Relative,
-    Absolute,
+    Rel,
+    Abs,
 }
 
 pub trait KeyboardControllableNext {

diff --git a/src/linux/wayland.rs b/src/linux/wayland.rs
@@ -682,11 +682,11 @@ impl MouseControllableNext for Con {
         if let Some(vp) = &self.virtual_pointer {
             let time = self.get_time();
             match coordinate {
-                Coordinate::Relative => {
+                Coordinate::Rel => {
                     trace!("vp.motion({time}, {x}, {y})");
                     vp.motion(time, x as f64, y as f64);
                 }
-                Coordinate::Absolute => {
+                Coordinate::Abs => {
                     let Ok(x) = x.try_into() else {
                         return Err(InputError::InvalidInput(
                             "the absolute coordinates cannot be negative",

diff --git a/src/linux/x11rb.rs b/src/linux/x11rb.rs
@@ -406,8 +406,8 @@ impl MouseControllableNext for Con {
     fn move_mouse(&mut self, x: i32, y: i32, coordinate: Coordinate) -> InputResult<()> {
         let type_ = x11rb::protocol::xproto::MOTION_NOTIFY_EVENT;
         let detail = match coordinate {
-            Coordinate::Relative => 1,
-            Coordinate::Absolute => 0,
+            Coordinate::Rel => 1,
+            Coordinate::Abs => 0,
         };
         let time = x11rb::CURRENT_TIME;
         let root = x11rb::NONE; //  the root window of the screen the pointer is currently on

diff --git a/src/linux/xdo.rs b/src/linux/xdo.rs
@@ -263,11 +263,11 @@ impl MouseControllableNext for Con {
 
     fn move_mouse(&mut self, x: i32, y: i32, coordinate: Coordinate) -> InputResult<()> {
         let res = match coordinate {
-            Coordinate::Relative => {
+            Coordinate::Rel => {
                 debug!("xdo_move_mouse_relative with x {}, y {}", x, y);
                 unsafe { xdo_move_mouse_relative(self.xdo, x as c_int, y as c_int) }
             }
-            Coordinate::Absolute => {
+            Coordinate::Abs => {
                 debug!("xdo_move_mouse with mouse button with x {}, y {}", x, y);
                 unsafe { xdo_move_mouse(self.xdo, x as c_int, y as c_int, 0) }
             }

diff --git a/src/macos/macos_impl.rs b/src/macos/macos_impl.rs
@@ -225,8 +225,8 @@ impl MouseControllableNext for Enigo {
 
         let (absolute, relative) = match coordinate {
             // TODO: Check the bounds
-            Coordinate::Absolute => ((x, y), (current_x - x, current_y - y)),
-            Coordinate::Relative => ((current_x + x, current_y + y), (x, y)),
+            Coordinate::Abs => ((x, y), (current_x - x, current_y - y)),
+            Coordinate::Rel => ((current_x + x, current_y + y), (x, y)),
         };
 
         let (event_type, mouse_button) =

diff --git a/src/win/win_impl.rs b/src/win/win_impl.rs
@@ -128,7 +128,7 @@ impl MouseControllableNext for Enigo {
     // TODO: Check if using x11rb::protocol::xproto::warp_pointer would be better
     fn move_mouse(&mut self, x: i32, y: i32, coordinate: Coordinate) -> InputResult<()> {
         debug!("\x1b[93mmove_mouse(x: {x:?}, y: {y:?}, coordinate:{coordinate:?})\x1b[0m");
-        let (x_absolute, y_absolute) = if coordinate == Coordinate::Relative {
+        let (x_absolute, y_absolute) = if coordinate == Coordinate::Rel {
             let (x_absolute, y_absolute) = self.location()?;
             (x_absolute + x, y_absolute + y)
         } else {