QtMir

Merge lp:~dandrader/qtmir/dbusFocusInfo into lp:qtmir

dbusFocusInfo
Merge into trunk

Proposed by Daniel d'Andrada on 2016-06-23

Status:	Merged
Approved by:	Nick Dedekind on 2016-07-04
Approved revision:	525
Merged at revision:	521
Proposed branch:	lp:~dandrader/qtmir/dbusFocusInfo
Merge into:	lp:qtmir
Diff against target:	580 lines (+357/-2) 20 files modified CMakeLists.txt (+1/-2) debian/control (+1/-0) src/modules/Unity/Application/CMakeLists.txt (+3/-0) src/modules/Unity/Application/application.cpp (+1/-0) src/modules/Unity/Application/application_manager.cpp (+3/-0) src/modules/Unity/Application/application_manager.h (+2/-0) src/modules/Unity/Application/cgmanager.cpp (+117/-0) src/modules/Unity/Application/cgmanager.h (+42/-0) src/modules/Unity/Application/dbusfocusinfo.cpp (+89/-0) src/modules/Unity/Application/dbusfocusinfo.h (+54/-0) src/modules/Unity/Application/mirsurface.cpp (+5/-0) src/modules/Unity/Application/mirsurface.h (+1/-0) src/modules/Unity/Application/mirsurfaceinterface.h (+4/-0) src/modules/Unity/Application/session.cpp (+17/-0) src/modules/Unity/Application/session.h (+4/-0) src/modules/Unity/Application/session_interface.h (+6/-0) src/platforms/mirserver/logging.cpp (+1/-0) src/platforms/mirserver/logging.h (+1/-0) tests/framework/fake_mirsurface.h (+1/-0) tests/framework/fake_session.h (+4/-0)
To merge this branch:	bzr merge lp:~dandrader/qtmir/dbusFocusInfo
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Nick Dedekind (community)		2016-06-23	Approve on 2016-07-04
Unity8 CI Bot	continuous-integration		Approve on 2016-07-01
Michael Sheldon (community)			Needs Fixing on 2016-06-24
Review via email: mp+298253@code.launchpad.net

Commit Message

com.canonical.Unity.FocusInfo D-Bus service for providing focus information

Description of the Change

Needed for fixing bug 1594863.

* 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, with commands like:
$ gdbus call --session --dest com.canonical.Unity.FocusInfo --object-path / --method com.canonical.Unity.FocusInfo.isPidFocused $(pidof unity8-dash)

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

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-06-23:

FAILED: Continuous integration, rev:521
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~dandrader/qtmir/dbusFocusInfo/+merge/298253/+edit-commit-message

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

review: Needs Fixing (continuous-integration)

Michael Sheldon (michael-sheldon) wrote on 2016-06-24:

This doesn't seem to report focus correctly for trust prompts at the moment. To reproduce:

1. Remove any existing twitter account

2. Start twitter app

3. Run: gdbus call --session --dest com.canonical.Unity.FocusInfo --object-path / --method com.canonical.Unity.FocusInfo.isPidFocused $(pidof online-accounts-ui)

This should return true because the online-accounts-ui has focus, but it currently returns false

review: Needs Fixing

Daniel d'Andrada (dandrader) wrote on 2016-06-24:

> This doesn't seem to report focus correctly for trust prompts at the moment.
> To reproduce:
>
> 1. Remove any existing twitter account
>
> 2. Start twitter app
>
> 3. Run: gdbus call --session --dest com.canonical.Unity.FocusInfo --object-
> path / --method com.canonical.Unity.FocusInfo.isPidFocused $(pidof online-
> accounts-ui)
>
> This should return true because the online-accounts-ui has focus, but it
> currently returns false

Fixed.

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-06-24:

FAILED: Continuous integration, rev:522
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~dandrader/qtmir/dbusFocusInfo/+merge/298253/+edit-commit-message

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

review: Needs Fixing (continuous-integration)

Nick Dedekind (nick-dedekind) on 2016-06-24:

review: Needs Fixing

Daniel d'Andrada (dandrader) wrote on 2016-06-24:

On 24/06/2016 11:59, Nick Dedekind wrote:
>> + QList<Application*> *m_applications;
> const QList<Application>& m_applications ?
>
> const and easier to read; no dereferencing.
>

Done.

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-06-24:

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

