Mir

Merge lp:~alan-griffiths/mir/unpublish-legacy-window-managment-customization into lp:mir

unpublish-legacy-window-managment-customization
Merge into development-branch

Proposed by Alan Griffiths on 2015-03-24

Status:	Merged
Approved by:	Daniel van Vugt on 2015-03-31
Approved revision:	2431
Merged at revision:	2444
Proposed branch:	lp:~alan-griffiths/mir/unpublish-legacy-window-managment-customization
Merge into:	lp:mir
Prerequisite:	lp:~alan-griffiths/mir/default-to-canonical-window-manager
Diff against target:	291 lines (+2/-163) 7 files modified examples/CMakeLists.txt (+0/-1) examples/server_example_fullscreen_placement_strategy.cpp (+0/-63) examples/server_example_fullscreen_placement_strategy.h (+0/-57) include/server/mir/server.h (+0/-11) playground/demo-shell/demo_shell.cpp (+1/-26) src/server/scene/surface_controller.h (+0/-1) src/server/server.cpp (+1/-4)
To merge this branch:	bzr merge lp:~alan-griffiths/mir/unpublish-legacy-window-managment-customization
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Alexandros Frantzis (community)			Approve on 2015-03-30
PS Jenkins bot	continuous-integration		Approve on 2015-03-27
Kevin DuBois (community)			Approve on 2015-03-26
Daniel van Vugt		2015-03-24	Approve on 2015-03-26
Review via email: mp+253967@code.launchpad.net

Commit Message

scene: unpublish customization points for legacy window management

Description of the Change

scene: unpublish customization points for legacy window management

These are not being used downstream as they are inadequate for any sensible usage.

PS Jenkins bot (ps-jenkins) wrote on 2015-03-24:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/3340/rebuild

review: Needs Fixing (continuous-integration)

Daniel van Vugt (vanvugt) wrote on 2015-03-25:

Happy to remove it from playground too. No good reason why it should reside there either.

review: Needs Fixing

PS Jenkins bot (ps-jenkins) wrote on 2015-03-25:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/3352/rebuild

