1
=== modified file 'examples/CMakeLists.txt'
2
--- examples/CMakeLists.txt	2015-03-27 06:58:51 +0000
3
+++ examples/CMakeLists.txt	2015-03-27 17:01:01 +0000
4
@@ -21,7 +21,6 @@
5
21
  server_example_input_event_filter.cpp
21
  server_example_input_event_filter.cpp
6
22
  server_example_log_options.cpp
22
  server_example_log_options.cpp
7
23
  server_example_input_filter.cpp
23
  server_example_input_filter.cpp
8
24
  server_example_fullscreen_placement_strategy.cpp
9
25
  server_example_host_lifecycle_event.cpp
24
  server_example_host_lifecycle_event.cpp
10
26
  server_example_tiling_window_manager.cpp
25
  server_example_tiling_window_manager.cpp
11
27
  server_example_window_management.cpp
26
  server_example_window_management.cpp
12
28
27
13
=== removed file 'examples/server_example_fullscreen_placement_strategy.cpp'
14
--- examples/server_example_fullscreen_placement_strategy.cpp	2015-01-21 07:34:50 +0000
15
+++ examples/server_example_fullscreen_placement_strategy.cpp	1970-01-01 00:00:00 +0000
16
@@ -1,63 +0,0 @@
17
1
/*
18
2
 * Copyright © 2013-2014 Canonical Ltd.
19
3
 *
20
4
 * This program is free software: you can redistribute it and/or modify it
21
5
 * under the terms of the GNU General Public License version 3,
22
6
 * as published by the Free Software Foundation.
23
7
 *
24
8
 * This program is distributed in the hope that it will be useful,
25
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
26
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
27
11
 * GNU General Public License for more details.
28
12
 *
29
13
 * You should have received a copy of the GNU General Public License
30
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
31
15
 *
32
16
 * Authored by: Robert Carr <robert.carr@canonical.com>
33
17
 */
34
18
35
19
#include "server_example_fullscreen_placement_strategy.h"
36
20
37
21
#include "mir/server.h"
38
22
#include "mir/options/option.h"
39
23
#include "mir/scene/surface_creation_parameters.h"
40
24
#include "mir/shell/display_layout.h"
41
25
#include "mir/geometry/rectangle.h"
42
26
43
27
namespace me = mir::examples;
44
28
namespace ms = mir::scene;
45
29
namespace msh = mir::shell;
46
30
47
31
///\example server_example_fullscreen_placement_strategy.cpp
48
32
/// Demonstrate a custom placement strategy (that fullscreens surfaces)
49
33
50
34
me::FullscreenPlacementStrategy::FullscreenPlacementStrategy(
51
35
    std::shared_ptr<msh::DisplayLayout> const& display_layout)
52
36
  : display_layout(display_layout)
53
37
{
54
38
}
55
39
56
40
ms::SurfaceCreationParameters me::FullscreenPlacementStrategy::place(ms::Session const& /* session */,
57
41
    ms::SurfaceCreationParameters const& request_parameters)
58
42
{
59
43
    auto placed_parameters = request_parameters;
60
44
61
45
    geometry::Rectangle rect{request_parameters.top_left, request_parameters.size};
62
46
    display_layout->size_to_output(rect);
63
47
    placed_parameters.size = rect.size;
64
48
65
49
    return placed_parameters;
66
50
}
67
51
68
52
void me::add_fullscreen_option_to(Server& server)
69
53
{
70
54
    server.add_configuration_option("fullscreen-surfaces", "Make all surfaces fullscreen", mir::OptionType::null);
71
55
    server.override_the_placement_strategy([&]()
72
56
        -> std::shared_ptr<ms::PlacementStrategy>
73
57
        {
74
58
            if (server.get_options()->is_set("fullscreen-surfaces"))
75
59
                return std::make_shared<me::FullscreenPlacementStrategy>(server.the_shell_display_layout());
76
60
            else
77
61
                return std::shared_ptr<ms::PlacementStrategy>{};
78
62
        });
79
63
}
80
64
0
81
=== removed file 'examples/server_example_fullscreen_placement_strategy.h'
82
--- examples/server_example_fullscreen_placement_strategy.h	2015-01-21 07:34:50 +0000
83
+++ examples/server_example_fullscreen_placement_strategy.h	1970-01-01 00:00:00 +0000
84
@@ -1,57 +0,0 @@
85
1
/*
86
2
 * Copyright © 2013-2014 Canonical Ltd.
87
3
 *
88
4
 * This program is free software: you can redistribute it and/or modify it
89
5
 * under the terms of the GNU General Public License version 3,
90
6
 * as published by the Free Software Foundation.
91
7
 *
92
8
 * This program is distributed in the hope that it will be useful,
93
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
94
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
95
11
 * GNU General Public License for more details.
96
12
 *
97
13
 * You should have received a copy of the GNU General Public License
98
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
99
15
 *
100
16
 * Authored by: Robert Carr <robert.carr@canonical.com>
101
17
 */
