Fix detection of resume from standby

Author: t1m0thyj

src/COM/PowerSetting.cs

@@ -0,0 +1,71 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+using System;
+using System.Runtime.InteropServices;
+using System.Windows.Forms;
+
+namespace WinDynamicDesktop.COM
+{
+    [StructLayout(LayoutKind.Sequential)]
+    public struct POWERBROADCAST_SETTING
+    {
+        public Guid PowerSetting;
+        public int DataLength;
+        // Variable length data follows
+    }
+
+    internal class PowerSetting
+    {
+        private static readonly Guid GUID_CONSOLE_DISPLAY_STATE =
+            new Guid("6fe69556-704a-47a0-8f24-c28d936fda47");
+
+        private static IntPtr hPowerNotify;
+        private static int? lastDisplayState = null;
+
+        [DllImport("user32.dll")]
+        private static extern IntPtr RegisterPowerSettingNotification(
+            IntPtr hRecipient, ref Guid PowerSettingGuid, int Flags);
+
+        [DllImport("user32.dll")]
+        private static extern bool UnregisterPowerSettingNotification(IntPtr Handle);
+
+        public static void RegisterWindow(IntPtr windowHandle)
+        {
+            Guid guid = GUID_CONSOLE_DISPLAY_STATE;
+            hPowerNotify = RegisterPowerSettingNotification(windowHandle, ref guid, 0);
+
+            if (hPowerNotify != IntPtr.Zero)
+            {
+                Application.ApplicationExit += (object sender, EventArgs e) =>
+                {
+                    UnregisterPowerSettingNotification(hPowerNotify);
+                };
+            }
+            else
+            {
+                LoggingHandler.LogMessage("Failed to register for power notifications");
+            }
+        }
+
+        public static bool IsExitingStandby(nint msgPtr)
+        {
+            var powerSetting = Marshal.PtrToStructure<POWERBROADCAST_SETTING>(msgPtr);
+
+            if (powerSetting.PowerSetting.Equals(GUID_CONSOLE_DISPLAY_STATE))
+            {
+                IntPtr dataPtr = new(msgPtr.ToInt64() + Marshal.SizeOf<POWERBROADCAST_SETTING>());
+                int displayState = Marshal.ReadInt32(dataPtr);
+
+                bool stateChanged = lastDisplayState.HasValue && lastDisplayState.Value != displayState;
+                lastDisplayState = displayState;
+
+                // If state changed and display is turning on, assume we are exiting standby
+                return stateChanged && displayState == 1;
+            }
+
+            return false;
+        }
+    }
+}

src/EventScheduler.cs

@@ -145,6 +145,11 @@ public async void RunAndUpdateLocation(bool forceImageUpdate = false, Action loc
             }
         }
 
+        public void HandleResumeFromStandby()
+        {
+            OnPowerModeChanged(null, new PowerModeChangedEventArgs(PowerModes.Resume));
+        }
+
         private bool UpdateDisplayList()
         {
             if (JsonConfig.IsNullOrEmpty(JsonConfig.settings.activeThemes) ||
@@ -269,7 +274,7 @@ private void OnDisplaySettingsChanged(object sender, EventArgs e)
 
         private void OnPowerModeChanged(object sender, PowerModeChangedEventArgs e)
         {
-            if ((e == null || e.Mode == PowerModes.Resume) && (UpdateDisplayList() ||
+            if (e.Mode == PowerModes.Resume && (UpdateDisplayList() ||
                 (nextUpdateTime.HasValue && DateTime.Now >= nextUpdateTime.Value)))
             {
                 LoggingHandler.LogMessage("Scheduler event triggered by resume from sleep");

src/HiddenForm.cs

@@ -5,6 +5,7 @@
 using System;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
+using WinDynamicDesktop.COM;
 
 namespace WinDynamicDesktop
 {
@@ -15,11 +16,8 @@ internal class HiddenForm : Form
         private const int WM_QUERYENDSESSION = 0x11;
         private const int WM_ENDSESSION = 0x16;
         private const int WM_POWERBROADCAST = 0x0218;
-        private const int PBT_APMRESUMESUSPEND = 0x0007;
-        private const int PBT_APMRESUMEAUTOMATIC = 0x0012;
+        private const int PBT_POWERSETTINGCHANGE = 0x8013;
 
-        public static Microsoft.Win32.PowerModeChangedEventHandler OnPowerModeChanged;
-        
         [DllImport("user32.dll")]
         private static extern IntPtr SetParent(IntPtr hWndChild, IntPtr hwndNewParent);
 
@@ -65,10 +63,9 @@ protected override void WndProc(ref Message m)
                     m.Result = IntPtr.Zero;
                     break;
                 case WM_POWERBROADCAST:
-                    int pbt = m.WParam.ToInt32();
-                    if (pbt == PBT_APMRESUMEAUTOMATIC || pbt == PBT_APMRESUMESUSPEND)
+                    if (m.WParam.ToInt32() == PBT_POWERSETTINGCHANGE && PowerSetting.IsExitingStandby(m.LParam))
                     {
-                        OnPowerModeChanged(null, null);
+                        AppContext.scheduler.HandleResumeFromStandby();
                     }
                     break;
             }
@@ -80,6 +77,11 @@ private void HiddenForm_Load(object source, EventArgs e)
         {
             const int HWND_MESSAGE = -1;
             SetParent(this.Handle, new IntPtr(HWND_MESSAGE));
+
+            if (UwpDesktop.IsWinRtSupported())
+            {
+                PowerSetting.RegisterWindow(this.Handle);
+            }
         }
     }
 }

src/ThemeDialog.cs

@@ -229,7 +229,7 @@ private void ThemeDialog_Load(object sender, EventArgs e)
             meatballButton.DropDownItems.Add(new ToolStripSeparator());
             meatballButton.DropDownItems.AddRange(LockScreenChanger.GetMenuItems());
 
-            if (UwpDesktop.IsMultiDisplaySupported())
+            if (UwpDesktop.IsWinRtSupported())
             {
                 string[] displayNames = ThemeDialogUtils.GetDisplayNames();
                 for (int i = 0; i < displayNames.Length; i++)

src/UwpDesktop.cs

@@ -38,14 +38,14 @@ public static bool IsRunningAsUwp()
             return _isRunningAsUwp.Value;
         }
 
-        public static bool IsMultiDisplaySupported()
+        public static bool IsUwpSupported()
         {
-            return Environment.OSVersion.Version.Major >= 8;
+            return Environment.OSVersion.Version.Major >= 10;
         }
 
-        public static bool IsUwpSupported()
+        public static bool IsWinRtSupported()
         {
-            return Environment.OSVersion.Version.Major >= 10;
+            return Environment.OSVersion.Version.Major >= 8;
         }
 
         public static PlatformHelper GetHelper()