review: Needs Fixing (continuous-integration)

Nick Dedekind (nick-dedekind) wrote on 2016-06-27:

Thanks for the change.
Looks fine now.

review: Approve

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-07-01:

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

review: Approve (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-07-01:

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

review: Approve (continuous-integration)

Nick Dedekind (nick-dedekind) wrote on 2016-07-04:

Changes look fine.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Daniel d'Andrada

Mir development team

 === modified file 'CMakeLists.txt'
 --- CMakeLists.txt	2016-06-14 08:33:42 +0000
 +++ CMakeLists.txt	2016-07-01 16:20:12 +0000
@@ -84,8 +84,7 @@
  pkg_check_modules(QTDBUSTEST libqtdbustest-1 REQUIRED)
  pkg_check_modules(QTDBUSMOCK libqtdbusmock-1 REQUIRED)
  pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=18)
--
--include_directories(${APPLICATION_API_INCLUDE_DIRS})
++pkg_check_modules(CGMANAGER libcgmanager REQUIRED)
  add_definitions(-DMIR_REQUIRE_DEPRECATED_EVENT_OPT_IN=1)
 === modified file 'debian/control'
 --- debian/control	2016-06-03 11:16:30 +0000
 +++ debian/control	2016-07-01 16:20:12 +0000
@@ -6,6 +6,7 @@
                 cmake-extras (>= 0.3),
                 debhelper (>= 9),
                 google-mock (>= 1.6.0+svn437),
++               libcgmanager-dev,
                 libfontconfig1-dev,
                 libgles2-mesa-dev,
                 libglib2.0-dev,
 === modified file 'src/modules/Unity/Application/CMakeLists.txt'
 --- src/modules/Unity/Application/CMakeLists.txt	2016-04-26 08:56:36 +0000
 +++ src/modules/Unity/Application/CMakeLists.txt	2016-07-01 16:20:12 +0000
@@ -10,6 +10,7 @@
      ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
      ${CMAKE_SOURCE_DIR}/src/common
      ${GSETTINGS_QT_INCLUDE_DIRS}
++    ${CGMANAGER_INCLUDE_DIRS}
      ${LTTNG_INCLUDE_DIRS}
      ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
@@ -25,8 +26,10 @@
  set(QMLMIRPLUGIN_SRC
      application_manager.cpp
      application.cpp
++    cgmanager.cpp
      ../../../common/abstractdbusservicemonitor.cpp
      ../../../common/debughelpers.cpp
++    dbusfocusinfo.cpp
      plugin.cpp
      dbuswindowstack.cpp
      mirsurfacemanager.cpp
 === modified file 'src/modules/Unity/Application/application.cpp'
 --- src/modules/Unity/Application/application.cpp	2016-06-03 11:08:30 +0000
 +++ src/modules/Unity/Application/application.cpp	2016-07-01 16:20:12 +0000
@@ -18,6 +18,7 @@
  #include "application.h"
  #include "applicationinfo.h"
  #include "application_manager.h"
++#include "mirsurfaceinterface.h"
  #include "session.h"
  #include "sharedwakelock.h"
  #include "timer.h"
 === modified file 'src/modules/Unity/Application/application_manager.cpp'
 --- src/modules/Unity/Application/application_manager.cpp	2016-05-06 08:41:15 +0000
 +++ src/modules/Unity/Application/application_manager.cpp	2016-07-01 16:20:12 +0000
@@ -18,6 +18,7 @@
  #include "application_manager.h"
  #include "application.h"
  #include "applicationinfo.h"
++#include "dbusfocusinfo.h"
  #include "dbuswindowstack.h"
  #include "mirfocuscontroller.h"
  #include "session.h"
@@ -176,6 +177,7 @@
          const QSharedPointer<SettingsInterface>& settings,
          QObject *parent)
      : ApplicationManagerInterface(parent)
++    , m_dbusFocusInfo(new DBusFocusInfo(m_applications))
      , m_dbusWindowStack(new DBusWindowStack(this))
      , m_taskController(taskController)
      , m_procInfo(procInfo)
@@ -200,6 +202,7 @@
  ApplicationManager::~ApplicationManager()