102
18
103
19
#ifndef MIR_EXAMPLES_FULLSCREEN_PLACEMENT_STRATEGY_H_
104
20
#define MIR_EXAMPLES_FULLSCREEN_PLACEMENT_STRATEGY_H_
105
21
106
22
#include "mir/scene/placement_strategy.h"
107
23
108
24
#include <memory>
109
25
110
26
namespace mir
111
27
{
112
28
class Server;
113
29
114
30
namespace shell
115
31
{
116
32
class DisplayLayout;
117
33
}
118
34
119
35
namespace examples
120
36
{
121
37
class FullscreenPlacementStrategy : public virtual scene::PlacementStrategy
122
38
{
123
39
public:
124
40
    FullscreenPlacementStrategy(std::shared_ptr<shell::DisplayLayout> const& display_layout);
125
41
    ~FullscreenPlacementStrategy() = default;
126
42
    
127
43
    scene::SurfaceCreationParameters place(scene::Session const&, scene::SurfaceCreationParameters const& request_parameters);
128
44
129
45
protected:
130
46
    FullscreenPlacementStrategy(FullscreenPlacementStrategy const&) = delete;
131
47
    FullscreenPlacementStrategy& operator=(FullscreenPlacementStrategy const&) = delete;
132
48
133
49
private:
134
50
    std::shared_ptr<shell::DisplayLayout> const display_layout;
135
51
};
136
52
137
53
void add_fullscreen_option_to(Server& server);
138
54
}
139
55
} // namespace mir
140
56
141
57
#endif // MIR_EXAMPLES_FULLSCREEN_PLACEMENT_STRATEGY_H_
142
58
0
143
=== modified file 'include/server/mir/server.h'
144
--- include/server/mir/server.h	2015-03-27 06:58:51 +0000
145
+++ include/server/mir/server.h	2015-03-27 17:01:01 +0000
146
@@ -44,12 +44,10 @@
147
44
}
44
}
148
45
namespace scene
45
namespace scene
149
46
{
46
{
150
47
class PlacementStrategy;
151
48
class PromptSessionListener;
47
class PromptSessionListener;
152
49
class PromptSessionManager;
48
class PromptSessionManager;
153
50
class SessionListener;
49
class SessionListener;
154
51
class SessionCoordinator;
50
class SessionCoordinator;
155
52
class SurfaceConfigurator;
156
53
class SurfaceCoordinator;
51
class SurfaceCoordinator;
157
54
}
52
}
158
55
53
159
@@ -228,9 +226,6 @@
160
228
    /// Sets an override functor for creating the logger.
226
    /// Sets an override functor for creating the logger.
161
229
    void override_the_logger(Builder<logging::Logger> const& logger_builder);
227
    void override_the_logger(Builder<logging::Logger> const& logger_builder);
162
230
228
163
231
    /// Sets an override functor for creating the placement strategy.
164
232
    void override_the_placement_strategy(Builder<scene::PlacementStrategy> const& placement_strategy_builder);
165
233
166
234
    /// Sets an override functor for creating the prompt session listener.
229
    /// Sets an override functor for creating the prompt session listener.
167
235
    void override_the_prompt_session_listener(Builder<scene::PromptSessionListener> const& prompt_session_listener_builder);
230
    void override_the_prompt_session_listener(Builder<scene::PromptSessionListener> const& prompt_session_listener_builder);
