Merge lp:~lukas-kde/unity8/screenInhibitions into lp:unity8

[Lukáš Tinkl]

Implement the FDO Inhibit DBUS API

This implements the de-facto freedesktop.org inhibit standard, as described in https://people.freedesktop.org/~hadess/idle-inhibition-spec/re01.html. This standard is implemented by KDE, Gnome and most recently also Unity 7. Apps like Chrome or VLC can then use the DBUS published Inhibit/UnInhibit methods to ask the shell to suspend the screen blanking mechanism.

For the actual screenlock/saver keyboard shortcuts and dialogs, do not overpass the backend.

Simplify the *name* methods, add some missing documentation.

Checklist:

* Are there any related MPs required for this MP to build/function as expected? Please list.

No

* Did you perform an exploratory manual test run of your code change and any related functionality?

Yes

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

N/A

* If you changed the UI, has there been a design review?

N/A (no GUI change)

[Michael Zanetti (mzanetti)]

In general it works, even from Firefox in libertine when watching a youtube video. However, if you close firefox while it's playing a video, it won't dispatch the Uninhibit call and the screen stays lit...

review: Needs Fixing

[Michał Sawicz (saviq)]

> In general it works, even from Firefox in libertine when watching a youtube video. However, if you close firefox while it's playing a video, it won't dispatch the Uninhibit call and the screen stays lit...

Oh yeah we totally need to track the requests and pop the ones where
requesters are gone.

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2662
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2361/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3114
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1758
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1758
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1758
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3142
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2998
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2998/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2998
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2998/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2998
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2998/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2998
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2998/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2998
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2998/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2998
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2998/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2998
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2998/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2998
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2998/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2998
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2998/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2361/rebuild

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

looks better in handling bad/crashing/disappearing apps, but as agreed on in chat, let's also add the monitoring for focused/visible in this branch directly. Putting back to WIP.

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2664
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2367/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3120
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1764
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1764
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1764
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3148
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3004
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3004/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3004
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3004/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/3004
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/3004/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3004
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3004/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3004
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3004/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/3004
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/3004/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3004
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3004/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3004
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3004/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/3004
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/3004/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2367/rebuild

review: Needs Fixing (continuous-integration)

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2682
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2466/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/3242/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3270
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3124/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3124/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3124/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3124/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3124/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3124/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3124/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3124/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3124/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2466/rebuild

review: Needs Fixing (continuous-integration)

[lp:~lukas-kde/unity8/screenInhibitions]

2683. By Lukáš Tinkl on 2016-11-01

use ual instead of qtmir::AppMan for the whitelisting of PIDs

[Gerry Boland (gerboland)]

If you need an api in AppMan to wrap UAL's hasPid(), I'm happy to add it to qtmir. I just don't want to expose a list of PIDs for shell use.

[lp:~lukas-kde/unity8/screenInhibitions]

2684. By Lukáš Tinkl on 2016-11-07

merge trunk

2685. By Lukáš Tinkl on 2016-11-17

merge trunk

2686. By Lukáš Tinkl on 2016-11-22

merge trunk

Unmerged revisions

2686. By Lukáš Tinkl on 2016-11-22

merge trunk

2685. By Lukáš Tinkl on 2016-11-17

merge trunk

2684. By Lukáš Tinkl on 2016-11-07

merge trunk

2683. By Lukáš Tinkl on 2016-11-01

use ual instead of qtmir::AppMan for the whitelisting of PIDs

2682. By Lukáš Tinkl on 2016-11-01

implement pidsForApplicationid()

2681. By Lukáš Tinkl on 2016-10-31

merge trunk

2680. By Lukáš Tinkl on 2016-10-21

fix PID type, get rid of Upstart

2679. By Lukáš Tinkl on 2016-10-20

don't take minimized delegates into account for the whitelist

2678. By Lukáš Tinkl on 2016-10-19

fix the whitelist checking

PID is different for DBUS and container apps :/

2677. By Lukáš Tinkl on 2016-10-19

