Merge lp:~alan-griffiths/unity-system-compositor/decouple-WindowManager-from-DMMessageHandler into lp:unity-system-compositor

[Alan Griffiths]

Decouple the WindowManager from the display manager message handler (DMMessageHandler)

Decouple the WindowManager from the display manager message handler (DMMessageHandler)

This is a step towards separating the system manager's window management policy into a service provided by Mir.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:220
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/223/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-wily-amd64-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-wily-armhf-ci/11
        deb: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-wily-armhf-ci/11/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-wily-i386-ci/11

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-system-compositor-ci/223/rebuild

review: Approve (continuous-integration)

[Alexandros Frantzis (afrantzis)]

Looks good.

Nit:

57 + virtual ~SessionMonitor() = default;
58 +
59 + SessionMonitor(SessionMonitor const&) = delete;
60 +
61 + SessionMonitor& operator=(SessionMonitor const&) = delete;
62 +
63 + virtual void add(std::shared_ptr<Session> const& session, pid_t pid) = 0;
64 +
65 + virtual void remove(
66 + std::shared_ptr<mir::frontend::Session> const& session) = 0;
67 +
68 + virtual void mark_ready(mir::frontend::Session const* session) = 0;
69 +};

Grouping the functions (construction/destruction vs others) by strategically placing blank lines would make the class easier to read (IMO).

review: Approve

[lp:~alan-griffiths/unity-system-compositor/decouple-WindowManager-from-DMMessageHandler]

221. By Alan Griffiths on 2015-06-04

Regroup contents of SessionMonitor definition

222. By Alan Griffiths on 2015-06-04

merge lp:unity-system-compositor

[Alexandros Frantzis (afrantzis)]

Great!

review: Approve

=== added file 'src/session_monitor.h'
--- src/session_monitor.h	1970-01-01 00:00:00 +0000
+++ src/session_monitor.h	2015-06-04 13:37:00 +0000
@@ -0,0 +1,63 @@
+/*
+ * Copyright © 2015 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU 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 warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Alan Griffiths <[e-mail]>
+ */
+
+#ifndef USC_SESSION_MONITOR_H
+#define USC_SESSION_MONITOR_H
+
+#include <sys/types.h>
+
+#include <memory>
+#include <string>
+
+namespace mir { namespace frontend { class Session; }};
+
+namespace usc
+{
+class Session
+{
+public:
+    virtual ~Session() = default;
+
+    virtual std::string name() = 0;
+    virtual void show() = 0;
+    virtual void hide() = 0;
+    virtual void raise_and_focus() = 0;
+    virtual bool corresponds_to(mir::frontend::Session const*) = 0;
+
+protected:
+    Session() = default;
+    Session(Session const&) = delete;
+    Session& operator=(Session const&) = delete;
+};
+
+class SessionMonitor
+{
+public:
+    virtual void add(std::shared_ptr<Session> const& session, pid_t pid) = 0;
+    virtual void remove(std::shared_ptr<mir::frontend::Session> const& session) = 0;
+    virtual void mark_ready(mir::frontend::Session const* session) = 0;
+
+protected:
+    SessionMonitor() = default;
+    SessionMonitor(SessionMonitor const&) = delete;
+    SessionMonitor& operator=(SessionMonitor const&) = delete;
+    virtual ~SessionMonitor() = default;
+};
+}
+
+#endif //USC_SESSION_MONITOR_H

=== modified file 'src/session_switcher.h'
--- src/session_switcher.h	2014-10-22 19:31:57 +0000
+++ src/session_switcher.h	2015-06-04 13:37:00 +0000
@@ -20,41 +20,24 @@
 #define USC_SESSION_SWITCHER_H_
 
 #include "dm_connection.h"
+#include "session_monitor.h"
 
 #include <map>
-#include <memory>
 #include <mutex>
 
