Windows: fix system suspend handling

awawa-dev · Jan 4, 2025 · 993bf9d · 993bf9d
1 parent e4a7f7d
commit 993bf9d
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 0 deletions.
diff --git a/include/systray/Systray.h b/include/systray/Systray.h
@@ -72,6 +72,7 @@ struct SystrayMenu
 
 #ifdef _WIN32
 	HWND SystrayGetWindow();
+	void SystrayAssignQueueHandler(std::function<void(WPARAM wparam)> _queueHandler);
 #endif
 
 
diff --git a/sources/suspend-handler/SuspendHandlerWindows.cpp b/sources/suspend-handler/SuspendHandlerWindows.cpp
@@ -44,14 +44,37 @@
 namespace
 {
 	HWND handle = nullptr;
+	SuspendHandler* instance = nullptr;
+}
+
+static void SuspendHandlerQueueHandler(WPARAM wparam)
+{
+	if (instance != nullptr)
+	{
+		MSG message{};
+		QByteArray eventType;
+
+		message.message = WM_POWERBROADCAST;
+		message.wParam = wparam;
+
+		#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
+			long result = 0;
+			BLOCK_CALL_3(instance, nativeEventFilter, QByteArray, eventType, void*, &message, long*, &result);
+		#else
+			qintptr result = 0;
+			BLOCK_CALL_3(instance, nativeEventFilter, QByteArray, eventType, void*, &message, qintptr*, &result);
+		#endif
+	}
 }
 
 SuspendHandler::SuspendHandler(bool sessionLocker):
 	_notifyHandle(NULL),
 	_notifyMonitorHandle(NULL),
 	_sessionLocker(sessionLocker)
 {
+	instance = this;
 	handle = SystrayGetWindow();
+	SystrayAssignQueueHandler(SuspendHandlerQueueHandler);
 	_notifyHandle = RegisterSuspendResumeNotification(handle, DEVICE_NOTIFY_WINDOW_HANDLE);
 
 	if (_notifyHandle == NULL)
@@ -78,6 +101,8 @@ SuspendHandler::SuspendHandler(bool sessionLocker):
 
 SuspendHandler::~SuspendHandler()
 {
+	instance = nullptr;
+
 	if (_notifyHandle != NULL)
 	{
 		UnregisterSuspendResumeNotification(_notifyHandle);

diff --git a/sources/systray/SystrayWindows.cpp b/sources/systray/SystrayWindows.cpp
@@ -46,18 +46,31 @@ namespace
 	std::list<HICON> icons;
 	std::list<HBITMAP> bitmaps;
 	ULONG_PTR gdiToken = 0;
+	std::function<void(WPARAM suspend)> queueHandler = nullptr;
 }
 
 HWND SystrayGetWindow()
 {
 	return window;
 }
 
+void SystrayAssignQueueHandler(std::function<void(WPARAM wparam)> _queueHandler)
+{
+	queueHandler = _queueHandler;
+}
+
 static LRESULT CALLBACK _tray_wnd_proc(HWND hwnd, UINT msg, WPARAM wparam,
                                        LPARAM lparam)
 {
 	switch (msg)
 	{
+		case WM_POWERBROADCAST:
+			if (queueHandler != nullptr && (wparam == PBT_APMSUSPEND || wparam == PBT_APMRESUMESUSPEND || wparam == PBT_POWERSETTINGCHANGE))
+			{				
+				queueHandler(wparam);
+			}
+			return true;
+
 		case WM_CLOSE:
 			DestroyWindow(hwnd);
 			hwnd = nullptr;
@@ -290,6 +303,8 @@ void SystrayUpdate(SystrayMenu *tray)
 
 void SystrayClose()
 {
+	queueHandler = nullptr;
+
 	if (systrayIcon.hIcon != nullptr)
 	{
 		Shell_NotifyIcon(NIM_DELETE, &systrayIcon);