1
=== modified file 'playground/demo-shell/CMakeLists.txt'
2
--- playground/demo-shell/CMakeLists.txt	2015-06-24 03:00:56 +0000
3
+++ playground/demo-shell/CMakeLists.txt	2016-04-29 10:12:03 +0000
4
@@ -2,7 +2,6 @@
5
2
  demo_compositor.cpp
2
  demo_compositor.cpp
6
3
  demo_renderer.cpp
3
  demo_renderer.cpp
7
4
  window_manager.cpp
4
  window_manager.cpp
8
5
  default_window_manager.cpp
9
6
)
5
)
10
7
6
11
8
add_subdirectory(typo)
7
add_subdirectory(typo)
12
9
8
13
=== removed file 'playground/demo-shell/default_window_manager.cpp'
14
--- playground/demo-shell/default_window_manager.cpp	2016-01-29 08:18:22 +0000
15
+++ playground/demo-shell/default_window_manager.cpp	1970-01-01 00:00:00 +0000
16
@@ -1,150 +0,0 @@
17
1
/*
18
2
 * Copyright © 2015 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: Alan Griffiths <alan@octopull.co.uk>
33
17
 */
34
18
35
19
#include "default_window_manager.h"
36
20
37
21
#include "mir/scene/session.h"
38
22
#include "mir/scene/session_coordinator.h"
39
23
#include "mir/scene/surface.h"
40
24
#include "mir/scene/surface_creation_parameters.h"
41
25
#include "mir/shell/display_layout.h"
42
26
#include "mir/shell/focus_controller.h"
43
27
#include "mir/shell/surface_ready_observer.h"
44
28
#include "mir/shell/surface_specification.h"
45
29
46
30
#include "mir_toolkit/client_types.h"
47
31
48
32
namespace mf = mir::frontend;
49
33
namespace ms = mir::scene;
50
34
namespace msh = mir::shell;
51
35
namespace me = mir::examples;
52
36
namespace geom = mir::geometry;
53
37
54
38
me::DefaultWindowManager::DefaultWindowManager(
55
39
    msh::FocusController* focus_controller,
56
40
    std::shared_ptr<shell::DisplayLayout> const& display_layout,
57
41
    std::shared_ptr<scene::SessionCoordinator> const& session_coordinator) :
58
42
    focus_controller{focus_controller},
59
43
    display_layout{display_layout},
60
44
    session_coordinator{session_coordinator}
61
45
{
62
46
}
63
47
64
48
void me::DefaultWindowManager::add_session(std::shared_ptr<scene::Session> const& session)
65
49
{
66
50
    focus_controller->set_focus_to(session, {});
67
51
}
68
52
69
53
void me::DefaultWindowManager::remove_session(std::shared_ptr<scene::Session> const& /*session*/)
70
54
{
71
55
    auto const next_session = session_coordinator->successor_of({});
72
56
    if (next_session)
73
57
        focus_controller->set_focus_to(next_session, next_session->default_surface());
74
58
    else
75
59
        focus_controller->set_focus_to(next_session, {});
76
60
}
77
61
78
62
auto me::DefaultWindowManager::add_surface(
79
63
    std::shared_ptr<scene::Session> const& session,
80
64
    scene::SurfaceCreationParameters const& request_parameters,
81
65
    std::function<frontend::SurfaceId(std::shared_ptr<scene::Session> const& session, scene::SurfaceCreationParameters const& params)> const& build)
