Changeset 89910 in vbox

Timestamp:

Jun 25, 2021 10:18:08 AM (4 years ago)

Author:

vboxsync

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

145368

Message:

FE/Qt: bugref:3355. On Linux check if there are any screensaver related DBus services before enabling the option

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• platform/x11/VBoxX11Helper.cpp (modified) (3 diffs)
• platform/x11/VBoxX11Helper.h (modified) (1 diff)
• settings/global/UIGlobalSettingsDisplay.cpp (modified) (6 diffs)
• settings/global/UIGlobalSettingsDisplay.h (modified) (1 diff)

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

@@ -163 +163 @@
 }
 
-QStringList X11FindDBusScreenSaverServices(const QDBusConnection &connection)
+static bool X11CheckDBusConnection(const QDBusConnection &connection)
+{
+    if (!connection.isConnected()) {
+        const QDBusError lastError = connection.lastError();
+        if (lastError.isValid())
+        {
+            LogRel(("QDBus error. Could not connect to D-Bus server: %s: %s\n",
+                    lastError.name().toUtf8().constData(),
+                    lastError.message().toUtf8().constData()));
+        }
+        else
+            LogRel(("QDBus error. Could not connect to D-Bus server: Unable to load dbus libraries\n"));
+        return false;
+    }
+    return true;
+}
+
+static QStringList X11FindDBusScreenSaverServices(const QDBusConnection &connection)
 {
     QStringList serviceNames;
@@ -187 +204 @@
     return serviceNames;
 }
+
+bool X11CheckDBusScreenSaverServices()
+{
+    QDBusConnection connection = QDBusConnection::sessionBus();
+    if (!X11CheckDBusConnection(connection))
+        return false;
+
+    QDBusReply<QStringList> replyr = connection.interface()->registeredServiceNames();
+    if (!replyr.isValid())
+    {
+        const QDBusError replyError = replyr.error();
+        LogRel(("QDBus error. Could not query registered service names %s %s",
+                replyError.name().toUtf8().constData(), replyError.message().toUtf8().constData()));
+        return false;
+    }
+    for (int i = 0; i < replyr.value().size(); ++i)
+    {
+        const QString strServiceName = replyr.value()[i];
+        if (strServiceName.contains("screensaver", Qt::CaseInsensitive))
+            return true;
+    }
+    LogRel(("QDBus error. No screen saver service found among registered DBus services."));
+    return false;
+}
+
 
 static void X11IntrospectInterfaceNode(const QDomElement &interface,
@@ -237 +279 @@
 }
 