review: Approve (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-03-25:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/3364/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-03-25:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/3367/rebuild

review: Approve (continuous-integration)

Daniel van Vugt (vanvugt) on 2015-03-26:

review: Approve

Kevin DuBois (kdub) wrote on 2015-03-26:

okay by me, I think removal from examples is better than moving to playground too

review: Approve

PS Jenkins bot (ps-jenkins) wrote on 2015-03-26:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/3385/rebuild

review: Needs Fixing (continuous-integration)

lp:~alan-griffiths/mir/unpublish-legacy-window-managment-customization updated on 2015-03-27

2431. By Alan Griffiths on 2015-03-27: merge lp:~alan-griffiths/mir/default-to-canonical-window-manager

PS Jenkins bot (ps-jenkins) wrote on 2015-03-27:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/3401/rebuild

review: Approve (continuous-integration)

Alexandros Frantzis (afrantzis) wrote on 2015-03-30:

Looks good.

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:

Alan Griffiths

Emanuele Antonio Faraone

Gerry Boland

Mir development team

 === modified file 'examples/CMakeLists.txt'
 --- examples/CMakeLists.txt	2015-03-27 06:58:51 +0000
 +++ examples/CMakeLists.txt	2015-03-27 17:01:01 +0000
@@ -21,7 +21,6 @@
    server_example_input_event_filter.cpp
    server_example_log_options.cpp
    server_example_input_filter.cpp
--  server_example_fullscreen_placement_strategy.cpp
    server_example_host_lifecycle_event.cpp
    server_example_tiling_window_manager.cpp
    server_example_window_management.cpp
 === removed file 'examples/server_example_fullscreen_placement_strategy.cpp'
 --- examples/server_example_fullscreen_placement_strategy.cpp	2015-01-21 07:34:50 +0000
 +++ examples/server_example_fullscreen_placement_strategy.cpp	1970-01-01 00:00:00 +0000
@@ -1,63 +0,0 @@
--/*
-- * Copyright © 2013-2014 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: Robert Carr <robert.carr@canonical.com>
-- */
--
--#include "server_example_fullscreen_placement_strategy.h"
--
--#include "mir/server.h"
--#include "mir/options/option.h"
--#include "mir/scene/surface_creation_parameters.h"
--#include "mir/shell/display_layout.h"
--#include "mir/geometry/rectangle.h"
--
--namespace me = mir::examples;
--namespace ms = mir::scene;
--namespace msh = mir::shell;
--
--///\example server_example_fullscreen_placement_strategy.cpp
--/// Demonstrate a custom placement strategy (that fullscreens surfaces)
--
--me::FullscreenPlacementStrategy::FullscreenPlacementStrategy(
--    std::shared_ptr<msh::DisplayLayout> const& display_layout)
--  : display_layout(display_layout)
--{
--}
--
--ms::SurfaceCreationParameters me::FullscreenPlacementStrategy::place(ms::Session const& /* session */,
--    ms::SurfaceCreationParameters const& request_parameters)
--{
--    auto placed_parameters = request_parameters;
--
--    geometry::Rectangle rect{request_parameters.top_left, request_parameters.size};
--    display_layout->size_to_output(rect);
--    placed_parameters.size = rect.size;
--
--    return placed_parameters;
--}
--
--void me::add_fullscreen_option_to(Server& server)
--{
--    server.add_configuration_option("fullscreen-surfaces", "Make all surfaces fullscreen", mir::OptionType::null);
--    server.override_the_placement_strategy([&]()
--        -> std::shared_ptr<ms::PlacementStrategy>
--        {
--            if (server.get_options()->is_set("fullscreen-surfaces"))
--                return std::make_shared<me::FullscreenPlacementStrategy>(server.the_shell_display_layout());
--            else
--                return std::shared_ptr<ms::PlacementStrategy>{};
--        });
--}
 === removed file 'examples/server_example_fullscreen_placement_strategy.h'
 --- examples/server_example_fullscreen_placement_strategy.h	2015-01-21 07:34:50 +0000
 +++ examples/server_example_fullscreen_placement_strategy.h	1970-01-01 00:00:00 +0000
@@ -1,57 +0,0 @@
--/*
-- * Copyright © 2013-2014 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: Robert Carr <robert.carr@canonical.com>
-- */
--
--#ifndef MIR_EXAMPLES_FULLSCREEN_PLACEMENT_STRATEGY_H_
--#define MIR_EXAMPLES_FULLSCREEN_PLACEMENT_STRATEGY_H_
--
--#include "mir/scene/placement_strategy.h"
--
--#include <memory>
--
--namespace mir
--{
--class Server;
--
--namespace shell
--{
--class DisplayLayout;
--}
--
--namespace examples
--{
--class FullscreenPlacementStrategy : public virtual scene::PlacementStrategy
--{
--public:
--    FullscreenPlacementStrategy(std::shared_ptr<shell::DisplayLayout> const& display_layout);
--    ~FullscreenPlacementStrategy() = default;
--
--    scene::SurfaceCreationParameters place(scene::Session const&, scene::SurfaceCreationParameters const& request_parameters);
--
--protected:
--    FullscreenPlacementStrategy(FullscreenPlacementStrategy const&) = delete;
--    FullscreenPlacementStrategy& operator=(FullscreenPlacementStrategy const&) = delete;
--
--private:
--    std::shared_ptr<shell::DisplayLayout> const display_layout;
--};
--
--void add_fullscreen_option_to(Server& server);
--}
--} // namespace mir
--
--#endif // MIR_EXAMPLES_FULLSCREEN_PLACEMENT_STRATEGY_H_
 === modified file 'include/server/mir/server.h'
 --- include/server/mir/server.h	2015-03-27 06:58:51 +0000
 +++ include/server/mir/server.h	2015-03-27 17:01:01 +0000
@@ -44,12 +44,10 @@
+ }
  namespace scene
+ {
--class PlacementStrategy;
  class PromptSessionListener;
  class PromptSessionManager;
  class SessionListener;
  class SessionCoordinator;
--class SurfaceConfigurator;
  class SurfaceCoordinator;
+ }
@@ -228,9 +226,6 @@
      /// Sets an override functor for creating the logger.
      void override_the_logger(Builder<logging::Logger> const& logger_builder);
--    /// Sets an override functor for creating the placement strategy.
--    void override_the_placement_strategy(Builder<scene::PlacementStrategy> const& placement_strategy_builder);
--
      /// Sets an override functor for creating the prompt session listener.
      void override_the_prompt_session_listener(Builder<scene::PromptSessionListener> const& prompt_session_listener_builder);
@@ -252,9 +247,6 @@
      /// Sets an override functor for creating the shell.
      void override_the_shell(Builder<shell::Shell> const& wrapper);
--    /// Sets an override functor for creating the surface configurator.
--    void override_the_surface_configurator(Builder<scene::SurfaceConfigurator> const& surface_configurator_builder);
--
      /// Sets an override functor for creating the window manager.
      void override_the_window_manager_builder(shell::WindowManagerBuilder const wmb);