82
66
-> frontend::SurfaceId
83
67
{
84
68
    mir::graphics::DisplayConfigurationOutputId const output_id_invalid{
85
69
        mir_display_output_id_invalid};
86
70
    auto placed_parameters = request_parameters;
87
71
88
72
    geom::Rectangle rect{request_parameters.top_left, request_parameters.size};
89
73
90
74
    if (request_parameters.output_id != output_id_invalid)
91
75
    {
92
76
        display_layout->place_in_output(request_parameters.output_id, rect);
93
77
    }
94
78
95
79
    placed_parameters.top_left = rect.top_left;
96
80
    placed_parameters.size = rect.size;
97
81
98
82
    auto const result = build(session, placed_parameters);
99
83
    auto const surface = session->surface(result);
100
84
101
85
    surface->add_observer(std::make_shared<msh::SurfaceReadyObserver>(
102
86
        [this](std::shared_ptr<scene::Session> const& session,
103
87
               std::shared_ptr<scene::Surface> const& surface)
104
88
            {
105
89
                focus_controller->set_focus_to(session, surface);
106
90
            },
107
91
        session,
108
92
        surface));
109
93
110
94
    return result;
111
95
}
112
96
113
97
void me::DefaultWindowManager::modify_surface(
114
98
    std::shared_ptr<scene::Session> const& /*session*/,
115
99
    std::shared_ptr<scene::Surface> const& surface,
116
100
    msh::SurfaceSpecification const& modifications)
117
101
{
118
102
    if (modifications.name.is_set())
119
103
        surface->rename(modifications.name.value());
120
104
}
121
105
122
106
void me::DefaultWindowManager::remove_surface(
123
107
    std::shared_ptr<scene::Session> const& session,
124
108
    std::weak_ptr<scene::Surface> const& surface)
125
109
{
126
110
    session->destroy_surface(surface);
127
111
}
128
112
129
113
void me::DefaultWindowManager::add_display(geometry::Rectangle const& /*area*/)
130
114
{
131
115
}
132
116
133
117
void me::DefaultWindowManager::remove_display(geometry::Rectangle const& /*area*/)
134
118
{
135
119
}
136
120
137
121
void me::DefaultWindowManager::handle_raise_surface(
138
122
    std::shared_ptr<scene::Session> const& /*session*/,
139
123
    std::shared_ptr<scene::Surface> const& /*surface*/,
140
124
    uint64_t /*timestamp*/)
141
125
{
142
126
}
143
127
144
128
bool me::DefaultWindowManager::handle_keyboard_event(MirKeyboardEvent const* /*event*/)
145
129
{
146
130
    return false;
147
131
}
148
132
149
133
bool me::DefaultWindowManager::handle_touch_event(MirTouchEvent const* /*event*/)
150
134
{
151
135
    return false;
152
136
}
153
137
154
138
bool me::DefaultWindowManager::handle_pointer_event(MirPointerEvent const* /*event*/)
155
139
{
156
140
    return false;
157
141
}
158
142
159
143
int me::DefaultWindowManager::set_surface_attribute(
160
144
    std::shared_ptr<scene::Session> const& /*session*/,
161
145
    std::shared_ptr<scene::Surface> const& surface,
162
146
    MirSurfaceAttrib attrib,
163
147
    int value)
164
148
{
165
149
    return surface->configure(attrib, value);
166
150
}
167
151
0
168
=== removed file 'playground/demo-shell/default_window_manager.h'
169
--- playground/demo-shell/default_window_manager.h	2016-01-29 08:18:22 +0000
170
+++ playground/demo-shell/default_window_manager.h	1970-01-01 00:00:00 +0000
171
@@ -1,86 +0,0 @@
172
1
/*
173
2
 * Copyright © 2015 Canonical Ltd.
174
3
 *
175
4
 * This program is free software: you can redistribute it and/or modify it
176
5
 * under the terms of the GNU General Public License version 3,
177
6
 * as published by the Free Software Foundation.
178
7
 *
179
8
 * This program is distributed in the hope that it will be useful,
180
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
181
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
182
11
 * GNU General Public License for more details.
183
12
 *
184
13
 * You should have received a copy of the GNU General Public License
185
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
186
15
 *
187
16
 * Authored By: Alan Griffiths <alan@octopull.co.uk>
188
17
 */