+ {
      qCDebug(QTMIR_APPLICATIONS) << "ApplicationManager::~ApplicationManager";
++    delete m_dbusFocusInfo;
+ }
  int ApplicationManager::rowCount(const QModelIndex &parent) const
 === modified file 'src/modules/Unity/Application/application_manager.h'
 --- src/modules/Unity/Application/application_manager.h	2016-05-05 15:02:01 +0000
 +++ src/modules/Unity/Application/application_manager.h	2016-07-01 16:20:12 +0000
@@ -49,6 +49,7 @@
  namespace qtmir {
++class DBusFocusInfo;
  class DBusWindowStack;
  class MirSurfaceManager;
  class ProcInfo;
@@ -138,6 +139,7 @@
      Application *findApplication(MirSurfaceInterface* surface);
      QList<Application*> m_applications;
++    DBusFocusInfo *m_dbusFocusInfo;
      DBusWindowStack* m_dbusWindowStack;
      QSharedPointer<TaskController> m_taskController;
      QSharedPointer<ProcInfo> m_procInfo;
 === added file 'src/modules/Unity/Application/cgmanager.cpp'
 --- src/modules/Unity/Application/cgmanager.cpp	1970-01-01 00:00:00 +0000
 +++ src/modules/Unity/Application/cgmanager.cpp	2016-07-01 16:20:12 +0000
@@ -0,0 +1,117 @@
++/*
++ * Copyright (C) 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
++ * the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
++ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#include "cgmanager.h"
++
++// QPA mirserver
++#include <logging.h>
++
++#include <cgmanager/cgmanager.h>
++
++#include <QDBusArgument>
++#include <QDBusMessage>
++
++using namespace qtmir;
++
++// According to D-Bus interface defined in:
++// https://github.com/lxc/cgmanager/blob/master/org.linuxcontainers.cgmanager.xml
++
++CGManager::CGManager(QObject *parent)
++    : QObject(parent)
++{
++}
++
++CGManager::~CGManager()
++{
++    QDBusConnection::disconnectFromPeer("cgmanager");
++}
++
++QDBusConnection CGManager::getConnection()
++{
++    auto connection = QDBusConnection("cgmanager");
++
++    if (!connection.isConnected()) {
++        connection = QDBusConnection::connectToPeer(CGMANAGER_DBUS_PATH, "cgmanager");
++        if (!connection.isConnected()) {
++            qCWarning(QTMIR_DBUS, "CGManager: Failed to connect to %s", CGMANAGER_DBUS_PATH);
++        }
++    }
++
++    return connection;
++}
++
++QString CGManager::getCGroupOfPid(const QString &controller, pid_t pid)
++{
++    auto connection = getConnection();
++    if (!connection.isConnected()) {
++        return QString();
++    }
++
++    auto message = QDBusMessage::createMethodCall(QString() /*service*/, m_path, m_interface, "GetPidCgroup");
++
++    QList<QVariant> arguments;
++    arguments << QVariant(controller);
++    arguments << QVariant((int)pid);
++
++    message.setArguments(arguments);
++
++    QDBusMessage reply = connection.call(message);
++
++    if (reply.type() == QDBusMessage::ReplyMessage) {
++        return reply.arguments()[0].toString();
++    } else {
++        Q_ASSERT(reply.type() == QDBusMessage::ErrorMessage);
++        qCWarning(QTMIR_DBUS) << "CGManager::getCGroupOfPid failed." << reply.errorMessage();
++        return QString();
++    }
++}
++
++QSet<pid_t> CGManager::getTasks(const QString &controller, const QString &cgroup)
++{
++    auto connection = getConnection();
++    if (!connection.isConnected()) {
++        return QSet<pid_t>();
++    }
++
++    auto message = QDBusMessage::createMethodCall(QString() /*service*/, m_path, m_interface, "GetTasks");
++
++    QList<QVariant> arguments;
++    arguments << QVariant(controller);
++    arguments << QVariant(cgroup);
++
++    message.setArguments(arguments);
++
++    QDBusMessage reply = connection.call(message);
++
++    if (reply.type() == QDBusMessage::ErrorMessage) {
++        qCWarning(QTMIR_DBUS) << "CGManager::getCGroupOfPid failed." << reply.errorMessage();
++        return QSet<pid_t>();
++    }
++
++    Q_ASSERT(reply.type() == QDBusMessage::ReplyMessage);
++
++    auto arg = reply.arguments()[0].value<QDBusArgument>();
++    Q_ASSERT(arg.currentType() == QDBusArgument::ArrayType);
++
++    auto pidList = qdbus_cast<QList<int>>(arg);
++    Q_ASSERT(pidList.count() > 0);
++
++    QSet<pid_t> pidSet;
++    for (int i = 0; i < pidList.count(); ++i) {
++        pidSet << (pid_t)pidList[i];
++    }
++    return pidSet;
++}
 === added file 'src/modules/Unity/Application/cgmanager.h'
 --- src/modules/Unity/Application/cgmanager.h	1970-01-01 00:00:00 +0000
 +++ src/modules/Unity/Application/cgmanager.h	2016-07-01 16:20:12 +0000
