Changeset 89712 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jun 15, 2021 3:09:18 PM (4 years ago)

Author:

vboxsync

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

145160

Message:

FE/Qt: bugref:9930. Making necessary connections for Linux screen saver disabling

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• platform/x11/VBoxX11Helper.cpp (modified) (1 diff)
• runtime/UIMachineLogic.cpp (modified) (2 diffs)
• runtime/UIMachineLogic.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.cpp

@@ -175 +175 @@
             serviceNames << strServiceName;
     }
+    if (serviceNames.isEmpty())
+        LogRel(("No screen saver service found among registered DBus services."));
+
     return serviceNames;
 }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -713 +713 @@
 {
 #if defined(VBOX_WS_X11)
+    if (m_fHostScreenSaverDisabled == fDisabled)
+        return;
+    m_fHostScreenSaverDisabled = fDisabled;
+
     QStringList services = X11ScrenSaverServices();
     if (services.isEmpty())
         return;
 
-    Q_UNUSED(fDisabled);
+    if (fDisabled)
+        X11InhibitScrenSaver(services, m_screenSaverInhibitionCookies);
+    else
+        X11UninhibitScrenSaver(m_screenSaverInhibitionCookies);
+
 #else
     Q_UNUSED(fDisabled);
@@ -880 +888 @@
     , m_pSoftKeyboardDialog(0)
     , m_pVMInformationDialog(0)
+    , m_fHostScreenSaverDisabled(false)
 {
 }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.h

@@ -455 +455 @@
     UISoftKeyboard        *m_pSoftKeyboardDialog;
     UIVMInformationDialog *m_pVMInformationDialog;
+
+    /* Holds the cookies returnd by QDBus inhibition calls. Map keys are service name. These are required during uninhibition.*/
+    QMap<QString, uint> m_screenSaverInhibitionCookies;
+    bool m_fHostScreenSaverDisabled;
+
     /* Friend classes: */
     friend class UIMachineWindow;