@@ -335,9 +327,6 @@
      /// \return the display layout.
      auto the_shell_display_layout() const -> std::shared_ptr<shell::DisplayLayout>;
--    /// \return the surface configurator.
--    auto the_surface_configurator() const -> std::shared_ptr<scene::SurfaceConfigurator>;
--
      /// \return the surface coordinator.
      auto the_surface_coordinator() const -> std::shared_ptr<scene::SurfaceCoordinator>;
 === modified file 'playground/demo-shell/demo_shell.cpp'
 --- playground/demo-shell/demo_shell.cpp	2015-03-25 02:48:40 +0000
 +++ playground/demo-shell/demo_shell.cpp	2015-03-27 17:01:01 +0000
@@ -20,10 +20,8 @@
  #include "demo_compositor.h"
  #include "window_manager.h"
--#include "server_example_fullscreen_placement_strategy.h"
  #include "../server_configuration.h"
--#include "mir/options/default_configuration.h"
  #include "mir/run_mir.h"
  #include "mir/report_exception.h"
  #include "mir/graphics/display.h"
@@ -40,7 +38,6 @@
  namespace mg = mir::graphics;
  namespace mf = mir::frontend;
  namespace mi = mir::input;
--namespace mo = mir::options;
  namespace mc = mir::compositor;
  namespace msh = mir::shell;
@@ -74,17 +71,7 @@
  public:
      DemoServerConfiguration(int argc, char const* argv[],
                              std::initializer_list<std::shared_ptr<mi::EventFilter>> const& filter_list)
--      : ServerConfiguration([argc, argv]
--        {
--            auto result = std::make_shared<mo::DefaultConfiguration>(argc, argv);
--
--            namespace po = boost::program_options;
--
--            result->add_options()
--                ("fullscreen-surfaces", "Make all surfaces fullscreen");
--
--            return result;
--        }()),
++      : ServerConfiguration(argc, argv),
          filter_list(filter_list)
+     {
+     }
@@ -100,18 +87,6 @@
              });
+     }
--    std::shared_ptr<ms::PlacementStrategy> the_placement_strategy() override
--    {
--        return placement_strategy(
--            [this]() -> std::shared_ptr<ms::PlacementStrategy>
--            {
--                if (the_options()->is_set("fullscreen-surfaces"))
--                    return std::make_shared<me::FullscreenPlacementStrategy>(the_shell_display_layout());
--                else
--                    return DefaultServerConfiguration::the_placement_strategy();
--            });
--    }
--
      std::shared_ptr<mi::CompositeEventFilter> the_composite_event_filter() override
+     {
          auto composite_filter = ServerConfiguration::the_composite_event_filter();
 === renamed file 'include/server/mir/scene/placement_strategy.h' => 'src/include/server/mir/scene/placement_strategy.h'
 === renamed file 'include/server/mir/scene/surface_configurator.h' => 'src/include/server/mir/scene/surface_configurator.h'
 === modified file 'src/server/scene/surface_controller.h'
 --- src/server/scene/surface_controller.h	2015-03-25 02:48:40 +0000
 +++ src/server/scene/surface_controller.h	2015-03-27 17:01:01 +0000
@@ -26,7 +26,6 @@
+ {
  namespace scene
+ {
--class PlacementStrategy;
  class SurfaceStackModel;
  class SurfaceFactory;
 === modified file 'src/server/server.cpp'
 --- src/server/server.cpp	2015-03-27 06:58:51 +0000
 +++ src/server/server.cpp	2015-03-27 17:01:01 +0000
@@ -53,15 +53,13 @@
      MACRO(host_lifecycle_event_listener)\
      MACRO(input_dispatcher)\
      MACRO(logger)\
--    MACRO(placement_strategy)\
      MACRO(prompt_session_listener)\
      MACRO(prompt_session_manager)\
      MACRO(server_status_listener)\
      MACRO(session_authorizer)\
      MACRO(session_listener)\
      MACRO(session_mediator_report)\
--    MACRO(shell)\
--    MACRO(surface_configurator)
++    MACRO(shell)
  #define FOREACH_ACCESSOR(MACRO)\
      MACRO(the_compositor)\
@@ -82,7 +80,6 @@
      MACRO(the_prompt_session_manager)\
      MACRO(the_shell)\
      MACRO(the_shell_display_layout)\
--    MACRO(the_surface_configurator)\
      MACRO(the_surface_coordinator)\
      MACRO(the_touch_visualizer)