@@ -0,0 +1,42 @@
++/*
++ * Copyright (C) 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
++ * the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
++ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#ifndef QTMIR_CGMANAGER_H
++#define QTMIR_CGMANAGER_H
++
++#include <QDBusConnection>
++
++namespace qtmir {
++
++class CGManager : public QObject {
++    Q_OBJECT
++public:
++    CGManager(QObject *parent = nullptr);
++    virtual ~CGManager();
++
++    QString getCGroupOfPid(const QString &controller, pid_t pid);
++
++    QSet<pid_t> getTasks(const QString &controller, const QString &cgroup);
++
++private:
++    const QString m_interface{"org.linuxcontainers.cgmanager0_0"};
++    const QString m_path{"/org/linuxcontainers/cgmanager"};
++    QDBusConnection getConnection();
++};
++
++} // namespace qtmir
++
++#endif // QTMIR_CGMANAGER_H
 === added file 'src/modules/Unity/Application/dbusfocusinfo.cpp'
 --- src/modules/Unity/Application/dbusfocusinfo.cpp	1970-01-01 00:00:00 +0000
 +++ src/modules/Unity/Application/dbusfocusinfo.cpp	2016-07-01 16:20:12 +0000
@@ -0,0 +1,89 @@
++/*
++ * Copyright (C) 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
++ * the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
++ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#include "dbusfocusinfo.h"
++
++// local
++#include "cgmanager.h"
++
++// QPA mirserver
++#include <logging.h>
++
++#include <QDBusConnection>
++
++using namespace qtmir;
++
++DBusFocusInfo::DBusFocusInfo(const QList<Application*> &applications)
++    : m_applications(applications)
++{
++    QDBusConnection::sessionBus().registerService("com.canonical.Unity.FocusInfo");
++    QDBusConnection::sessionBus().registerObject("/", this, QDBusConnection::ExportScriptableSlots);
++
++    m_cgManager = new CGManager(this);
++}
++
++bool DBusFocusInfo::isPidFocused(unsigned int pid)
++{
++    if (QCoreApplication::applicationPid() == (qint64)pid) {
++        // Shell itself.
++        // Don't bother checking if it has a QML with activeFocus() which is not a MirSurfaceItem.
++        return true;
++    } else {
++        auto pidSet = fetchAssociatedPids((pid_t)pid);
++        SessionInterface *session = findSessionWithPid(pidSet);
++        return session ? session->activeFocus() : false;
++    }
++}
++
++QSet<pid_t> DBusFocusInfo::fetchAssociatedPids(pid_t pid)
++{
++    QString cgroup = m_cgManager->getCGroupOfPid("freezer", pid);
++
++    // If a cgroup has a format like this:
++    // /user.slice/user-32011.slice/session-c3.scope/upstart/application-legacy-puritine_gedit_0.0-
++    // All PIds in it are associated with a single application.
++    if (cgroup.split("/").contains("upstart")) {
++        QSet<pid_t> pidSet = m_cgManager->getTasks("freezer", cgroup);
++        qCDebug(QTMIR_DBUS) << "DBusFocusInfo: pid" << pid << "is in cgroup" << cgroup << "along with:" << pidSet;
++        if (pidSet.isEmpty()) {
++            pidSet << pid;
++        }
++        return pidSet;
++    } else {
++        qCDebug(QTMIR_DBUS) << "DBusFocusInfo: pid" << pid << "is in cgroup" << cgroup << "which is not app-specific";
++        return QSet<pid_t>({pid});
++    }
++}
++
++SessionInterface* DBusFocusInfo::findSessionWithPid(const QSet<pid_t> &pidSet)
++{
++    Q_FOREACH (Application* application, m_applications) {
++        auto session = application->session();
++        if (pidSet.contains(session->pid())) {
++            return session;
++        }
++        SessionInterface *chosenChildSession = nullptr;
++        session->foreachChildSession([&](SessionInterface* childSession) {
++            if (pidSet.contains(childSession->pid())) {
++                chosenChildSession = childSession;
++            }
++        });
++        if (chosenChildSession) {
++            return chosenChildSession;
++        }
++    }
++    return nullptr;
++}
 === added file 'src/modules/Unity/Application/dbusfocusinfo.h'
 --- src/modules/Unity/Application/dbusfocusinfo.h	1970-01-01 00:00:00 +0000
 +++ src/modules/Unity/Application/dbusfocusinfo.h	2016-07-01 16:20:12 +0000
@@ -0,0 +1,54 @@
++/*
++ * Copyright (C) 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
++ * the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
++ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#include <QList>
++#include <QSet>
++
++#include "application.h"
++
++namespace qtmir {
++
++class CGManager;
++
++/*
++  FIXME: This is a hack to provide OSK with needed info for avoiding input snooping.
++         Remove when possible
++ */
++class DBusFocusInfo : public QObject
++{
++    Q_OBJECT
++    Q_CLASSINFO("D-Bus Interface", "com.canonical.Unity.FocusInfo")
++public:
++    explicit DBusFocusInfo(const QList<Application*> &applications);
++    virtual ~DBusFocusInfo() {}
++
++public Q_SLOTS:
++
++    /*
++        Returns true if the application with the given PID has input focus
++     */
++    Q_SCRIPTABLE bool isPidFocused(unsigned int pid);
++
++private:
++    QSet<pid_t> fetchAssociatedPids(pid_t pid);
++    SessionInterface* findSessionWithPid(const QSet<pid_t> &pidSet);
++
++    const QList<Application*> &m_applications;
++
++    CGManager *m_cgManager;
++};
++
++} // namespace qtmir
 === modified file 'src/modules/Unity/Application/mirsurface.cpp'
 --- src/modules/Unity/Application/mirsurface.cpp	2016-05-25 13:54:52 +0000
 +++ src/modules/Unity/Application/mirsurface.cpp	2016-07-01 16:20:12 +0000
