added Events + Polling process detection option, increase polling to …

…2 seconds
Aurora-RGB · Dec 30, 2024 · 6b5c525 · 6b5c525
1 parent 55a5a60
commit 6b5c525
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/Project-Aurora/Project-Aurora/Modules/ProcessMonitor/ActiveProcessMonitor.cs b/Project-Aurora/Project-Aurora/Modules/ProcessMonitor/ActiveProcessMonitor.cs
@@ -31,13 +31,11 @@ private set
 	internal ActiveProcessMonitor()
 	{
 		_dele = WinEventProc;
-		if (Global.Configuration.DetectionMode != ApplicationDetectionMode.WindowsEvents)
+		if (Global.Configuration.DetectionMode is ApplicationDetectionMode.WindowsEvents or ApplicationDetectionMode.EventsAndForeground)
 		{
-			return;
+			_setWinEventHook = User32.SetWinEventHook(EventSystemForeground, EventSystemForeground, 
+				IntPtr.Zero, _dele, 0, 0, WinEventOutOfContext);
 		}
-
-		_setWinEventHook = User32.SetWinEventHook(EventSystemForeground, EventSystemForeground, 
-			IntPtr.Zero, _dele, 0, 0, WinEventOutOfContext);
 	}
 
 	private void WinEventProc(IntPtr hWinEventHook, uint eventType, IntPtr windowHandle, int idObject, int idChild, uint dwEventThread, uint dwmsEventTime)
@@ -77,6 +75,9 @@ private void SetActiveWindowProperties(IntPtr windowHandle)
 
 	public void Dispose()
 	{
-		User32.UnhookWinEvent(_setWinEventHook);
+		if (_setWinEventHook != IntPtr.Zero)
+		{
+			User32.UnhookWinEvent(_setWinEventHook);
+		}
 	}
 }
diff --git a/Project-Aurora/Project-Aurora/Profiles/LightingStateManager.cs b/Project-Aurora/Project-Aurora/Profiles/LightingStateManager.cs
@@ -418,10 +418,10 @@ private void TimerUpdate()
 
     private void UpdateProcess()
     {
-        if (Global.Configuration.DetectionMode != ApplicationDetectionMode.ForegroundApp ||
-            _currentTick < _nextProcessNameUpdate) return;
+        var pollingEnabled = Global.Configuration.DetectionMode is ApplicationDetectionMode.ForegroundApp or ApplicationDetectionMode.EventsAndForeground;
+        if (!pollingEnabled || _currentTick < _nextProcessNameUpdate) return;
         _activeProcessMonitor.Result.UpdateActiveProcessPolling();
-        _nextProcessNameUpdate = _currentTick + 1000L;
+        _nextProcessNameUpdate = _currentTick + 2000L;
     }
 
     private void UpdateIdleEffects(EffectFrame newFrame)

diff --git a/Project-Aurora/Project-Aurora/Settings/SettingEnums.cs b/Project-Aurora/Project-Aurora/Settings/SettingEnums.cs
@@ -584,6 +584,9 @@ public enum ApplicationDetectionMode
     [Description("Foreground App Scan")]
     ForegroundApp = 1,
 
+    [Description("Windows Events and Foreground App Scan")]
+    EventsAndForeground = 2,
+
     [Description("None")]
     [UsedImplicitly]
     None = -1,