-namespace mir { namespace frontend { class Session; }};
 namespace usc
 {
 class Spinner;
 
-class Session
-{
-public:
-    virtual ~Session() = default;
-
-    virtual std::string name() = 0;
-    virtual void show() = 0;
-    virtual void hide() = 0;
-    virtual void raise_and_focus() = 0;
-    virtual bool corresponds_to(mir::frontend::Session const*) = 0;
-
-protected:
-    Session() = default;
-    Session(Session const&) = delete;
-    Session& operator=(Session const&) = delete;
-};
-
-class SessionSwitcher : public DMMessageHandler
+class SessionSwitcher : public DMMessageHandler, public SessionMonitor
 {
 public:
     explicit SessionSwitcher(std::shared_ptr<Spinner> const& spinner);
 
-    void add(std::shared_ptr<Session> const& session, pid_t pid);
-    void remove(std::shared_ptr<mir::frontend::Session> const& session);
-    void mark_ready(mir::frontend::Session const* session);
+    /* From SessionMonitor */
+    void add(std::shared_ptr<Session> const& session, pid_t pid) override;
+    void remove(std::shared_ptr<mir::frontend::Session> const& session) override;
+    void mark_ready(mir::frontend::Session const* session) override;
 
     /* From DMMessageHandler */
     void set_active_session(std::string const& name) override;

=== modified file 'src/window_manager.cpp'
--- src/window_manager.cpp	2015-06-03 11:35:04 +0000
+++ src/window_manager.cpp	2015-06-04 13:37:00 +0000
@@ -18,7 +18,7 @@
 
 #include "window_manager.h"
 
-#include "session_switcher.h"
+#include "session_monitor.h"
 
 #include "mir/geometry/rectangle.h"
 #include "mir/shell/surface_ready_observer.h"
@@ -88,11 +88,11 @@
     mir::shell::FocusController* focus_controller,
     std::shared_ptr<mir::shell::DisplayLayout> const& display_layout,
     std::shared_ptr<ms::SessionCoordinator> const& session_coordinator,
-    std::shared_ptr<SessionSwitcher> const& session_switcher) :
+    std::shared_ptr<SessionMonitor> const& session_monitor) :
     focus_controller{focus_controller},
     display_layout{display_layout},
     session_coordinator{session_coordinator},
-    session_switcher{session_switcher}
+    session_monitor{session_monitor}
 {
 }
 
@@ -104,7 +104,7 @@
 
     auto const usc_session = std::make_shared<UscSession>(session, *focus_controller);
 
-    session_switcher->add(usc_session, session->process_id());
+    session_monitor->add(usc_session, session->process_id());
 }
 
 void usc::WindowManager::remove_session(std::shared_ptr<ms::Session> const& session)
@@ -117,7 +117,7 @@
     else
         focus_controller->set_focus_to(next_session, {});
 
-    session_switcher->remove(session);
+    session_monitor->remove(session);
 }
 
 auto usc::WindowManager::add_surface(
@@ -146,7 +146,7 @@
     auto const session_ready_observer = std::make_shared<msh::SurfaceReadyObserver>(
         [this](std::shared_ptr<ms::Session> const& session, std::shared_ptr<ms::Surface> const& surface)
         {
-            session_switcher->mark_ready(session.get());
+            session_monitor->mark_ready(session.get());
         },
         session,
         surface);

=== modified file 'src/window_manager.h'
--- src/window_manager.h	2015-04-09 11:27:06 +0000
+++ src/window_manager.h	2015-06-04 13:37:00 +0000
@@ -20,6 +20,7 @@
 #define USC_WINDOW_MANAGER_H_
 
 #include <mir/shell/window_manager.h>
+#include "session_monitor.h"
 
 namespace mir
 {
@@ -29,7 +30,7 @@
 
 namespace usc
 {
-class SessionSwitcher;
+class SessionMonitor;
 
 class WindowManager : public mir::shell::WindowManager
 {
@@ -38,7 +39,7 @@
         mir::shell::FocusController* focus_controller,
         std::shared_ptr<mir::shell::DisplayLayout> const& display_layout,
         std::shared_ptr<mir::scene::SessionCoordinator> const& session_coordinator,
-        std::shared_ptr<SessionSwitcher> const& session_switcher);
+        std::shared_ptr<SessionMonitor> const& session_switcher);
 
     void add_session(std::shared_ptr<mir::scene::Session> const& session) override;
 
@@ -78,7 +79,7 @@
     mir::shell::FocusController* const focus_controller;
     std::shared_ptr<mir::shell::DisplayLayout> const display_layout;
     std::shared_ptr<mir::scene::SessionCoordinator> const session_coordinator;
-    std::shared_ptr<SessionSwitcher> const session_switcher;
+    std::shared_ptr<SessionMonitor> const session_monitor;
 };
 }