adds support for click extensions on osx arm (#58)

Co-authored-by: Chris Hanna <[email protected]>
lucassklp · Aug 19, 2024 · 7bc2c09 · 7bc2c09
1 parent d98cb96
commit 7bc2c09
Show file tree

Hide file tree

Showing 5 changed files with 87 additions and 3 deletions.
diff --git a/Desktop.Robot/Clicks/Clicks.cs b/Desktop.Robot/Clicks/Clicks.cs
@@ -24,7 +24,9 @@ public static IClick RightButton(int delay)
         {
             if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
             {
-                return new OSX.RightClick(delay);
+                return RuntimeInformation.ProcessArchitecture == Architecture.Arm64 
+                    ? new OSX.ARM.RightClick(delay) 
+                    : new OSX.RightClick(delay);
             }
             else if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
             {
@@ -44,7 +46,9 @@ public static IClick LeftButton(int delay)
         {
             if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
             {
-                return new OSX.LeftClick(delay);
+                return RuntimeInformation.ProcessArchitecture == Architecture.Arm64 
+                    ? new OSX.ARM.LeftClick(delay) 
+                    : new OSX.LeftClick(delay);
             }
             else if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
             {
@@ -64,7 +68,9 @@ public static IClick MiddleButton(int delay)
         {
             if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
             {
-                return new OSX.MiddleClick(delay);
+                return RuntimeInformation.ProcessArchitecture == Architecture.Arm64 
+                    ? new OSX.ARM.MiddleClick(delay) 
+                    : new OSX.MiddleClick(delay);
             }
             else if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
             {

diff --git a/Desktop.Robot/Clicks/OSX/ARM/Common.cs b/Desktop.Robot/Clicks/OSX/ARM/Common.cs
@@ -0,0 +1,27 @@
+using System.Runtime.InteropServices;
+
+namespace Desktop.Robot.Clicks.OSX.ARM
+{
+    static class Common
+    {
+        [DllImport("./osx_arm.os", EntryPoint = "rightMouseUp")]
+        internal static extern void RightClickUp(uint x, uint y);
+
+        [DllImport("./osx_arm.os", EntryPoint = "rightMouseDown")]
+        internal static extern void RightClickDown(uint x, uint y);
+
+
+        [DllImport("./osx_arm.os", EntryPoint = "leftMouseUp")]
+        internal static extern void LeftClickUp(uint x, uint y);
+
+        [DllImport("./osx_arm.os", EntryPoint = "leftMouseDown")]
+        internal static extern void LeftClickDown(uint x, uint y);
+
+
+        [DllImport("./osx_arm.os", EntryPoint = "otherMouseUp")]
+        internal static extern void OtherClickUp(uint x, uint y);
+
+        [DllImport("./osx_arm.os", EntryPoint = "otherMouseDown")]
+        internal static extern void OtherClickDown(uint x, uint y);
+    }
+}
diff --git a/Desktop.Robot/Clicks/OSX/ARM/LeftClick.cs b/Desktop.Robot/Clicks/OSX/ARM/LeftClick.cs
@@ -0,0 +1,17 @@
+namespace Desktop.Robot.Clicks.OSX.ARM
+{
+    internal record LeftClick(int delay) : IClick
+    {
+        public int Delay => delay;
+
+        public void ExecuteMouseDown(MouseContext context)
+        {
+            Common.LeftClickDown((uint)context.Position.X, (uint)context.Position.Y);
+        }
+
+        public void ExecuteMouseUp(MouseContext context)
+        {
+            Common.LeftClickUp((uint)context.Position.X, (uint)context.Position.Y);
+        }
+    }
+}
diff --git a/Desktop.Robot/Clicks/OSX/ARM/MiddleClick.cs b/Desktop.Robot/Clicks/OSX/ARM/MiddleClick.cs
@@ -0,0 +1,17 @@
+namespace Desktop.Robot.Clicks.OSX.ARM
+{
+    internal record MiddleClick(int delay) : IClick
+    {
+        public int Delay => delay;
+
+        public void ExecuteMouseDown(MouseContext context)
+        {
+            Common.OtherClickDown((uint)context.Position.X, (uint)context.Position.Y);
+        }
+
+        public void ExecuteMouseUp(MouseContext context)
+        {
+            Common.OtherClickUp((uint)context.Position.X, (uint)context.Position.Y);
+        }
+    }
+}
diff --git a/Desktop.Robot/Clicks/OSX/ARM/RightClick.cs b/Desktop.Robot/Clicks/OSX/ARM/RightClick.cs
@@ -0,0 +1,17 @@
+namespace Desktop.Robot.Clicks.OSX.ARM
+{
+    internal record RightClick(int delay) : IClick
+    {
+        public int Delay => delay;
+
+        public void ExecuteMouseDown(MouseContext context)
+        {
+            Common.RightClickDown((uint)context.Position.X, (uint)context.Position.Y);
+        }
+
+        public void ExecuteMouseUp(MouseContext context)
+        {
+            Common.RightClickUp((uint)context.Position.X, (uint)context.Position.Y);
+        }
+    }
+}