Changeset 103954 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Mar 20, 2024 12:43:37 PM (13 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

162330

Message:

FE/Qt: DarwinKeyboard: Calming down assertions in DarwinDisableGlobalHotKeys which happens if host is in sleep or screen-saver mode.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/DarwinKeyboard.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/DarwinKeyboard.cpp

@@ -75 +75 @@
 typedef enum
 {
+    kCGSGlobalHotKeyInvalid = -1 /* bird */,
     kCGSGlobalHotKeyEnable = 0,
-    kCGSGlobalHotKeyDisable,
-    kCGSGlobalHotKeyDisableExceptUniversalAccess,
-    kCGSGlobalHotKeyInvalid = -1 /* bird */
+    kCGSGlobalHotKeyDisable = 1,
+    kCGSGlobalHotKeyDisableExceptUniversalAccess = 2,
+    kCGSGlobalHotKeySleep = 4 /* dsen */,
+    kCGSGlobalHotKeyScreenSaver = 6 /* dsen */,
 } CGSGlobalHotKeyOperatingMode;
 extern CGSConnection _CGSDefaultConnection(void);
@@ -516 +518 @@
 void DarwinDisableGlobalHotKeys(bool fDisable)
 {
+    /* Prevent LogRel clogging: */
     static unsigned s_cComplaints = 0;
 
@@ -532 +535 @@
         &&  enmMode != kCGSGlobalHotKeyDisableExceptUniversalAccess)
     {
-        AssertMsgFailed(("%d\n", enmMode));
+        /* We are silently ignoring case when
+         * host is in sleep or screensaver mode: */
+        if (   enmMode != kCGSGlobalHotKeySleep
+            && enmMode != kCGSGlobalHotKeyScreenSaver)
+        {
+            /* Otherwise we should warn about the unknown mode we met: */
+            AssertMsgFailed(("%d\n", enmMode));
+        }
         if (s_cComplaints++ < 32)
             LogRel(("DarwinDisableGlobalHotKeys: Unexpected enmMode=%d\n", enmMode));
@@ -558 +568 @@
     if (enmNewMode != enmMode)
     {
-        /* If the screensaver kicks in we should ignore failure here. */
-        AssertMsg(enmMode == kCGSGlobalHotKeyEnable, ("enmNewMode=%d enmMode=%d\n", enmNewMode, enmMode));
+        /* We are silently ignoring case when
+         * host is in sleep or screensaver mode: */
+        if (   enmNewMode != kCGSGlobalHotKeySleep
+            && enmNewMode != kCGSGlobalHotKeyScreenSaver)
+        {
+            /* Otherwise we should warn about the unknown mode we met while trying to enable hot keys: */
+            AssertMsg(enmMode == kCGSGlobalHotKeyEnable, ("enmNewMode=%d enmMode=%d\n", enmNewMode, enmMode));
+        }
         if (s_cComplaints++ < 32)
             LogRel(("DarwinDisableGlobalHotKeys: Failed to change mode; enmNewMode=%d enmMode=%d\n", enmNewMode, enmMode));