Merge lp:~alan-griffiths/miral/set_window_managment-policy into lp:miral

[Alan Griffiths]

miral::set_window_managment-policy<>() utility

[Gerry Boland (gerboland)]

Looks ok to me, thanks!

review: Approve

=== added file 'include/miral/set_window_managment_policy.h'
--- include/miral/set_window_managment_policy.h	1970-01-01 00:00:00 +0000
+++ include/miral/set_window_managment_policy.h	2016-06-06 18:45:35 +0000
@@ -0,0 +1,54 @@
+/*
+ * Copyright © 2016 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 MIRAL_SET_WINDOW_MANAGER_H
+#define MIRAL_SET_WINDOW_MANAGER_H
+
+#include <memory>
+
+namespace mir
+{
+class Server;
+}
+
+namespace miral
+{
+class WindowManagerTools;
+class WindowManagementPolicy;
+
+class SetWindowManagmentPolicy
+{
+public:
+    SetWindowManagmentPolicy(std::function<std::unique_ptr<WindowManagementPolicy>(WindowManagerTools* tools)> const& builder);
+    ~SetWindowManagmentPolicy();
+
+    void operator()(mir::Server& server) const;
+
+private:
+    std::function<std::unique_ptr<WindowManagementPolicy>(WindowManagerTools* tools)> builder;
+};
+
+template<typename Policy, typename ...Args>
+auto set_window_managment_policy(Args& ... args) -> SetWindowManagmentPolicy
+{
+    return SetWindowManagmentPolicy{[&args...](WindowManagerTools* tools) -> std::unique_ptr<WindowManagementPolicy>
+        { return std::make_unique<Policy>(tools, args...); }};
+}
+}
+
+#endif //MIRAL_SET_WINDOW_MANAGER_H

=== modified file 'miral-kiosk/kiosk_main.cpp'
--- miral-kiosk/kiosk_main.cpp	2016-04-15 16:43:27 +0000
+++ miral-kiosk/kiosk_main.cpp	2016-06-06 18:45:35 +0000
@@ -19,7 +19,7 @@
 #include "kiosk_window_manager.h"
 
 #include "miral/runner.h"
-#include "miral/window_management_options.h"
+#include "miral/set_window_managment_policy.h"
 #include "miral/startup_internal_client.h"
 
 int main(int argc, char const* argv[])
@@ -30,7 +30,7 @@
 
     return MirRunner{argc, argv}.run_with(
         {
-            WindowManagerOptions{add_window_manager_policy<KioskWindowManagerPolicy>("kiosk", splash)},
+            set_window_managment_policy<KioskWindowManagerPolicy>(splash),
             StartupInternalClient{"Intro", splash}
         });
 }

=== modified file 'miral/CMakeLists.txt'
--- miral/CMakeLists.txt	2016-06-03 14:41:55 +0000
+++ miral/CMakeLists.txt	2016-06-06 18:45:35 +0000
@@ -15,6 +15,7 @@
     window_specification.cpp          ${CMAKE_SOURCE_DIR}/include/miral/window_specification.h
     startup_internal_client.cpp       ${CMAKE_SOURCE_DIR}/include/miral/startup_internal_client.h
     mru_window_list.cpp               ${CMAKE_SOURCE_DIR}/include/miral/mru_window_list.h
+    set_window_managment_policy.cpp   ${CMAKE_SOURCE_DIR}/include/miral/set_window_managment_policy.h
     basic_window_manager.cpp          basic_window_manager.h
     ${CMAKE_SOURCE_DIR}/include/miral/window_management_policy.h
     ${CMAKE_SOURCE_DIR}/include/miral/window_manager_tools.h

=== added file 'miral/set_window_managment_policy.cpp'
--- miral/set_window_managment_policy.cpp	1970-01-01 00:00:00 +0000
+++ miral/set_window_managment_policy.cpp	2016-06-06 18:45:35 +0000
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2016 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]>
+ */
+
+#include "miral/set_window_managment_policy.h"
+#include "basic_window_manager.h"
+
+#include <mir/server.h>
+
+namespace msh = mir::shell;
+
+miral::SetWindowManagmentPolicy::SetWindowManagmentPolicy(WindowManagementPolicyBuilder const& builder) :
+    builder{builder}
+{
+}
+
+miral::SetWindowManagmentPolicy::~SetWindowManagmentPolicy() = default;
+
+void miral::SetWindowManagmentPolicy::operator()(mir::Server& server) const
+{
+    server.override_the_window_manager_builder([this, &server](msh::FocusController* focus_controller)
+        -> std::shared_ptr<msh::WindowManager>
+        {
+            auto const display_layout = server.the_shell_display_layout();
+
+            return std::make_shared<BasicWindowManager>(focus_controller, display_layout, builder);
+        });
+}