Merge branch 'master' of https://github.com/emoacht/Monitorian

Author: emoacht

Source/Installer/Product.wxs

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-	<Product Id="*" Name="Monitorian" Manufacturer="emoacht" Version="4.4.6"
+	<Product Id="*" Name="Monitorian" Manufacturer="emoacht" Version="4.4.8"
 			 Language="1033" Codepage="1252" UpgradeCode="{81A4D148-75D3-462E-938D-8C208FB48E3C}">
 		<Package Id="*" InstallerVersion="500" Compressed="yes"
 				 InstallScope="perMachine" InstallPrivileges="elevated"
@@ -66,11 +66,6 @@
 					  Source="$(var.Monitorian.TargetDir)" Name="$(var.Monitorian.TargetName).Core.dll" KeyPath="yes"/>
 			</Component>
 
-			<Component Id="SupplementLibrary" Guid="{E2329FC3-7343-4072-AEDD-EC020397080C}">
-				<File Id="SupplementLibrary"
-					  Source="$(var.Monitorian.TargetDir)" Name="$(var.Monitorian.TargetName).Supplement.dll" KeyPath="yes"/>
-			</Component>
-
 			<Component Id="FrameLibrary" Guid="{9BAED8CA-C9C3-4ECD-8D28-289758577A8E}">
 				<File Id="FrameLibrary"
 					  Source="$(var.Monitorian.TargetDir)" Name="ScreenFrame.dll" KeyPath="yes"/>
@@ -223,7 +218,6 @@
 			<ComponentRef Id="MainExecutableConfig"/>
 			<ComponentRef Id="BehaviorsLibrary"/>
 			<ComponentRef Id="CoreLibrary"/>
-			<ComponentRef Id="SupplementLibrary"/>
 			<ComponentRef Id="FrameLibrary"/>
 			<ComponentRef Id="StartupLibrary"/>
 			<ComponentRef Id="VisualManifest"/>

Source/Monitorian.Core/AppControllerCore.cs

@@ -36,9 +36,10 @@ public class AppControllerCore
 		public NotifyIconContainer NotifyIconContainer { get; }
 		public WindowPainter WindowPainter { get; }
 
-		private readonly DisplayWatcher _displayWatcher;
 		private readonly SessionWatcher _sessionWatcher;
 		private readonly PowerWatcher _powerWatcher;
+		private readonly DisplaySettingsWatcher _displaySettingsWatcher;
+		private readonly DisplayInformationWatcher _displayInformationWatcher;
 		private readonly BrightnessWatcher _brightnessWatcher;
 		private readonly BrightnessConnector _brightnessConnector;
 
@@ -57,9 +58,10 @@ public AppControllerCore(AppKeeper keeper, SettingsCore settings)
 			NotifyIconContainer = new NotifyIconContainer();
 			WindowPainter = new WindowPainter();
 
-			_displayWatcher = new DisplayWatcher();
 			_sessionWatcher = new SessionWatcher();
 			_powerWatcher = new PowerWatcher();
+			_displaySettingsWatcher = new DisplaySettingsWatcher();
+			_displayInformationWatcher = new DisplayInformationWatcher();
 			_brightnessWatcher = new BrightnessWatcher();
 			_brightnessConnector = new BrightnessConnector();
 		}
@@ -90,9 +92,18 @@ public virtual async Task InitiateAsync()
 			NotifyIconContainer.MouseLeftButtonClick += OnMainWindowShowRequestedBySelf;
 			NotifyIconContainer.MouseRightButtonClick += OnMenuWindowShowRequested;
 
-			_displayWatcher.Subscribe((e) => OnMonitorsChangeInferred(nameof(DisplayWatcher), e));
 			_sessionWatcher.Subscribe((e) => OnMonitorsChangeInferred(nameof(SessionWatcher), e));
 			_powerWatcher.Subscribe((e) => OnMonitorsChangeInferred(nameof(PowerWatcher), e));
+			_displaySettingsWatcher.Subscribe((e) => OnMonitorsChangeInferred(nameof(DisplaySettingsWatcher), e));
+
+			_displayInformationWatcher.Subscribe(async (deviceInstanceId, message) =>
+			{
+				if (!_sessionWatcher.IsLocked)
+				{
+					await UpdateMessageAsync(deviceInstanceId, message);
+					await Recorder.RecordAsync(message);
+				}
+			});
 
 			if (Monitors.Any(x => x.IsInternal))
 			{
@@ -102,17 +113,17 @@ public virtual async Task InitiateAsync()
 						Update(instanceName, brightness);
 				},
 				async (message) => await Recorder.RecordAsync(message));
-			}
 
