Merge branch 'master' of https://github.com/Maassoft/ColorControl

Author: Maassoft

ColorControl.UI/Components/Pages/Generic/TriggerInput.razor

@@ -27,6 +27,11 @@
             <label class="form-label" for="excludedProcesses">Excluded processes</label>
             <input class="form-control" type="text" @bind="trigger.ExcludedProcessesAsString" />
         </div>
+        <div class="mb-2">
+            <label class="form-label" for="connectedDisplays">Connected displays Regex</label>
+            <input class="form-control" type="text" @bind="trigger.ConnectedDisplaysRegex"
+                   title="The preset will be executed only if the supplied Regular Expression matches the device name of at least one of the displays that are connected at the moment the trigger is fired." />
+        </div>
     }
 }
 

ColorControl/Program.cs

@@ -342,6 +342,7 @@ private static IHostBuilder CreateHostBuilder()
                     services.AddSingleton<ProcessEventDispatcher>();
                     services.AddSingleton<WindowMessageDispatcher>();
                     services.AddSingleton<KeyboardShortcutDispatcher>();
+                    services.AddSingleton<DisplayChangeEventDispatcher>();
                     services.AddSingleton<MainForm>();
                     services.AddSingleton<LogWindow>();
                     services.AddSingleton<BrowserWindow>();

ColorControl/Services/LG/LgPanel.Designer.cs

@@ -172,6 +172,7 @@ private void lvLgPresets_SelectedIndexChanged(object sender, EventArgs e)
 			btnLgPresetEditTriggerConditions.Enabled = enabled;
 			edtLgPresetIncludedProcesses.Enabled = enabled;
 			edtLgPresetExcludedProcesses.Enabled = enabled;
+			edtLgPresetConnectedDisplaysRegex.Enabled = enabled;
 
 			var preset = GetSelectedLgPreset();
 
@@ -208,6 +209,7 @@ private void lvLgPresets_SelectedIndexChanged(object sender, EventArgs e)
 
 				edtLgPresetIncludedProcesses.Text = trigger?.IncludedProcesses?.Join(", ") ?? string.Empty;
 				edtLgPresetExcludedProcesses.Text = trigger?.ExcludedProcesses?.Join(", ") ?? string.Empty;
+				edtLgPresetConnectedDisplaysRegex.Text = trigger?.ConnectedDisplaysRegex ?? string.Empty;
 			}
 			else
 			{
@@ -223,6 +225,7 @@ private void lvLgPresets_SelectedIndexChanged(object sender, EventArgs e)
 				edtLgPresetTriggerConditions.Tag = 0;
 				edtLgPresetIncludedProcesses.Text = string.Empty;
 				edtLgPresetExcludedProcesses.Text = string.Empty;
+				edtLgPresetConnectedDisplaysRegex.Text = string.Empty;
 			}
 		}
 
@@ -281,7 +284,8 @@ private void btnSetShortcutLg_Click(object sender, EventArgs e)
 			preset.UpdateTrigger(triggerType,
 								 (PresetConditionType)edtLgPresetTriggerConditions.Tag,
 								 edtLgPresetIncludedProcesses.Text,
-								 edtLgPresetExcludedProcesses.Text);
+								 edtLgPresetExcludedProcesses.Text,
+								 edtLgPresetConnectedDisplaysRegex.Text);
 
 			preset.shortcut = shortcut;
 

ColorControl/Services/LG/LgPanel.cs

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
-    Microsoft ResX Schema 
+    Microsoft ResX Schema
 
     Version 2.0
 
@@ -48,7 +48,7 @@
     value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-    
+
     mimetype: application/x-microsoft.net.object.soap.base64
     value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
@@ -117,6 +117,9 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="toolTipLgPreset.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>471, 16</value>
+  </metadata>
   <metadata name="mnuLgExpert.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>

ColorControl/Services/LG/LgPanel.resx

@@ -53,6 +53,7 @@ public LgDevice SelectedDevice
 		private readonly PowerEventDispatcher _powerEventDispatcher;
 		private readonly SessionSwitchDispatcher _sessionSwitchDispatcher;
 		private readonly ProcessEventDispatcher _processEventDispatcher;
+		private readonly DisplayChangeEventDispatcher _displayChangeEventDispatcher;
 		private readonly ServiceManager _serviceManager;
 		private LgDevice _selectedDevice;
 		private string _rcButtonsFilename;
@@ -72,12 +73,22 @@ public LgDevice SelectedDevice
 		public static readonly int SHORTCUTID_LGQA = -202;
 		public static readonly int SHORTCUTID_GAMEBAR = -101;
 