fix the pid prop properly

=== modified file 'plugins/Unity/Session/CMakeLists.txt'
--- plugins/Unity/Session/CMakeLists.txt	2016-06-21 14:23:49 +0000
+++ plugins/Unity/Session/CMakeLists.txt	2016-11-22 09:36:12 +0000
@@ -3,6 +3,7 @@
     ${CMAKE_CURRENT_BINARY_DIR}
     ${GIO_INCLUDE_DIRS}
     ${GLIB_INCLUDE_DIRS}
+    ${UAL_INCLUDE_DIRS}
     ${libunity8-private_SOURCE_DIR}
 )
 
@@ -23,6 +24,7 @@
     unity8-private
     ${GIO_LDFLAGS}
     ${GLIB_LIBRARIES}
+    ${UAL_LIBRARIES}
     )
 
 # export the qmldir and qmltypes files

=== modified file 'plugins/Unity/Session/dbusunitysessionservice.cpp'
--- plugins/Unity/Session/dbusunitysessionservice.cpp	2016-06-22 13:38:16 +0000
+++ plugins/Unity/Session/dbusunitysessionservice.cpp	2016-11-22 09:36:12 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014, 2015 Canonical, Ltd.
+ * Copyright (C) 2014-2016 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
@@ -21,6 +21,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <pwd.h>
+#include <algorithm>
 
 // Qt
 #include <QDebug>
@@ -29,6 +30,14 @@
 #include <QElapsedTimer>
 #include <QDateTime>
 #include <QDBusUnixFileDescriptor>
+#include <QDBusServiceWatcher>
+#include <QDBusConnectionInterface>
+#include <QPointer>
+
+// ual
+#include <ubuntu-app-launch/appid.h>
+#include <ubuntu-app-launch/application.h>
+#include <ubuntu-app-launch/registry.h>
 
 // Glib
 #include <glib.h>
@@ -41,16 +50,39 @@
 #define ACTIVE_KEY QStringLiteral("Active")
 #define IDLE_SINCE_KEY QStringLiteral("IdleSinceHint")
 
+#define UNITY_SCREEN_SERVICE QStringLiteral("com.canonical.Unity.Screen")
+#define UNITY_SCREEN_PATH QStringLiteral("/com/canonical/Unity/Screen")
+#define UNITY_SCREEN_IFACE QStringLiteral("com.canonical.Unity.Screen")
+
+namespace ual = ubuntu::app_launch;
+
+struct InhibitionInfo {
+    int cookie{0};
+    QString dbusAppName;
+    QString dbusReason;
+    QString dbusService;
+    pid_t pid{0};
+};
+
 class DBusUnitySessionServicePrivate: public QObject
 {
     Q_OBJECT
 public:
     QString logindSessionPath;
-    bool isSessionActive = true;
+    bool isSessionActive{true};
     QElapsedTimer screensaverActiveTimer;
     QDBusUnixFileDescriptor m_systemdInhibitFd;
 
-    DBusUnitySessionServicePrivate(): QObject() {
+    // inhibit stuff
+    QPointer<QDBusServiceWatcher> busWatcher;
+    std::list<InhibitionInfo> inhibitions;
+    QStringList screenInhibitionsWhitelist; // list of appIds
+    std::shared_ptr<ual::Registry> m_ualRegistry{std::make_shared<ual::Registry>()};
+
+    DBusUnitySessionServicePrivate():
+        QObject()
+      , busWatcher(new QDBusServiceWatcher(this))
+    {
         init();
         checkActive();
     }
@@ -80,6 +112,11 @@
         } else {
             qWarning() << "Failed to get logind session path" << reply.error().message();
         }
+
+        // watch services
+        busWatcher->setConnection(QDBusConnection::sessionBus());
+        busWatcher->setWatchMode(QDBusServiceWatcher::WatchForUnregistration);
+        connect(busWatcher, &QDBusServiceWatcher::serviceUnregistered, this, &DBusUnitySessionServicePrivate::onServiceUnregistered);
     }
 
     void setupSystemdInhibition()