-static bool X11CheckDBusConnection(const QDBusConnection &connection)
-{
-    if (!connection.isConnected()) {
-        const QDBusError lastError = connection.lastError();
-        if (lastError.isValid())
-        {
-            LogRel(("QDBus error. Could not connect to D-Bus server: %s: %s\n",
-                    lastError.name().toUtf8().constData(),
-                    lastError.message().toUtf8().constData()));
-        }
-        else
-            LogRel(("QDBus error. Could not connect to D-Bus server: Unable to load dbus libraries\n"));
-        return false;
-    }
-    return true;
-}
-
 QVector<X11ScreenSaverInhibitMethod*> X11FindDBusScrenSaverInhibitMethods()
 {

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

@@ -67 +67 @@
 SHARED_LIBRARY_STUFF bool X11CheckExtension(const char *extensionName);
 
-/** Returns the list of DBus services whose name contains the substring 'screensaver'. */
-QStringList X11FindDBusScreenSaverServices(const QDBusConnection &connection);
+/** Returns true if there are any DBus services whose name contains the substring 'screensaver'. */
+bool X11CheckDBusScreenSaverServices();
 
 /** Returns the list of Inhibit methods found by introspecting DBus services. */

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsDisplay.cpp

@@ -28 +28 @@
 #include "UIMessageCenter.h"
 #include "UIScaleFactorEditor.h"
+#ifdef VBOX_WS_X11
+# include "VBoxX11Helper.h"
+#endif
 
 
@@ -81 +84 @@
     , m_pLabelMachineWindows(0)
     , m_pCheckBoxActivateOnMouseHover(0)
-#if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
     , m_pCheckBoxDisableHostScreenSaver(0)
-#endif
 {
     prepare();
@@ -122 +123 @@
     m_pEditorMaximumGuestScreenSize->setValue(oldData.m_guiMaximumGuestScreenSizeValue);
     m_pCheckBoxActivateOnMouseHover->setChecked(oldData.m_fActivateHoveredMachineWindow);
-#if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
-    m_pCheckBoxDisableHostScreenSaver->setChecked(oldData.m_fDisableHostScreenSaver);
-#endif
+    if (m_pCheckBoxDisableHostScreenSaver)
+        m_pCheckBoxDisableHostScreenSaver->setChecked(oldData.m_fDisableHostScreenSaver);
     m_pEditorScaleFactor->setScaleFactors(oldData.m_scaleFactors);
     m_pEditorScaleFactor->setMonitorCount(gpDesktop->screenCount());
@@ -137 +137 @@
     newData.m_guiMaximumGuestScreenSizeValue = m_pEditorMaximumGuestScreenSize->value();
     newData.m_fActivateHoveredMachineWindow = m_pCheckBoxActivateOnMouseHover->isChecked();
-#if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
-    newData.m_fDisableHostScreenSaver = m_pCheckBoxDisableHostScreenSaver->isChecked();
-#endif
+    if (m_pCheckBoxDisableHostScreenSaver)
+        newData.m_fDisableHostScreenSaver = m_pCheckBoxDisableHostScreenSaver->isChecked();
     newData.m_scaleFactors = m_pEditorScaleFactor->scaleFactors();
     m_pCache->cacheCurrentData(newData);
@@ -166 +165 @@
     m_pCheckBoxActivateOnMouseHover->setWhatsThis(tr("When checked, machine windows will be raised when the mouse pointer moves over them."));
     m_pCheckBoxActivateOnMouseHover->setText(tr("&Raise Window Under Mouse"));
-#if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
-    m_pCheckBoxDisableHostScreenSaver->setWhatsThis(tr("When checked, screen saver of the host OS is disabled."));
-    m_pCheckBoxDisableHostScreenSaver->setText(tr("&Disable Host Screen Saver"));
-#endif
+    if (m_pCheckBoxDisableHostScreenSaver)
+    {
+        m_pCheckBoxDisableHostScreenSaver->setWhatsThis(tr("When checked, screen saver of the host OS is disabled."));
+        m_pCheckBoxDisableHostScreenSaver->setText(tr("&Disable Host Screen Saver"));
+    }
 }
 
@@ -256 +256 @@
             pLayoutMain->addWidget(m_pCheckBoxActivateOnMouseHover, 5, 1);
 
-#if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
         /* Prepare 'disable host screen saver' check-box: */
+#if defined(VBOX_WS_WIN)
         m_pCheckBoxDisableHostScreenSaver = new QCheckBox(this);
+#elif defined(VBOX_WS_X11)
+        if (X11CheckDBusScreenSaverServices())
+            m_pCheckBoxDisableHostScreenSaver = new QCheckBox(this);
+#endif
         if (m_pCheckBoxDisableHostScreenSaver)
             pLayoutMain->addWidget(m_pCheckBoxDisableHostScreenSaver, 6, 1);
-#endif
+
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsDisplay.h

@@ -97 +97 @@
         /** Holds the 'activate on mouse hover' check-box instance. */
         QCheckBox                      *m_pCheckBoxActivateOnMouseHover;
-#if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
         /** Holds the 'disable host screen saver' check-box instance. */
         QCheckBox                      *m_pCheckBoxDisableHostScreenSaver;
-#endif
     /** @} */
 };