Merge pull request #26 from LegendaryB/feature/25-global-mouse-keyboard-hook-instead-of-getlastinputinfo

Merghe feature/25 global mouse keyboard hook instead of getlastinputinfo into develop

Author: LegendaryB

src/Kirei.Infrastructure/Kirei.Infrastructure.csproj

@@ -16,6 +16,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
     <PackageReference Include="Microsoft.Win32.Registry" Version="4.5.0" />
+    <PackageReference Include="NeatInput" Version="1.0.0" />
   </ItemGroup>
 
   <ItemGroup>

src/Kirei.Infrastructure/Native/User32.Wrappers.cs

@@ -9,15 +9,6 @@ namespace Kirei.Infrastructure.Native
 {
     internal static partial class User32
     {
-        internal struct LASTINPUTINFO
-        {
-            public uint cbSize;
-            public uint dwTime;
-        }
-
-        [DllImport("user32.dll")]
-        private static extern bool GetLastInputInfo(ref LASTINPUTINFO plii);
-
         [DllImport("user32.dll", CharSet = CharSet.Auto)]
         private static extern int GetClassName(
             IntPtr hWnd,
@@ -39,16 +30,6 @@ SetWindowPosFlags uFlags
         private static extern bool GetWindowRect(
             IntPtr hwnd,
             ref RECT rectangle);
-
-        internal static long GetUserIdleTime()
-        {
-            var lastInputStruct = new LASTINPUTINFO();
-            lastInputStruct.cbSize = (uint)Marshal.SizeOf(lastInputStruct);
-
-            GetLastInputInfo(ref lastInputStruct);
-
-            return ((uint)Environment.TickCount - lastInputStruct.dwTime);
-        }
 
         internal static string GetClassName(IntPtr hWnd)
         {

src/Kirei.Infrastructure/System/Input/InputListener.cs

@@ -1,25 +1,37 @@
 using Kirei.Application.System.Input;
 using Kirei.Infrastructure.Configuration;
-using Kirei.Infrastructure.Native;
 
+using NeatInput;
+
+using System;
 using System.Threading;
 
 namespace Kirei.Infrastructure.System.Input
 {
     public class InputListener :
         IInputListener
     {
+        private InputProvider _inputProvider;
         private IInputActionMapper _inputActionMapper;
-        private bool hasIconsBeenHidden = false;
+
+        private DateTime lastInputReceivedAt;
+        private bool hasIconsBeenHidden = false;        
 
         public void Listen(IInputActionMapper inputActionMapper)
         {
+            _inputProvider = new InputProvider();
             _inputActionMapper = inputActionMapper;
 
+            lastInputReceivedAt = DateTime.Now;
+
+            _inputProvider.InputReceived += OnInputReceived;
+
+            var inactiveAfterMs = ConfigurationProvider.Configuration.Application.InactiveAfterMs;
+            var inputPollingRateMs = ConfigurationProvider.Configuration.Application.InputPollingRate;
+
             while (true)
             {
-                var lastInputInMilliseconds = User32.GetUserIdleTime();
-                var inactiveAfterMs = ConfigurationProvider.Configuration.Application.InactiveAfterMs;
+                var lastInputInMilliseconds = DateTime.Now.Subtract(lastInputReceivedAt).TotalMilliseconds;                
 
                 if (lastInputInMilliseconds >= inactiveAfterMs && !hasIconsBeenHidden)
                 {
@@ -32,8 +44,13 @@ public void Listen(IInputActionMapper inputActionMapper)
                     hasIconsBeenHidden = false;
                 }                
 
-                Thread.Sleep(ConfigurationProvider.Configuration.Application.InputPollingRate);
+                Thread.Sleep(inputPollingRateMs);
             }
         }
+
+        private void OnInputReceived(NeatInput.Domain.Hooking.Input input)
+        {
+            lastInputReceivedAt = DateTime.Now;
+        }
     }
 }