@@ -128,6 +165,7 @@
         QDBusConnection::SM_BUSNAME().asyncCall(msg);
     }
 
+    // set the session as active or inactive
     void setActive(bool active)
     {
         isSessionActive = active;
@@ -211,6 +249,139 @@
         QDBusConnection::SM_BUSNAME().asyncCall(msg);
     }
 
+    /**
+     * Register inhibition, enable it if on whitelist
+     *
+     * @return the inhibition cookie, or 0 if the call didn't succeed
+     */
+    int addInhibition(const QString &service, int pid, const QString &appName, const QString &reason)
+    {
+        InhibitionInfo inh;
+        inh.dbusAppName = appName;
+        inh.dbusReason = reason;
+        inh.dbusService = service;
+        inh.pid = static_cast<pid_t>(pid);
+
+        int cookie = 0;
+
+        if (whiteListCheck(pid)) {
+            cookie = addInhibitionHelper();
+            if (cookie > 0) {
+                inh.cookie = cookie;
+            }
+        } else
+            qDebug() << "!!! Whitelist doesn't contain pid:" << pid << screenInhibitionsWhitelist;
+
+        if (!busWatcher.isNull() && !service.isEmpty() && !busWatcher->watchedServices().contains(service)) {
+            qDebug() << "!!! Started watching service:" << service;
+            busWatcher->addWatchedService(service);
+        }
+
+        qDebug() << "!!! addInhibition, cookie:" << cookie;
+
+        inhibitions.push_back(inh);
+        return cookie;
+    }
+
+    /**
+     * Ask repowerd to keep the display on (enable the inhibition), start watching the service
+     * @return cookie, 0 in failure
+     */
+    int addInhibitionHelper()
+    {
+        QDBusMessage msg = QDBusMessage::createMethodCall(UNITY_SCREEN_SERVICE, UNITY_SCREEN_PATH, UNITY_SCREEN_IFACE, QStringLiteral("keepDisplayOn"));
+        QDBusReply<int> cookie = QDBusConnection::SM_BUSNAME().call(msg);
+        if (cookie.isValid()) {
+            return cookie;
+        } else {
+            qWarning() << "Failed to inhibit screen blanking" << cookie.error().message();
+        }
+
+        return 0;
+    }
+
+    /**
+     * Release the repowerd screen inhibition based on @p cookie
+     */
+    void removeInhibition(int cookie)
+    {
+        qDebug() << "!!! removeInhibition, cookie:" << cookie;
+        QDBusMessage msg = QDBusMessage::createMethodCall(UNITY_SCREEN_SERVICE, UNITY_SCREEN_PATH, UNITY_SCREEN_IFACE, QStringLiteral("removeDisplayOnRequest"));
+        msg << cookie;
+        QDBusReply<void> reply = QDBusConnection::SM_BUSNAME().call(msg);
+        if (!reply.isValid()) {
+            qWarning() << "Failed to release screen blanking inhibition" << reply.error().message();
+        }
+    }
+
+    /**
+     * Drop the inhibition from the list with the matching @p cookie, cleaning up the bus watcher as well if needed
+     */
+    void removeInhibitionHelper(int cookie)
+    {
+        qDebug() << "!!! removeInhibitionHelper, cookie:" << cookie;
+        // drop the inhibition from the list with the matching cookie
+        QString service;
+        inhibitions.remove_if([&service, cookie](const InhibitionInfo & inh) {service = inh.dbusService; return inh.cookie == cookie;});
+
+        qDebug() << "!!! Removed inhibition for service?:" << service;
+
+        if (!busWatcher.isNull() && std::none_of(inhibitions.cbegin(), inhibitions.cend(),
+                                                 [service](const InhibitionInfo & inh){return inh.dbusService == service;})) {
+            // no cookies from service left
+            qDebug() << "!!! Stopped watching service:" << service;
+            busWatcher->removeWatchedService(service);
+        }
+    }
+
+    /**
+     * Enable/disable inhibitions dynamically as the whitelist changes
+     */
+    void updateInhibitions()
+    {
+        qDebug() << "!!! Update inhibitions, empty?" << inhibitions.empty();
+        if (inhibitions.empty()) // no inhibitions set up, bail out
+            return;
+
+        qDebug() << "!!! Update inhibitions, whitelist of PIDs:" << screenInhibitionsWhitelist;
+
+        for (InhibitionInfo inh: inhibitions) {
+            if (!whiteListCheck(inh.pid)) { // not on whitelist anymore, disable temporarily
+                qDebug() << "!!! Disabling inhibition, not on whitelist:" << inh.dbusService;
+                removeInhibition(inh.cookie);
+                inh.cookie = 0; // reset the cookie
+            } else if (whiteListCheck(inh.pid) && inh.cookie == 0) { // on whitelist but not enabled
+                qDebug() << "!!! Enabling inhibition, on whitelist but not enabled:" << inh.dbusService;
+                inh.cookie = addInhibitionHelper();
+            }
+        }
+    }
+
+    bool whiteListCheck(pid_t pid) const {
+        Q_FOREACH(const QString &appId, screenInhibitionsWhitelist) {
+            ual::AppID ualAppId = ual::AppID::find(m_ualRegistry, appId.toStdString());
+            if (ualAppId.empty()) {
+                continue;
+            }
+
+            std::shared_ptr<ual::Application> ualApp;
+            try {
+                ualApp = ual::Application::create(ualAppId, m_ualRegistry);
+            }
+            catch (std::runtime_error &e)  {
+                qWarning() << "Couldn't find UAL application object for" << appId << "-" << e.what();
+                continue;
+            }
+            if (ualApp) {
+                if (std::any_of(ualApp->instances().cbegin(), ualApp->instances().cend(),
+                                   [pid](const std::shared_ptr<ual::Application::Instance> &inst){ return inst && inst->hasPid(pid); })) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
 private Q_SLOTS:
     void onPropertiesChanged(const QString &iface, const QVariantMap &changedProps, const QStringList &invalidatedProps)
     {
@@ -232,6 +403,19 @@
         }
     }
 
+    void onServiceUnregistered(const QString &service)
+    {
+        // cleanup inhibitions
+        qDebug() << "!!! Cleanup inhibitions";
+        Q_FOREACH(InhibitionInfo inh, inhibitions) {
+            if (inh.dbusService == service) {
+                qDebug() << "!!! Cleaning up cookie" << inh.cookie << ", after service:" << inh.dbusService;
+                removeInhibition(inh.cookie);
+                removeInhibitionHelper(inh.cookie);
+            }
+        }
+    }
+
 Q_SIGNALS:
     void screensaverActiveChanged(bool active);
     void prepareForSleep();
@@ -245,7 +429,7 @@
     if (!d->logindSessionPath.isEmpty()) {
         // connect our PromptLock() slot to the logind's session Lock() signal
         QDBusConnection::SM_BUSNAME().connect(LOGIN1_SERVICE, d->logindSessionPath, LOGIN1_SESSION_IFACE, QStringLiteral("Lock"), this, SLOT(PromptLock()));
-        // ... and our Unlocked() signal to the logind's session Unlock() signal
+        // ... and our doUnlock() slot to the logind's session Unlock() signal
         // (lightdm handles the unlocking by calling logind's Unlock method which in turn emits this signal we connect to)
         QDBusConnection::SM_BUSNAME().connect(LOGIN1_SERVICE, d->logindSessionPath, LOGIN1_SESSION_IFACE, QStringLiteral("Unlock"), this, SLOT(doUnlock()));
         connect(d, &DBusUnitySessionServicePrivate::prepareForSleep, this, &DBusUnitySessionService::PromptLock);
@@ -254,6 +438,22 @@
     }
 }
 
+QStringList DBusUnitySessionService::screenInhibitionsWhitelist() const
+{
+    return d->screenInhibitionsWhitelist;
+}
+
+void DBusUnitySessionService::setScreenInhibitionsWhitelist(const QStringList &screenInhibitionsWhitelist)
+{
+    qDebug() << "!!! Update whitelist, new one:" << screenInhibitionsWhitelist << ", old one:" << d->screenInhibitionsWhitelist;
+    if (std::is_permutation(screenInhibitionsWhitelist.begin(), screenInhibitionsWhitelist.end(), d->screenInhibitionsWhitelist.begin()))
+        return;
+
+    d->screenInhibitionsWhitelist = screenInhibitionsWhitelist;
+    Q_EMIT screenInhibitionsWhitelistChanged();
+    d->updateInhibitions();
+}
+
 void DBusUnitySessionService::Logout()
 {
     // TODO ask the apps to quit and then emit the signal
@@ -263,11 +463,11 @@
 
 void DBusUnitySessionService::EndSession()
 {
-    const QDBusMessage msg = QDBusMessage::createMethodCall(QStringLiteral("com.ubuntu.Upstart"),
-                                                            QStringLiteral("/com/ubuntu/Upstart"),
-                                                            QStringLiteral("com.ubuntu.Upstart0_6"),
-                                                            QStringLiteral("EndSession"));
-    QDBusConnection::sessionBus().asyncCall(msg);
+    const QDBusMessage msg = QDBusMessage::createMethodCall(LOGIN1_SERVICE,
+                                                            d->logindSessionPath,
+                                                            LOGIN1_SESSION_IFACE,
+                                                            QStringLiteral("Terminate"));
+    QDBusConnection::SM_BUSNAME().asyncCall(msg);
 }
 
 bool DBusUnitySessionService::CanHibernate() const
@@ -307,27 +507,12 @@
 
 QString DBusUnitySessionService::RealName() const
 {
-    struct passwd *p = getpwuid(geteuid());
-    if (p) {
-        const QString gecos = QString::fromLocal8Bit(p->pw_gecos);
-        if (!gecos.isEmpty()) {
-            const QStringList splitGecos = gecos.split(QLatin1Char(','));
-            return splitGecos.first();
-        }
-    }
-
-    return QString();
+    return QString::fromUtf8(g_get_real_name());
 }
 
 QString DBusUnitySessionService::HostName() const
 {
-    char hostName[512];
-    if (gethostname(hostName, sizeof(hostName)) == -1) {
-        qWarning() << "Could not determine local hostname";
-        return QString();
-    }
-    hostName[sizeof(hostName) - 1] = '\0';
-    return QString::fromLocal8Bit(hostName);
+    return QString::fromUtf8(g_get_host_name());
 }
 
 void DBusUnitySessionService::PromptLock()
@@ -337,6 +522,7 @@
     // user session.
     Q_EMIT LockRequested();
     Q_EMIT lockRequested();
+    d->setActive(false);
 }
 
 void DBusUnitySessionService::Lock()
@@ -395,6 +581,7 @@
 {
     Q_EMIT Unlocked();
     Q_EMIT unlocked();
+    d->setActive(true);
 }
 
 bool DBusUnitySessionService::IsLocked() const
@@ -528,7 +715,7 @@
 
 void DBusGnomeScreensaverWrapper::SimulateUserActivity()
 {
-    d->setIdleHint(false);
+    d->setActive(true);
 }
 
 
@@ -570,7 +757,29 @@
 
 void DBusScreensaverWrapper::SimulateUserActivity()
 {
-    d->setIdleHint(false);
+    d->setActive(true);
+}
+
+uint DBusScreensaverWrapper::Inhibit(const QString &appName, const QString &reason)
+{
+    QString service;
+    int pid = 0;
+    if (calledFromDBus()) {
+        service = message().service();
+        pid = connection().interface()->servicePid(service);
+    }
+    qDebug() << "!!! INHIBIT (appName, reason, dbusService, pid)" << appName << reason << service << pid;
+    uint cookie = static_cast<uint>(d->addInhibition(service, pid, appName, reason));
+    d->checkActive();
+    return cookie;
+}
+
+void DBusScreensaverWrapper::UnInhibit(uint cookie)
+{
+    qDebug() << "!!! UNINHIBIT (cookie)" << cookie;
+    d->removeInhibition(cookie);
+    d->removeInhibitionHelper(cookie);
+    d->checkActive();
 }
 
 #include "dbusunitysessionservice.moc"

=== modified file 'plugins/Unity/Session/dbusunitysessionservice.h'
--- plugins/Unity/Session/dbusunitysessionservice.h	2016-06-22 13:38:16 +0000
+++ plugins/Unity/Session/dbusunitysessionservice.h	2016-11-22 09:36:12 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014, 2015 Canonical, Ltd.
+ * Copyright (C) 2014-2016 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
@@ -17,6 +17,7 @@
 #ifndef DBUSUNITYSESSIONSERVICE_H
 #define DBUSUNITYSESSIONSERVICE_H
 
+#include <QDBusContext>
 #include <QDBusObjectPath>
 
 #include "unitydbusobject.h"
@@ -36,6 +37,12 @@
     Q_OBJECT
     Q_CLASSINFO("D-Bus Interface", "com.canonical.Unity.Session")
 
+    /**
+      * List of PIDs allowed to request screen inhibition
+      */
+    Q_PROPERTY(QStringList screenInhibitionsWhitelist READ screenInhibitionsWhitelist WRITE setScreenInhibitionsWhitelist
+               NOTIFY screenInhibitionsWhitelistChanged)
+
 public:
     DBusUnitySessionService();
     ~DBusUnitySessionService() = default;
@@ -48,6 +55,10 @@
 
     // TODO: remove duplicate signals and split D-Bus and QML API's
     // Apparently QML needs the signals in lowercase, while DBUS spec needs the uppercase version
+
+    QStringList screenInhibitionsWhitelist() const;
+    void setScreenInhibitionsWhitelist(const QStringList &screenInhibitionsWhitelist);
+
 Q_SIGNALS:
     /**
      * LogoutRequested signal
@@ -108,6 +119,8 @@
     Q_SCRIPTABLE void Unlocked();
     void unlocked();
 
+    void screenInhibitionsWhitelistChanged();
+
 public Q_SLOTS:
     /**
      * Logout the system.
@@ -313,13 +326,16 @@
      */
     Q_SCRIPTABLE quint32 GetActiveTime() const;
 
+    /**
+     * Simulate user activity, thus interrupting the screensaver
+     */
     Q_SCRIPTABLE void SimulateUserActivity();
 
 Q_SIGNALS:
     void ActiveChanged(bool active);
 };
 