189
18
190
19
#ifndef MIR_EXAMPLES_DEFAULT_WINDOW_MANAGER_H_
191
20
#define MIR_EXAMPLES_DEFAULT_WINDOW_MANAGER_H_
192
21
193
22
#include "mir/shell/window_manager.h"
194
23
195
24
namespace mir
196
25
{
197
26
namespace scene { class SessionCoordinator; }
198
27
199
28
namespace shell { class FocusController; class DisplayLayout; }
200
29
201
30
namespace examples
202
31
{
203
32
class DefaultWindowManager : public shell::WindowManager
204
33
{
205
34
public:
206
35
    explicit DefaultWindowManager(shell::FocusController* focus_controller,
207
36
        std::shared_ptr<shell::DisplayLayout> const& display_layout,
208
37
        std::shared_ptr<scene::SessionCoordinator> const& session_coordinator);
209
38
210
39
    void add_session(std::shared_ptr<scene::Session> const& session) override;
211
40
212
41
    void remove_session(std::shared_ptr<scene::Session> const& session) override;
213
42
214
43
    frontend::SurfaceId add_surface(
215
44
        std::shared_ptr<scene::Session> const& session,
216
45
        scene::SurfaceCreationParameters const& params,
217
46
        std::function<frontend::SurfaceId(std::shared_ptr<scene::Session> const& session, scene::SurfaceCreationParameters const& params)> const& build) override;
218
47
219
48
    void modify_surface(
220
49
        std::shared_ptr<scene::Session> const& session,
221
50
        std::shared_ptr<scene::Surface> const& surface,
222
51
        shell::SurfaceSpecification const& modifications) override;
223
52
224
53
    void remove_surface(
225
54
        std::shared_ptr<scene::Session> const& session,
226
55
        std::weak_ptr<scene::Surface> const& surface) override;
227
56
228
57
    void add_display(geometry::Rectangle const& area) override;
229
58
230
59
    void remove_display(geometry::Rectangle const& area) override;
231
60
232
61
    bool handle_keyboard_event(MirKeyboardEvent const* event) override;
233
62
234
63
    bool handle_touch_event(MirTouchEvent const* event) override;
235
64
236
65
    bool handle_pointer_event(MirPointerEvent const* event) override;
237
66
238
67
    void handle_raise_surface(
239
68
        std::shared_ptr<scene::Session> const& session,
240
69
        std::shared_ptr<scene::Surface> const& surface,
241
70
        uint64_t timestamp) override;
242
71
243
72
    int set_surface_attribute(
244
73
        std::shared_ptr<scene::Session> const& session,
245
74
        std::shared_ptr<scene::Surface> const& surface,
246
75
        MirSurfaceAttrib attrib,
247
76
        int value) override;
248
77
249
78
private:
250
79
    shell::FocusController* const focus_controller;
251
80
    std::shared_ptr<shell::DisplayLayout> const display_layout;
252
81
    std::shared_ptr<scene::SessionCoordinator> const session_coordinator;
253
82
};
254
83
}
255
84
}
256
85
257
86
#endif /* MIR_SHELL_DEFAULT_WINDOW_MANAGER_H_ */
258
87
0
259
=== modified file 'playground/demo-shell/demo_shell.cpp'
260
--- playground/demo-shell/demo_shell.cpp	2016-01-29 08:18:22 +0000
261
+++ playground/demo-shell/demo_shell.cpp	2016-04-29 10:12:03 +0000
262
@@ -29,9 +29,6 @@
263
29
#include "mir/compositor/display_buffer_compositor_factory.h"
29
#include "mir/compositor/display_buffer_compositor_factory.h"
264
30
#include "mir/compositor/renderer_factory.h"
30
#include "mir/compositor/renderer_factory.h"
265
31
#include "mir/options/option.h"
31
#include "mir/options/option.h"
266
32
#include "default_window_manager.h"
267
33
#include "server_example_tiling_window_manager.h"
268
34
#include "mir/shell/canonical_window_manager.h"
269
35
#include "server_example_host_lifecycle_event_listener.h"
32
#include "server_example_host_lifecycle_event_listener.h"
270
36
33
271
37
#include <iostream>
34
#include <iostream>
272
@@ -71,13 +68,7 @@
273
71
class DemoServerConfiguration : public mir::examples::ServerConfiguration
68
class DemoServerConfiguration : public mir::examples::ServerConfiguration
274
72
{
69
{
275
73
public:
70
public:
283
74
    DemoServerConfiguration(int argc, char const* argv[],
71
    using mir::examples::ServerConfiguration::ServerConfiguration;
277
75
                            std::initializer_list<std::shared_ptr<mi::EventFilter>> const& filter_list)
278
76
      : ServerConfiguration(argc, argv),
279
77
        filter_list(filter_list)
280
78
    {
281
79
    }
282
80
284
81
72
285
82
    std::shared_ptr<compositor::DisplayBufferCompositorFactory> the_display_buffer_compositor_factory() override
73
    std::shared_ptr<compositor::DisplayBufferCompositorFactory> the_display_buffer_compositor_factory() override
286
83
    {
74
    {
287
@@ -89,45 +80,6 @@
288
89
            });
80
            });