@@ -453,6 +453,11 @@
+     }
+ }
++bool MirSurface::activeFocus() const
++{
++    return !m_activelyFocusedViews.empty();
++}
++
  void MirSurface::updateActiveFocus()
+ {
      if (!m_session) {
 === modified file 'src/modules/Unity/Application/mirsurface.h'
 --- src/modules/Unity/Application/mirsurface.h	2016-05-25 13:54:52 +0000
 +++ src/modules/Unity/Application/mirsurface.h	2016-07-01 16:20:12 +0000
@@ -121,6 +121,7 @@
      void setFocused(bool focus) override;
      void setViewActiveFocus(qintptr viewId, bool value) override;
++    bool activeFocus() const override;
      void mousePressEvent(QMouseEvent *event) override;
      void mouseMoveEvent(QMouseEvent *event) override;
 === modified file 'src/modules/Unity/Application/mirsurfaceinterface.h'
 --- src/modules/Unity/Application/mirsurfaceinterface.h	2016-05-24 20:13:10 +0000
 +++ src/modules/Unity/Application/mirsurfaceinterface.h	2016-07-01 16:20:12 +0000
@@ -77,6 +77,10 @@
          the name.
       */
      virtual void setViewActiveFocus(qintptr viewId, bool value) = 0;
++    /*
++        Whether any view of this surface currently has QML active focus
++     */
++    virtual bool activeFocus() const = 0;
      virtual void mousePressEvent(QMouseEvent *event) = 0;
      virtual void mouseMoveEvent(QMouseEvent *event) = 0;
 === modified file 'src/modules/Unity/Application/session.cpp'
 --- src/modules/Unity/Application/session.cpp	2016-06-14 08:35:56 +0000
 +++ src/modules/Unity/Application/session.cpp	2016-07-01 16:20:12 +0000
@@ -514,6 +514,23 @@
      return m_hadSurface;
+ }
++bool Session::activeFocus() const
++{
++    for (int i = 0; i < m_surfaceList.count(); ++i) {
++        auto surface = static_cast<const MirSurfaceInterface*>(m_surfaceList.get(i));
++        if (surface->activeFocus()) {
++            return true;
++        }
++    }
++
++    return false;
++}
++
++pid_t Session::pid() const
++{
++    return m_session->process_id();
++}
++
  void Session::setSuspendTimer(AbstractTimer *timer)
+ {
      bool timerWasRunning = false;
 === modified file 'src/modules/Unity/Application/session.h'
 --- src/modules/Unity/Application/session.h	2016-05-17 19:18:44 +0000
 +++ src/modules/Unity/Application/session.h	2016-07-01 16:20:12 +0000
@@ -67,6 +67,10 @@
      bool hadSurface() const override;
      bool hasClosingSurfaces() const override;
++    bool activeFocus() const override;
++
++    pid_t pid() const override;
++
      void addChildSession(SessionInterface* session) override;
      void insertChildSession(uint index, SessionInterface* session) override;
      void removeChildSession(SessionInterface* session) override;
 === modified file 'src/modules/Unity/Application/session_interface.h'
 --- src/modules/Unity/Application/session_interface.h	2016-05-17 19:18:44 +0000
 +++ src/modules/Unity/Application/session_interface.h	2016-07-01 16:20:12 +0000
@@ -92,6 +92,12 @@
      virtual bool hadSurface() const = 0; // whether this session ever had any surface (currently or in the past)
      virtual bool hasClosingSurfaces() const = 0; // whether it has surfaces being forcibly closed
++    // Whether any of its MirSurfaces has activeFocus()
++    // See qtmir::MirSurfaceInterface::activeFocus
++    virtual bool activeFocus() const = 0;
++
++    virtual pid_t pid() const = 0;
++
      // For SessionManager use
      virtual void addChildSession(SessionInterface* session) = 0;
 === modified file 'src/platforms/mirserver/logging.cpp'
 --- src/platforms/mirserver/logging.cpp	2016-05-03 19:45:51 +0000
 +++ src/platforms/mirserver/logging.cpp	2016-07-01 16:20:12 +0000
@@ -24,3 +24,4 @@
  Q_LOGGING_CATEGORY(QTMIR_CLIPBOARD, "qtmir.clipboard")
  Q_LOGGING_CATEGORY(QTMIR_SENSOR_MESSAGES, "qtmir.sensor")
  Q_LOGGING_CATEGORY(QTMIR_SCREENS, "qtmir.screens")
++Q_LOGGING_CATEGORY(QTMIR_DBUS, "qtmir.dbus", QtWarningMsg)
 === modified file 'src/platforms/mirserver/logging.h'
 --- src/platforms/mirserver/logging.h	2015-08-20 10:16:54 +0000
 +++ src/platforms/mirserver/logging.h	2016-07-01 16:20:12 +0000
@@ -26,5 +26,6 @@
  Q_DECLARE_LOGGING_CATEGORY(QTMIR_MIR_INPUT)
  Q_DECLARE_LOGGING_CATEGORY(QTMIR_CLIPBOARD)
  Q_DECLARE_LOGGING_CATEGORY(QTMIR_SCREENS)
++Q_DECLARE_LOGGING_CATEGORY(QTMIR_DBUS)
  #endif // UBUNTU_APPLICATION_PLUGIN_LOGGING_H
 === modified file 'tests/framework/fake_mirsurface.h'
 --- tests/framework/fake_mirsurface.h	2016-05-24 20:13:10 +0000
 +++ tests/framework/fake_mirsurface.h	2016-07-01 16:20:12 +0000
@@ -112,6 +112,7 @@
      void setFocused(bool focus) override;
      void setViewActiveFocus(qintptr, bool) override {};
++    bool activeFocus() const override { return false; }
      void mousePressEvent(QMouseEvent *) override;
      void mouseMoveEvent(QMouseEvent *) override;
 === modified file 'tests/framework/fake_session.h'
 --- tests/framework/fake_session.h	2016-05-24 20:13:10 +0000
 +++ tests/framework/fake_session.h	2016-07-01 16:20:12 +0000
@@ -58,6 +58,10 @@
      void close() override;
++    bool activeFocus() const override { return false; }
++
++    pid_t pid() const override { return 0; }
++
      // For SessionManager use
      void addChildSession(SessionInterface*) override;