-class DBusScreensaverWrapper: public UnityDBusObject
+class DBusScreensaverWrapper: public UnityDBusObject, protected QDBusContext
 {
     Q_OBJECT
     Q_CLASSINFO("D-Bus Interface", "org.freedesktop.ScreenSaver")
@@ -354,8 +370,27 @@
      */
     Q_SCRIPTABLE quint32 GetSessionIdleTime() const;
 
+    /**
+     * Simulate user activity, thus interrupting the screensaver
+     */
     Q_SCRIPTABLE void SimulateUserActivity();
 
+    /**
+     * Inhibit idleness (ie screen blanking) for the caller application.
+     *
+     * @param appName A unique identifier for the application, usually a reverse domain (such as 'org.freedesktop.example').
+     * @param reason A human-readable and possibly translated string explaining the reason why idleness is inhibited (such as 'Playing a movie').
+     * @return A cookie uniquely representing the inhibition request, to be passed to UnInhibit when done; 0 in case of error
+     */
+    Q_SCRIPTABLE uint Inhibit(const QString &appName, const QString &reason);
+
+    /**
+     * Disable inhibit idleness for the caller application.
+     *
+     * @param cookie A cookie representing the inhibition request, as returned by the 'Inhibit' function.
+     */
+    Q_SCRIPTABLE void UnInhibit(uint cookie);
+
 Q_SIGNALS:
     void ActiveChanged(bool active);
 };