-		public LgService(GlobalContext globalContext, PowerEventDispatcher powerEventDispatcher, SessionSwitchDispatcher sessionSwitchDispatcher, ProcessEventDispatcher processEventDispatcher, ServiceManager serviceManager, RestartDetector restartDetector, WinApiService winApiService, WinApiAdminService winApiAdminService) : base(globalContext)
+		public LgService(
+			GlobalContext globalContext,
+			PowerEventDispatcher powerEventDispatcher,
+			SessionSwitchDispatcher sessionSwitchDispatcher,
+			ProcessEventDispatcher processEventDispatcher,
+			DisplayChangeEventDispatcher displayChangeEventDispatcher,
+			ServiceManager serviceManager,
+			RestartDetector restartDetector,
+			WinApiService winApiService,
+			WinApiAdminService winApiAdminService) : base(globalContext)
 		{
 			_allowPowerOn = globalContext.StartUpParams.RunningFromScheduledTask;
 			_powerEventDispatcher = powerEventDispatcher;
 			_sessionSwitchDispatcher = sessionSwitchDispatcher;
 			_processEventDispatcher = processEventDispatcher;
+			_displayChangeEventDispatcher = displayChangeEventDispatcher;
 			_serviceManager = serviceManager;
 			LgPreset.GetDeviceName += LgPreset_GetDeviceName;
 			LgPreset.GetAppName += LgPreset_GetAppName;
@@ -466,10 +477,7 @@ public override void InstallEventHandlers()
 			SetShortcuts(SHORTCUTID_LGQA, Config.QuickAccessShortcut);
 
 			var keyboardShortcutDispatcher = _globalContext.ServiceProvider.GetService<KeyboardShortcutDispatcher>();
-			if (keyboardShortcutDispatcher != null)
-			{
-				keyboardShortcutDispatcher.RegisterShortcut(SHORTCUTID_GAMEBAR, Config.GameBarShortcut);
-			}
+			keyboardShortcutDispatcher?.RegisterShortcut(SHORTCUTID_GAMEBAR, Config.GameBarShortcut);
 
 			_powerEventDispatcher.RegisterAsyncEventHandler(PowerEventDispatcher.Event_Startup, PowerStateChanged);
 			_powerEventDispatcher.RegisterEventHandler(PowerEventDispatcher.Event_Suspend, PowerModeChanged);
@@ -481,6 +489,13 @@ public override void InstallEventHandlers()
 			_sessionSwitchDispatcher.RegisterEventHandler(SessionSwitchDispatcher.Event_SessionSwitch, SessionSwitched);
 
 			_processEventDispatcher.RegisterAsyncEventHandler(ProcessEventDispatcher.Event_ProcessChanged, ProcessChanged);
+
+			_displayChangeEventDispatcher.RegisterAsyncEventHandler(DisplayChangeEventDispatcher.Event_DisplayChanged, DisplayChanged);
+		}
+
+		private async Task DisplayChanged(object sender, DisplayChangedEventArgs e, CancellationToken ct)
+		{
+			await ExecutePresetsForEvent(PresetTriggerType.DisplayChange);
 		}
 
 		private async Task PowerStateChanged(object sender, PowerStateChangedEventArgs e, CancellationToken token)
@@ -633,8 +648,14 @@ public async Task ProcessChanged(object sender, ProcessChangedEventArgs args, Ca
 					return;
 				}
 
-				var applicableDevices = Devices.Where(d => d.PowerOffOnScreenSaver || d.PowerOnAfterScreenSaver || d.TriggersEnabled && _presets.Any(p => p.Triggers.Any(t => t.Trigger != PresetTriggerType.None) &&
-					((string.IsNullOrEmpty(p.DeviceMacAddress) && d == SelectedDevice) || p.DeviceMacAddress.Equals(d.MacAddress, StringComparison.OrdinalIgnoreCase)))).ToList();
+				var applicableDevices = Devices.Where(d => 
+							   d.PowerOffOnScreenSaver 
+							|| d.PowerOnAfterScreenSaver 
+							|| (d.TriggersEnabled 
+										// only these trigger types are ever triggered by a process changed event
+									&& _presets.Any(p => p.Triggers.Any(t => t.Trigger == PresetTriggerType.ProcessSwitch || t.Trigger == PresetTriggerType.ScreensaverStart || t.Trigger == PresetTriggerType.ScreensaverStop) 
+									&& ((string.IsNullOrEmpty(p.DeviceMacAddress) && d == SelectedDevice) || p.DeviceMacAddress.Equals(d.MacAddress, StringComparison.OrdinalIgnoreCase)))))
+					.ToList();
 
 				if (!applicableDevices.Any())
 				{