168
236
231
169
@@ -252,9 +247,6 @@
170
252
    /// Sets an override functor for creating the shell.
247
    /// Sets an override functor for creating the shell.
171
253
    void override_the_shell(Builder<shell::Shell> const& wrapper);
248
    void override_the_shell(Builder<shell::Shell> const& wrapper);
172
254
249
173
255
    /// Sets an override functor for creating the surface configurator.
174
256
    void override_the_surface_configurator(Builder<scene::SurfaceConfigurator> const& surface_configurator_builder);
175
257
176
258
    /// Sets an override functor for creating the window manager.
250
    /// Sets an override functor for creating the window manager.
177
259
    void override_the_window_manager_builder(shell::WindowManagerBuilder const wmb);
251
    void override_the_window_manager_builder(shell::WindowManagerBuilder const wmb);
178
260
252
179
@@ -335,9 +327,6 @@
180
335
    /// \return the display layout.
327
    /// \return the display layout.
181
336
    auto the_shell_display_layout() const -> std::shared_ptr<shell::DisplayLayout>;
328
    auto the_shell_display_layout() const -> std::shared_ptr<shell::DisplayLayout>;
182
337
329
183
338
    /// \return the surface configurator.
184
339
    auto the_surface_configurator() const -> std::shared_ptr<scene::SurfaceConfigurator>;
185
340
186
341
    /// \return the surface coordinator.
330
    /// \return the surface coordinator.
187
342
    auto the_surface_coordinator() const -> std::shared_ptr<scene::SurfaceCoordinator>;
331
    auto the_surface_coordinator() const -> std::shared_ptr<scene::SurfaceCoordinator>;
188
343
332
189
344
333
190
=== modified file 'playground/demo-shell/demo_shell.cpp'
191
--- playground/demo-shell/demo_shell.cpp	2015-03-25 02:48:40 +0000
192
+++ playground/demo-shell/demo_shell.cpp	2015-03-27 17:01:01 +0000
193
@@ -20,10 +20,8 @@
194
20
20
195
21
#include "demo_compositor.h"
21
#include "demo_compositor.h"
196
22
#include "window_manager.h"
22
#include "window_manager.h"
197
23
#include "server_example_fullscreen_placement_strategy.h"
198
24
#include "../server_configuration.h"
23
#include "../server_configuration.h"
199
25
24
200
26
#include "mir/options/default_configuration.h"
201
27
#include "mir/run_mir.h"
25
#include "mir/run_mir.h"
202
28
#include "mir/report_exception.h"
26
#include "mir/report_exception.h"
203
29
#include "mir/graphics/display.h"
27
#include "mir/graphics/display.h"
204
@@ -40,7 +38,6 @@
205
40
namespace mg = mir::graphics;
38
namespace mg = mir::graphics;
206
41
namespace mf = mir::frontend;
39
namespace mf = mir::frontend;
207
42
namespace mi = mir::input;
40
namespace mi = mir::input;
208
43
namespace mo = mir::options;
209
44
namespace mc = mir::compositor;
41
namespace mc = mir::compositor;
210
45
namespace msh = mir::shell;
42
namespace msh = mir::shell;
211
46
43
212
@@ -74,17 +71,7 @@
213
74
public:
71
public:
214
75
    DemoServerConfiguration(int argc, char const* argv[],
72
    DemoServerConfiguration(int argc, char const* argv[],
215
76
                            std::initializer_list<std::shared_ptr<mi::EventFilter>> const& filter_list)
73
                            std::initializer_list<std::shared_ptr<mi::EventFilter>> const& filter_list)
227
77
      : ServerConfiguration([argc, argv]
74
      : ServerConfiguration(argc, argv),
217
78
        {
218
79
            auto result = std::make_shared<mo::DefaultConfiguration>(argc, argv);
219
80
220
81
            namespace po = boost::program_options;
221
82
222
83
            result->add_options()
223
84
                ("fullscreen-surfaces", "Make all surfaces fullscreen");
224
85
225
86
            return result;
226
87
        }()),
228
88
        filter_list(filter_list)
75
        filter_list(filter_list)
229
89
    {
76
    {
230
90
    }
77
    }