=== modified file 'qml/Components/Dialogs.qml'
--- qml/Components/Dialogs.qml	2016-07-15 19:37:39 +0000
+++ qml/Components/Dialogs.qml	2016-11-22 09:36:12 +0000
@@ -112,12 +112,12 @@
 
     GlobalShortcut { // lock screen
         shortcut: Qt.Key_ScreenSaver
-        onTriggered: LightDMService.greeter.showGreeter()
+        onTriggered: root.unitySessionService.PromptLock()
     }
 
     GlobalShortcut { // lock screen
         shortcut: Qt.ControlModifier|Qt.AltModifier|Qt.Key_L
-        onTriggered: LightDMService.greeter.showGreeter()
+        onTriggered: root.unitySessionService.PromptLock()
     }
 
     QtObject {
@@ -151,7 +151,7 @@
             Button {
                 text: i18n.ctr("Button: Lock the system", "Lock")
                 onClicked: {
-                    LightDMService.greeter.showGreeter()
+                    root.unitySessionService.PromptLock()
                     logoutDialog.hide();
                 }
             }

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2016-11-09 15:07:26 +0000
+++ qml/Shell.qml	2016-11-22 09:36:12 +0000
@@ -375,15 +375,6 @@
         }
     }
 
-    Timer {
-        // See powerConnection for why this is useful
-        id: showGreeterDelayed
-        interval: 1
-        onTriggered: {
-            greeter.forceShow();
-        }
-    }
-
     Connections {
         id: callConnection
         target: callManager
@@ -410,16 +401,7 @@
         onStatusChanged: {
             if (Powerd.status === Powerd.Off && reason !== Powerd.Proximity &&
                     !callManager.hasCalls && !wizard.active) {
-                // We don't want to simply call greeter.showNow() here, because
-                // that will take too long.  Qt will delay button event
-                // handling until the greeter is done loading and may think the
-                // user held down the power button the whole time, leading to a
-                // power dialog being shown.  Instead, delay showing the
-                // greeter until we've finished handling the event.  We could
-                // make the greeter load asynchronously instead, but that
-                // introduces a whole host of timing issues, especially with
-                // its animations.  So this is simpler.
-                showGreeterDelayed.start();
+                DBusUnitySessionService.PromptLock();
             }
         }
     }

