Merge lp:~mir-team/qtmir/rtm-14.09-staging into lp:qtmir/rtm-14.09

[Michał Sawicz]

[Michał Sawicz (saviq)]

As per upstream changes

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-12-18 10:14:58 +0000
+++ debian/changelog	2015-01-12 13:37:53 +0000
@@ -1,3 +1,16 @@
+qtmir (0.4.4+15.04.20150112~rtm-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Nick Dedekind ]
+  * Compatibility for Mir 0.8.1
+  * Notify prompt sessions that sessions have been suspended/resumed.
+    (LP: #1355173, #1384950)
+
+  [ Ricardo Salveti de Araujo ]
+  * qteventfeeder: adding bt and wired headset multimedia keys (LP:
+    #1398427)
+
+ -- Michał Sawicz <[e-mail]>  Mon, 12 Jan 2015 09:39:30 +0100
+
 qtmir (0.4.4+15.04.20141218~rtm-0ubuntu1) 14.09; urgency=low
 
   [ Gerry Boland ]

=== modified file 'debian/control'
--- debian/control	2014-10-30 21:48:17 +0000
+++ debian/control	2015-01-12 13:37:53 +0000
@@ -13,7 +13,7 @@
                libglib2.0-dev,
                liblttng-ust-dev,
                libmirclient-dev (>= 0.6.0),
-               libmirserver-dev (>= 0.6.0),
+               libmirserver-dev (>= 0.8.1),
                libmtdev-dev,
                libprocess-cpp-dev,
                libqt5sensors5-dev,

=== modified file 'src/modules/Unity/Application/session.cpp'
--- src/modules/Unity/Application/session.cpp	2014-09-11 16:18:40 +0000
+++ src/modules/Unity/Application/session.cpp	2015-01-12 13:37:53 +0000
@@ -26,6 +26,7 @@
 
 // mir
 #include <mir/scene/session.h>
+#include <mir/scene/prompt_session.h>
 #include <mir/scene/prompt_session_manager.h>
 
 // Qt
@@ -223,7 +224,6 @@
         {
         case Session::State::Suspended:
             if (m_state == Session::State::Running) {
-                stopPromptSessions();
                 session()->set_lifecycle_state(mir_lifecycle_state_will_suspend);
                 m_suspendTimer->start(3000);
             }
@@ -253,6 +253,19 @@
         m_state = state;
         Q_EMIT stateChanged(state);
 
+        foreachPromptSession([this, state](const std::shared_ptr<ms::PromptSession>& promptSession) {
+            switch (state) {
+                case Session::State::Suspended:
+                    m_promptSessionManager->suspend_prompt_session(promptSession);
+                    break;
+                case Session::State::Running:
+                    m_promptSessionManager->resume_prompt_session(promptSession);
+                    break;
+                default:
+                    break;
+            }
+        });
+
         foreachChildSession([state](SessionInterface* session) {
             session->setState(state);
         });

=== modified file 'src/platforms/mirserver/promptsessionlistener.cpp'
--- src/platforms/mirserver/promptsessionlistener.cpp	2014-07-11 17:15:47 +0000
+++ src/platforms/mirserver/promptsessionlistener.cpp	2015-01-12 13:37:53 +0000
@@ -45,6 +45,18 @@
     Q_EMIT promptSessionStopping(prompt_session);
 }
 
+void PromptSessionListener::suspending(std::shared_ptr<ms::PromptSession> const& prompt_session)
+{
+    qCDebug(QTMIR_MIR_MESSAGES) << "PromptSessionListener::suspending - this=" << this << "prompt_session=" << prompt_session.get();
+    Q_EMIT promptSessionSuspending(prompt_session);
+}
+
+void PromptSessionListener::resuming(std::shared_ptr<ms::PromptSession> const& prompt_session)
+{
+    qCDebug(QTMIR_MIR_MESSAGES) << "PromptSessionListener::resuming - this=" << this << "prompt_session=" << prompt_session.get();
+    Q_EMIT promptSessionResuming(prompt_session);
+}
+
 void PromptSessionListener::prompt_provider_added(ms::PromptSession const& prompt_session,
                                                   std::shared_ptr<ms::Session> const& prompt_provider)
 {

=== modified file 'src/platforms/mirserver/promptsessionlistener.h'
--- src/platforms/mirserver/promptsessionlistener.h	2014-07-11 17:15:47 +0000
+++ src/platforms/mirserver/promptsessionlistener.h	2015-01-12 13:37:53 +0000
@@ -30,6 +30,8 @@
 
     void starting(std::shared_ptr<mir::scene::PromptSession> const& prompt_session) override;
     void stopping(std::shared_ptr<mir::scene::PromptSession> const& prompt_session) override;
+    void suspending(std::shared_ptr<mir::scene::PromptSession> const& prompt_session) override;
+    void resuming(std::shared_ptr<mir::scene::PromptSession> const& prompt_session) override;
 
     void prompt_provider_added(mir::scene::PromptSession const& prompt_session,
         std::shared_ptr<mir::scene::Session> const& prompt_provider) override;
@@ -39,6 +41,8 @@
 Q_SIGNALS:
     void promptSessionStarting(std::shared_ptr<mir::scene::PromptSession> const& session);
     void promptSessionStopping(std::shared_ptr<mir::scene::PromptSession> const& session);
+    void promptSessionSuspending(std::shared_ptr<mir::scene::PromptSession> const& session);
+    void promptSessionResuming(std::shared_ptr<mir::scene::PromptSession> const& session);
 
     void promptProviderAdded(mir::scene::PromptSession const*, std::shared_ptr<mir::scene::Session> const&);
     void promptProviderRemoved(mir::scene::PromptSession const*, std::shared_ptr<mir::scene::Session> const&);

=== modified file 'src/platforms/mirserver/qteventfeeder.cpp'
--- src/platforms/mirserver/qteventfeeder.cpp	2014-09-24 21:30:06 +0000
+++ src/platforms/mirserver/qteventfeeder.cpp	2015-01-12 13:37:53 +0000
@@ -116,6 +116,13 @@
     XKB_KEY_XF86PowerOff,            Qt::Key_PowerOff,
     XKB_KEY_XF86PowerDown,           Qt::Key_PowerDown,
 
+    /* Bluetooth / Wired headset multimedia keys */
+    XKB_KEY_XF86AudioPlay,           Qt::Key_MediaPlay,
+    XKB_KEY_XF86AudioPrev,           Qt::Key_MediaPrevious,
+    XKB_KEY_XF86AudioNext,           Qt::Key_MediaNext,
+    XKB_KEY_XF86AudioPause,          Qt::Key_MediaPause,
+    XKB_KEY_XF86AudioMedia,          Qt::Key_MediaTogglePlayPause,
+
     0,                          0
 };
 

=== modified file 'tests/modules/SessionManager/session_test.cpp'
--- tests/modules/SessionManager/session_test.cpp	2014-09-11 16:18:40 +0000
+++ tests/modules/SessionManager/session_test.cpp	2015-01-12 13:37:53 +0000
@@ -191,3 +191,61 @@
     delete session;
     EXPECT_THAT(destroyed, UnorderedElementsAre(session1, session2, session3));
 }
+
+class MockQtMirSession : public qtmir::Session
+{
+public:
+    MockQtMirSession(const std::shared_ptr<ms::Session>& session,
+                     const std::shared_ptr<ms::PromptSessionManager>& promptSessionManager)
+    : Session(session, promptSessionManager)
+    {}
+
+    using SessionInterface::appendPromptSession;
+};
+
+TEST_F(SessionTests, SuspendPromptSessionWhenSessionSuspends)
+{
+    using namespace testing;
+
+    const QString appId("test-app");
+    quint64 procId = 5551;
+
+    auto mirSession = std::make_shared<MockSession>(appId.toStdString(), procId);
+    EXPECT_CALL(*mirSession, set_lifecycle_state(_));
+
+    auto session = std::make_shared<MockQtMirSession>(mirSession, mirConfig->the_prompt_session_manager());
+    session->setState(Session::State::Running);
+
+    auto mirPromptSession = std::make_shared<ms::MockPromptSession>();
+    session->appendPromptSession(mirPromptSession);
+
+    EXPECT_CALL(*mirConfig->the_mock_prompt_session_manager(), suspend_prompt_session(_)).Times(1);
+
+    session->setState(Session::State::Suspended);
+
+    Mock::VerifyAndClear(mirConfig->the_mock_prompt_session_manager().get());
+}
+
+TEST_F(SessionTests, ResumePromptSessionWhenSessionResumes)
+{
+    using namespace testing;
+
+    const QString appId("test-app");
+    quint64 procId = 5551;
+
+    auto mirSession = std::make_shared<MockSession>(appId.toStdString(), procId);
+    EXPECT_CALL(*mirSession, set_lifecycle_state(_));
+
+    auto session = std::make_shared<MockQtMirSession>(mirSession, mirConfig->the_prompt_session_manager());
+    session->setState(Session::State::Suspended);
+
+    auto mirPromptSession = std::make_shared<ms::MockPromptSession>();
+    session->appendPromptSession(mirPromptSession);
+
+    EXPECT_CALL(*mirConfig->the_mock_prompt_session_manager(), resume_prompt_session(_)).Times(1);
+
+    session->setState(Session::State::Running);
+
+    Mock::VerifyAndClear(mirConfig->the_mock_prompt_session_manager().get());
+}
+

=== modified file 'tests/modules/common/mock_mir_session.h'
--- tests/modules/common/mock_mir_session.h	2014-09-11 16:18:40 +0000
+++ tests/modules/common/mock_mir_session.h	2015-01-12 13:37:53 +0000
@@ -31,7 +31,7 @@
 struct MockSession : public Session
 {
     MockSession() {}
-    MockSession(std::string const& sessionName, pid_t processId) 
+    MockSession(std::string const& sessionName, pid_t processId)
         : m_sessionName(sessionName), m_sessionId(processId)
     {}
 
@@ -62,6 +62,8 @@
 
     void start_prompt_session() override {};
     void stop_prompt_session() override {};
+    void suspend_prompt_session() override {};
+    void resume_prompt_session() override {};
 
 private:
     std::string m_sessionName;

=== modified file 'tests/modules/common/mock_prompt_session.h'
--- tests/modules/common/mock_prompt_session.h	2014-09-11 16:18:40 +0000
+++ tests/modules/common/mock_prompt_session.h	2015-01-12 13:37:53 +0000
@@ -26,6 +26,11 @@
 
 struct MockPromptSession : public PromptSession
 {
+public:
+    MOCK_METHOD1(start, void(std::shared_ptr<Session> const&));
+    MOCK_METHOD1(stop, void(std::shared_ptr<Session> const&));
+    MOCK_METHOD1(suspend, void(std::shared_ptr<Session> const&));
+    MOCK_METHOD1(resume, void(std::shared_ptr<Session> const&));
 };
 
 } // namespace scene

=== modified file 'tests/modules/common/mock_prompt_session_manager.h'
--- tests/modules/common/mock_prompt_session_manager.h	2014-09-11 16:18:40 +0000
+++ tests/modules/common/mock_prompt_session_manager.h	2015-01-12 13:37:53 +0000
@@ -34,12 +34,13 @@
 
     MOCK_CONST_METHOD1(stop_prompt_session, void(std::shared_ptr<PromptSession> const&));
 
+    MOCK_CONST_METHOD1(suspend_prompt_session, void(std::shared_ptr<PromptSession> const&));
+
+    MOCK_CONST_METHOD1(resume_prompt_session, void(std::shared_ptr<PromptSession> const&));
+
     MOCK_CONST_METHOD2(add_prompt_provider, void(std::shared_ptr<PromptSession> const&,
         std::shared_ptr<mir::scene::Session> const&));
 
-    MOCK_CONST_METHOD2(add_prompt_provider_by_pid, void(std::shared_ptr<PromptSession> const&,
-        pid_t));
-
     MOCK_CONST_METHOD1(add_expected_session, void(std::shared_ptr<Session> const&));
 
     MOCK_CONST_METHOD1(remove_session, void(std::shared_ptr<Session> const&));