231
@@ -100,18 +87,6 @@
232
100
            });
87
            });
233
101
    }
88
    }
234
102
89
235
103
    std::shared_ptr<ms::PlacementStrategy> the_placement_strategy() override
236
104
    {
237
105
        return placement_strategy(
238
106
            [this]() -> std::shared_ptr<ms::PlacementStrategy>
239
107
            {
240
108
                if (the_options()->is_set("fullscreen-surfaces"))
241
109
                    return std::make_shared<me::FullscreenPlacementStrategy>(the_shell_display_layout());
242
110
                else
243
111
                    return DefaultServerConfiguration::the_placement_strategy();
244
112
            });
245
113
    }
246
114
247
115
    std::shared_ptr<mi::CompositeEventFilter> the_composite_event_filter() override
90
    std::shared_ptr<mi::CompositeEventFilter> the_composite_event_filter() override
248
116
    {
91
    {
249
117
        auto composite_filter = ServerConfiguration::the_composite_event_filter();
92
        auto composite_filter = ServerConfiguration::the_composite_event_filter();
250
118
93
251
=== renamed file 'include/server/mir/scene/placement_strategy.h' => 'src/include/server/mir/scene/placement_strategy.h'
252
=== renamed file 'include/server/mir/scene/surface_configurator.h' => 'src/include/server/mir/scene/surface_configurator.h'
253
=== modified file 'src/server/scene/surface_controller.h'
254
--- src/server/scene/surface_controller.h	2015-03-25 02:48:40 +0000
255
+++ src/server/scene/surface_controller.h	2015-03-27 17:01:01 +0000
256
@@ -26,7 +26,6 @@
257
26
{
26
{
258
27
namespace scene
27
namespace scene
259
28
{
28
{
260
29
class PlacementStrategy;
261
30
class SurfaceStackModel;
29
class SurfaceStackModel;
262
31
class SurfaceFactory;
30
class SurfaceFactory;
263
32
31
264
33
32
265
=== modified file 'src/server/server.cpp'
266
--- src/server/server.cpp	2015-03-27 06:58:51 +0000
267
+++ src/server/server.cpp	2015-03-27 17:01:01 +0000
268
@@ -53,15 +53,13 @@
269
53
    MACRO(host_lifecycle_event_listener)\
53
    MACRO(host_lifecycle_event_listener)\
270
54
    MACRO(input_dispatcher)\
54
    MACRO(input_dispatcher)\
271
55
    MACRO(logger)\
55
    MACRO(logger)\
272
56
    MACRO(placement_strategy)\
273
57
    MACRO(prompt_session_listener)\
56
    MACRO(prompt_session_listener)\
274
58
    MACRO(prompt_session_manager)\
57
    MACRO(prompt_session_manager)\
275
59
    MACRO(server_status_listener)\
58
    MACRO(server_status_listener)\
276
60
    MACRO(session_authorizer)\
59
    MACRO(session_authorizer)\
277
61
    MACRO(session_listener)\
60
    MACRO(session_listener)\
278
62
    MACRO(session_mediator_report)\
61
    MACRO(session_mediator_report)\
281
63
    MACRO(shell)\
62
    MACRO(shell)
280
64
    MACRO(surface_configurator)
282
65
63
283
66
#define FOREACH_ACCESSOR(MACRO)\
64
#define FOREACH_ACCESSOR(MACRO)\
284
67
    MACRO(the_compositor)\
65
    MACRO(the_compositor)\
285
@@ -82,7 +80,6 @@
286
82
    MACRO(the_prompt_session_manager)\
80
    MACRO(the_prompt_session_manager)\
287
83
    MACRO(the_shell)\
81
    MACRO(the_shell)\
288
84
    MACRO(the_shell_display_layout)\
82
    MACRO(the_shell_display_layout)\
289
85
    MACRO(the_surface_configurator)\
290
86
    MACRO(the_surface_coordinator)\
83
    MACRO(the_surface_coordinator)\
291
87
    MACRO(the_touch_visualizer)
84
    MACRO(the_touch_visualizer)
292
88
85
Status:	Merged
Approved by:	Daniel van Vugt on 2015-03-31
Approved revision:	no longer in the source branch.
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 (community)	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