=== modified file 'qml/Stage/Stage.qml'
--- qml/Stage/Stage.qml	2016-11-12 16:05:40 +0000
+++ qml/Stage/Stage.qml	2016-11-22 09:36:12 +0000
@@ -17,6 +17,7 @@
 import QtQuick 2.4
 import Ubuntu.Components 1.3
 import Unity.Application 0.1
+import Unity.Session 0.1
 import "../Components/PanelState"
 import "../Components"
 import Utils 0.1
@@ -346,6 +347,31 @@
         }
 
         readonly property real virtualKeyboardHeight: root.inputMethodRect.height
+
+        function updateScreenInhibitionsWhiteList() {
+            var result = [];
+            if (root.state == "staged" && priv.mainStageDelegate) {
+                result.push(priv.mainStageDelegate.appId);
+            } else if (root.state == "stagedWithSideStage") {
+                if (priv.mainStageDelegate) {
+                    result.push(priv.mainStageDelegate.appId);
+                }
+                if (priv.sideStageDelegate) {
+                    result.push(priv.sideStageDelegate.appId);
+                }
+            } else if (root.state == "windowed") {
+                for (var i = 0; i < appRepeater.count; i++) {
+                    var appDelegate = appRepeater.itemAt(i);
+                    if (appDelegate && !appDelegate.minimized) {
+                        result.push(appDelegate.appId);
+                    }
+                }
+            }
+
+            print("!!! Inhibition whitelist updated:", result);
+
+            DBusUnitySessionService.screenInhibitionsWhitelist = result;
+        }
     }
 
     Component.onCompleted: priv.updateMainAndSideStageIndexes();
