Changeset 89708 in vbox

Timestamp:

Jun 15, 2021 2:25:25 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:3355. Implementing screen saver Linux implement functions.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/platform/x11

Files:

• VBoxX11Helper.cpp (modified) (2 diffs)
• VBoxX11Helper.h (modified) (1 diff)

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

@@ -39 +39 @@
 RT_C_DECLS_END
 
+#include <VBox/log.h>
 
 static int  gX11ScreenSaverTimeout;
@@ -177 +178 @@
 }
 
-void X11InhibitScrenSaver(const QStringList &serviceNameList)
-{
-    Q_UNUSED(serviceNameList);
-}
+void X11InhibitScrenSaver(const QStringList &serviceNameList, QMap<QString, uint> &outCookies)
+{
+    outCookies.clear();
+    QDBusConnection bus = QDBusConnection::sessionBus();
+
+    foreach(QString service, serviceNameList)
+    {
+        QDBusInterface screenSaverInterface(service, "/ScreenSaver",
+                                            QString(), bus);
+        if (!screenSaverInterface.isValid())
+        {
+            QDBusError error = screenSaverInterface.lastError();
+            LogRel(("QDBus error for service %s: %s\n",
+                    service.toUtf8().constData(), error.message().toUtf8().constData()));
+            continue;
+        }
+        QDBusReply<uint> reply = screenSaverInterface.call("Inhibit", "Oracle VirtualBox", "");
+        if (reply.isValid())
+            outCookies[service] = reply.value();
+        else
+        {
+            QDBusError error = screenSaverInterface.lastError();
+            LogRel(("QDBus inhibition call error for service %s: %s\n",
+                    service.toUtf8().constData(), error.message().toUtf8().constData()));
+        }
+    }
+}
+
+void X11UninhibitScrenSaver(const QMap<QString, uint> &cookies)
+{
+
+    QDBusConnection bus = QDBusConnection::sessionBus();
+
+    for (QMap<QString, uint>::const_iterator iterator = cookies.begin(); iterator != cookies.end(); ++iterator)
+    {
+
+        QDBusInterface screenSaverInterface(iterator.key(), "/ScreenSaver",
+                                            QString(), bus);
+        if (!screenSaverInterface.isValid())
+        {
+            QDBusError error = screenSaverInterface.lastError();
+            LogRel(("QDBus error for service %s: %s\n",
+                    iterator.key().toUtf8().constData(), error.message().toUtf8().constData()));
+            continue;
+        }
+        QDBusReply<uint> reply = screenSaverInterface.call("UnInhibit", iterator.value());
+        if (!reply.isValid())
+        {
+            QDBusError error = screenSaverInterface.lastError();
+            LogRel(("QDBus uninhibition call error for service %s: %s\n",
+                    iterator.key().toUtf8().constData(), error.message().toUtf8().constData()));
+        }
+    }
+}
+
 
 #ifdef VBOX_WS_X11

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

@@ -58 +58 @@
 
 /* Disables Screen Saver through QDBus. */
-SHARED_LIBRARY_STUFF  void X11InhibitScrenSaver(const QStringList &serviceNameList);
+SHARED_LIBRARY_STUFF  void X11InhibitScrenSaver(const QStringList &serviceNameList, QMap<QString, uint> &outCookies);
+
+/* Enables Screen Saver through QDBus. */
+SHARED_LIBRARY_STUFF  void X11UninhibitScrenSaver(const QMap<QString, uint> &cookies);
 
 #endif /* !FEQT_INCLUDED_SRC_platform_x11_VBoxX11Helper_h */