-			if (_brightnessConnector.CanConnect)
-			{
-				await _brightnessConnector.InitiateAsync((brightness) =>
+				if (_brightnessConnector.IsEnabled)
 				{
-					if (!_sessionWatcher.IsLocked)
-						Update(null, brightness);
-				},
-				async (message) => await Recorder.RecordAsync(message),
-				() => _current.Dispatcher.Invoke(() => _current.MainWindow.Visibility is Visibility.Visible));
+					await _brightnessConnector.InitiateAsync((brightness) =>
+					{
+						if (!_sessionWatcher.IsLocked)
+							Update(null, brightness);
+					},
+					async (message) => await Recorder.RecordAsync(message),
+					() => _current.Dispatcher.Invoke(() => _current.MainWindow.Visibility is Visibility.Visible));
+				}
 			}
 
 			await CleanAsync();
@@ -125,9 +136,10 @@ public virtual void End()
 			NotifyIconContainer.Dispose();
 			WindowPainter.Dispose();
 
-			_displayWatcher.Dispose();
 			_sessionWatcher.Dispose();
 			_powerWatcher.Dispose();
+			_displaySettingsWatcher.Dispose();
+			_displayInformationWatcher.Dispose();
 			_brightnessWatcher.Dispose();
 			_brightnessConnector.Dispose();
 		}
@@ -143,7 +155,7 @@ protected async void OnMainWindowShowRequestedBySelf(object sender, EventArgs e)
 			ShowMainWindow();
 			await CheckUpdateAsync();
 
-			if (_brightnessConnector.CanConnect)
+			if (_brightnessConnector.IsEnabled)
 				await _brightnessConnector.ConnectAsync(true);
 		}
 
@@ -152,7 +164,7 @@ protected async void OnMainWindowShowRequestedByOther(object sender, EventArgs e
 			_current.Dispatcher.Invoke(() => ShowMainWindow());
 			await CheckUpdateAsync();
 
-			if (_brightnessConnector.CanConnect)
+			if (_brightnessConnector.IsEnabled)
 				await _brightnessConnector.ConnectAsync(true);
 		}
 
@@ -263,7 +275,7 @@ protected internal virtual async void OnMonitorsChangeFound()
 			{
 				await Recorder.RecordAsync($"{nameof(OnMonitorsChangeFound)}");
 
-				_displayWatcher.RaiseDisplaySettingsChanged();
+				_displaySettingsWatcher.RaiseDisplaySettingsChanged();
 			}
 		}
 
@@ -436,6 +448,16 @@ protected virtual void Update(string instanceName, int brightness)
 			monitor?.UpdateBrightness(brightness);
 		}
 
+		protected virtual async Task UpdateMessageAsync(string deviceInstanceId, string message)
+		{
+			var monitor = Monitors.FirstOrDefault(x => string.Equals(x.DeviceInstanceId, deviceInstanceId, StringComparison.OrdinalIgnoreCase));
+			System.Diagnostics.Debug.WriteLine(message);
+			if (monitor is not null)
+			{
+				await monitor.ShowNormalMessageAsync(message, TimeSpan.FromSeconds(30));
+			}
+		}
+
 		private void MonitorsDispose()
 		{
 			foreach (var m in Monitors)

Source/Monitorian.Core/AppKeeper.cs

@@ -75,7 +75,8 @@ public static IEnumerable<string> EnumerateStandardOptions() =>
 				MonitorManager.Options,
 				LanguageService.Options,
 				WindowPainter.Options,
-				BrightnessConnector.Options
+				BrightnessConnector.Options,
+				DisplayInformationWatcher.Options
 			}
 			.SelectMany(x => x);
 

Source/Monitorian.Core/Helper/OsVersion.cs

@@ -47,6 +47,11 @@ internal static class OsVersion
 		/// </summary>
 		public static bool Is11OrGreater => IsEqualToOrGreaterThan(10, 0, 22000);
 
+		/// <summary>
+		/// Whether OS is Windows 11 (10.0.22621) or greater
+		/// </summary>
+		public static bool Is11Build22621OrGreater => IsEqualToOrGreaterThan(10, 0, 22621);
+
 		#region Cache
 
 		private static readonly Dictionary<string, bool> _cache = new();

Source/Monitorian.Supplement/Launcher.cs Source/Monitorian.Core/Models/Launcher.csSource/Monitorian.Supplement/Launcher.cs renamed to Source/Monitorian.Core/Models/Launcher.cs

@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Monitorian.Supplement
+namespace Monitorian.Core.Models
 {
 	/// <summary>
 	/// A wrapper class of <see cref="Windows.System.Launcher"/>

Source/Monitorian.Core/Models/Monitor/DdcMonitorItem.cs

@@ -27,14 +27,16 @@ public DdcMonitorItem(
 			byte monitorIndex,
 			Rect monitorRect,
 			SafePhysicalMonitorHandle handle,
-			MonitorCapability capability) : base(
+			MonitorCapability capability,
+			Action onDisposed = null) : base(
 				deviceInstanceId: deviceInstanceId,
 				description: description,
 				displayIndex: displayIndex,
 				monitorIndex: monitorIndex,
 				monitorRect: monitorRect,
 				isInternal: false,
-				isReachable: true)
+				isReachable: true,
+				onDisposed: onDisposed)
 		{
 			this._handle = handle ?? throw new ArgumentNullException(nameof(handle));
 			this._capability = capability ?? throw new ArgumentNullException(nameof(capability));