@@ -521,9 +547,16 @@
         },
         Transition {
             to: "stagedWithSideStage"
-            ScriptAction { script: priv.updateMainAndSideStageIndexes(); }
+            ScriptAction { script: { priv.updateMainAndSideStageIndexes(); priv.updateScreenInhibitionsWhiteList(); }}
+        },
+        Transition {
+            to: "staged"
+            ScriptAction { script: priv.updateScreenInhibitionsWhiteList(); }
+        },
+        Transition {
+            to: "windowed"
+            ScriptAction { script: priv.updateScreenInhibitionsWhiteList(); }
         }
-
     ]
 
     MouseArea {
@@ -571,10 +604,12 @@
 
         Connections {
             target: root.topLevelSurfaceList
-            onListChanged: priv.updateMainAndSideStageIndexes()
+            onListChanged: {
+                priv.updateMainAndSideStageIndexes();
+                priv.updateScreenInhibitionsWhiteList();
+            }
         }
 
-
         DropArea {
             objectName: "MainStageDropArea"
             anchors {

=== modified file 'src/libunity8-private/unitydbusobject.cpp'
--- src/libunity8-private/unitydbusobject.cpp	2015-09-14 09:11:08 +0000
+++ src/libunity8-private/unitydbusobject.cpp	2016-11-22 09:36:12 +0000
@@ -42,11 +42,6 @@
     m_connection.unregisterObject(path());
 }
 
-QDBusConnection UnityDBusObject::connection() const
-{
-    return m_connection;
-}
-
 QString UnityDBusObject::path() const
 {
     return m_path;
@@ -70,7 +65,7 @@
     message << changedProps;
     message << QStringList();
 
-    connection().send(message);
+    m_connection.send(message);
 }
 
 void UnityDBusObject::registerObject()

=== modified file 'src/libunity8-private/unitydbusobject.h'
--- src/libunity8-private/unitydbusobject.h	2014-10-09 21:29:00 +0000
+++ src/libunity8-private/unitydbusobject.h	2016-11-22 09:36:12 +0000
@@ -28,7 +28,6 @@
     explicit UnityDBusObject(const QString &path, const QString &service = QString(), bool async = true, QObject *parent = 0);
     ~UnityDBusObject();
 
-    QDBusConnection connection() const;
     QString path() const;
 
 protected:

=== modified file 'tests/plugins/Unity/Session/CMakeLists.txt'
--- tests/plugins/Unity/Session/CMakeLists.txt	2016-06-21 14:23:49 +0000
+++ tests/plugins/Unity/Session/CMakeLists.txt	2016-11-22 09:36:12 +0000
@@ -13,6 +13,7 @@
     ${CMAKE_SOURCE_DIR}/plugins/Unity/Session
     ${libunity8-private_SOURCE_DIR}
     ${GLIB_INCLUDE_DIRS}
+    ${UAL_INCLUDE_DIRS}
 )
 
 add_definitions(-DSM_BUSNAME=sessionBus)
@@ -38,6 +39,7 @@
 target_link_libraries(sessionbackendtestExec
     unity8-private
     ${GLIB_LIBRARIES}
+    ${UAL_LIBRARIES}
     )
 qt5_use_modules(sessionbackendtestExec Test Core Qml DBus)
 

=== modified file 'tests/plugins/Unity/Session/LogindServer.h'
--- tests/plugins/Unity/Session/LogindServer.h	2016-06-22 13:38:16 +0000
+++ tests/plugins/Unity/Session/LogindServer.h	2016-11-22 09:36:12 +0000
@@ -37,7 +37,7 @@
 Q_SIGNALS:
     void Lock();
     void Unlock();
-    void PrepareForSleep();
+    void PrepareForSleep(bool);
 };
 
 #endif