289
90
    }
81
    }
290
91
82
291
92
    std::shared_ptr<mi::CompositeEventFilter> the_composite_event_filter() override
292
93
    {
293
94
        return composite_event_filter(
294
95
            [this]() -> std::shared_ptr<mi::CompositeEventFilter>
295
96
            {
296
97
                auto composite_filter = ServerConfiguration::the_composite_event_filter();
297
98
                for (auto const& filter : filter_list)
298
99
                    composite_filter->append(filter);
299
100
300
101
                return composite_filter;
301
102
            });
302
103
    }
303
104
304
105
    auto the_window_manager_builder() -> shell::WindowManagerBuilder override
305
106
    {
306
107
        return [this](shell::FocusController* focus_controller)
307
108
            -> std::shared_ptr<msh::WindowManager>
308
109
            {
309
110
                auto const options = the_options();
310
111
                auto const selection = options->get<std::string>(wm_option);
311
112
312
113
                if (selection == wm_tiling)
313
114
                {
314
115
                    return std::make_shared<TilingWindowManager>(focus_controller);
315
116
                }
316
117
                else if (selection == wm_canonical)
317
118
                {
318
119
                    return std::make_shared<msh::CanonicalWindowManager>(
319
120
                        focus_controller,
320
121
                        the_shell_display_layout());
321
122
                }
322
123
323
124
                return std::make_shared<DefaultWindowManager>(
324
125
                    focus_controller,
325
126
                    the_shell_display_layout(),
326
127
                    the_session_coordinator());
327
128
            };
328
129
    }
329
130
330
131
    std::shared_ptr<msh::HostLifecycleEventListener> the_host_lifecycle_event_listener() override
83
    std::shared_ptr<msh::HostLifecycleEventListener> the_host_lifecycle_event_listener() override
331
132
    {
84
    {
332
133
       return host_lifecycle_event_listener(
85
       return host_lifecycle_event_listener(
333
@@ -136,9 +88,6 @@
334
136
               return std::make_shared<HostLifecycleEventListener>(the_logger());
88
               return std::make_shared<HostLifecycleEventListener>(the_logger());
335
137
           });
89
           });
336
138
    }
90
    }
337
139
338
140
private:
339
141
    std::vector<std::shared_ptr<mi::EventFilter>> const filter_list;
340
142
};
91
};
341
143
92
342
144
}
93
}
343
@@ -147,8 +96,9 @@
344
147
int main(int argc, char const* argv[])
96
int main(int argc, char const* argv[])
345
148
try
97
try
346
149
{
98
{
347
99
    me::DemoServerConfiguration config(argc, argv);
348
100
349
150
    auto wm = std::make_shared<me::WindowManager>();
101
    auto wm = std::make_shared<me::WindowManager>();
350
151
    me::DemoServerConfiguration config(argc, argv, {wm});
351
152
102
352
153
    mir::run_mir(config, [&config, &wm](mir::DisplayServer&)
103
    mir::run_mir(config, [&config, &wm](mir::DisplayServer&)
353
154
        {
104
        {
354
@@ -158,6 +108,8 @@
355
158
            wm->set_display(config.the_display());
108
            wm->set_display(config.the_display());
356
159
            wm->set_compositor(config.the_compositor());
109
            wm->set_compositor(config.the_compositor());
357
160
            wm->set_input_scene(config.the_input_scene());
110
            wm->set_input_scene(config.the_input_scene());
358
111
359
112
            config.the_composite_event_filter()->prepend(wm);
360
161
        });
113
        });
361
162
    return 0;
114
    return 0;
362
163
}
115
}
363
164
116
364
=== modified file 'playground/server_configuration.cpp'
365
--- playground/server_configuration.cpp	2015-06-25 13:43:43 +0000
366
+++ playground/server_configuration.cpp	2016-04-29 10:12:03 +0000
367
@@ -28,12 +28,6 @@
368
28
namespace me = mir::examples;
28
namespace me = mir::examples;
369
29
namespace mg = mir::graphics;
29
namespace mg = mir::graphics;
370
30
30
371
31
char const* const me::wm_option = "window-manager";
372
32
char const* const me::wm_description = "window management strategy [{legacy|canonical|tiling}]";
373
33
char const* const me::wm_tiling = "tiling";
374
34
char const* const me::wm_legacy = "legacy";
375
35
char const* const me::wm_canonical = "canonical";
376
36
377
37
me::ServerConfiguration::ServerConfiguration(std::shared_ptr<options::DefaultConfiguration> const& configuration_options) :
31
me::ServerConfiguration::ServerConfiguration(std::shared_ptr<options::DefaultConfiguration> const& configuration_options) :
378
38
    DefaultServerConfiguration(configuration_options)
32
    DefaultServerConfiguration(configuration_options)
379
39
{
33
{
380
@@ -42,8 +36,6 @@
381
42
    configuration_options->add_options()
36
    configuration_options->add_options()
382
43
        (me::display_config_opt, po::value<std::string>()->default_value(me::clone_opt_val),
37
        (me::display_config_opt, po::value<std::string>()->default_value(me::clone_opt_val),
383
44
            me::display_config_descr);
38
            me::display_config_descr);
384
45
    configuration_options->add_options()
385
46
        (wm_option, po::value<std::string>()->default_value(wm_legacy), wm_description);
386
47
}
39
}
387
48
40
388
49
me::ServerConfiguration::ServerConfiguration(int argc, char const** argv) :
41
me::ServerConfiguration::ServerConfiguration(int argc, char const** argv) :
389
50
42
390
=== modified file 'playground/server_configuration.h'
391
--- playground/server_configuration.h	2015-06-17 05:20:42 +0000
392
+++ playground/server_configuration.h	2016-04-29 10:12:03 +0000
393
@@ -43,12 +43,6 @@
394
43
private:
43
private:
395
44
    std::shared_ptr<input::EventFilter> quit_filter;
44
    std::shared_ptr<input::EventFilter> quit_filter;
396
45
};
45
};
397
46
398
47
extern char const* const wm_option;
399
48
extern char const* const wm_description;
400
49
extern char const* const wm_tiling;
401
50
extern char const* const wm_legacy;
402
51
extern char const* const wm_canonical;
403
52
}
46
}
404
53
}
47
}
405
54
48
Status:	Merged
Approved by:	Daniel van Vugt on 2016-05-02
Approved revision:	no longer in the source branch.
Merged at revision:	3489
Proposed branch:	lp:~alan-griffiths/mir/remove-DefaultWindowManager
Merge into:	lp:mir
Diff against target:	404 lines (+5/-304) 6 files modified playground/demo-shell/CMakeLists.txt (+0/-1) playground/demo-shell/default_window_manager.cpp (+0/-150) playground/demo-shell/default_window_manager.h (+0/-86) playground/demo-shell/demo_shell.cpp (+5/-53) playground/server_configuration.cpp (+0/-8) playground/server_configuration.h (+0/-6)
To merge this branch:	bzr merge lp:~alan-griffiths/mir/remove-DefaultWindowManager
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration		Approve on 2016-05-02
Daniel van Vugt			Approve on 2016-05-02
Kevin DuBois (community)			Approve on 2016-04-25
Cemil Azizoglu (community)		2016-04-25	Approve on 2016-04-25
Review via email: mp+292779@code.launchpad.net