1
=== modified file 'include/server/mir/server.h'
2
--- include/server/mir/server.h	2016-10-04 06:35:05 +0000
3
+++ include/server/mir/server.h	2016-11-28 14:45:32 +0000
4
@@ -56,7 +56,7 @@
5
56
namespace scene
56
namespace scene
6
57
{
57
{
7
58
class ApplicationNotRespondingDetector;
58
class ApplicationNotRespondingDetector;
9
59
class BufferStreamFactory; 
59
class BufferStreamFactory;
10
60
class PromptSessionListener;
60
class PromptSessionListener;
11
61
class PromptSessionManager;
61
class PromptSessionManager;
12
62
class SessionListener;
62
class SessionListener;
13
@@ -190,6 +190,11 @@
14
190
 *  These allow the user to insert logic into startup or error handling.
190
 *  These allow the user to insert logic into startup or error handling.
15
191
 *  For obvious reasons they should be called before run().
191
 *  For obvious reasons they should be called before run().
16
192
 *  @{ */
192
 *  @{ */
17
193
    /// Add a callback to be invoked when the settings have been applied, but before
18
194
    /// the server has been initialized. This allows client code to get access Mir objects.
19
195
    /// If multiple callbacks are added they will be invoked in the sequence added.
20
196
    void add_pre_init_callback(std::function<void()> const& pre_init_callback);
21
197
22
193
    /// Add a callback to be invoked when the server has been initialized,
198
    /// Add a callback to be invoked when the server has been initialized,
23
194
    /// but before it starts. This allows client code to get access Mir objects.
199
    /// but before it starts. This allows client code to get access Mir objects.
24
195
    /// If multiple callbacks are added they will be invoked in the sequence added.
200
    /// If multiple callbacks are added they will be invoked in the sequence added.
25
196
201
26
=== modified file 'src/server/server.cpp'
27
--- src/server/server.cpp	2016-11-02 05:07:18 +0000
28
+++ src/server/server.cpp	2016-11-28 14:45:32 +0000
29
@@ -148,6 +148,7 @@
30
148
    std::string config_file;
148
    std::string config_file;
31
149
    std::shared_ptr<ServerConfiguration> server_config;
149
    std::shared_ptr<ServerConfiguration> server_config;
32
150
150
33
151
    std::function<void()> pre_init_callback{[]{}};
34
151
    std::function<void()> init_callback{[]{}};
152
    std::function<void()> init_callback{[]{}};
35
152
    std::function<void()> stop_callback{[]{}};
153
    std::function<void()> stop_callback{[]{}};
36
153
    int argc{0};
154
    int argc{0};
37
@@ -287,6 +288,19 @@
38
287
    self->argv = argv;
288
    self->argv = argv;
39
288
}
289
}
40
289
290
41
291
void mir::Server::add_pre_init_callback(std::function<void()> const& pre_init_callback)
42
292
{
43
293
    auto const& existing = self->pre_init_callback;
44
294
45
295
    auto const updated = [=]
46
296
        {
47
297
            existing();
48
298
            pre_init_callback();
49
299
        };
50
300
51
301
    self->pre_init_callback = updated;
52
302
}
53
303
54
290
void mir::Server::add_init_callback(std::function<void()> const& init_callback)
304
void mir::Server::add_init_callback(std::function<void()> const& init_callback)
55
291
{
305
{
56
292
    auto const& existing = self->init_callback;
306
    auto const& existing = self->init_callback;
57
@@ -387,6 +401,8 @@
58
387
        if (self->emergency_cleanup_handler)
401
        if (self->emergency_cleanup_handler)
59
388
            emergency_cleanup->add(self->emergency_cleanup_handler);
402
            emergency_cleanup->add(self->emergency_cleanup_handler);
60
389
403
61
404
        self->pre_init_callback();
62
405
63
390
        run_mir(
406
        run_mir(
64
391
            *self->server_config,
407
            *self->server_config,
65
392
            [&](DisplayServer&)
408
            [&](DisplayServer&)
66
393
409
67
=== modified file 'src/server/symbols.map'
68
--- src/server/symbols.map	2016-11-15 23:48:01 +0000
69
+++ src/server/symbols.map	2016-11-28 14:45:32 +0000
70
@@ -8,7 +8,7 @@
71
8
    VTT?for?mir::shell::SystemCompositorWindowManager;
8
    VTT?for?mir::shell::SystemCompositorWindowManager;
72
9
9
73
10
# The following symbols come from running a script over the generated docs. Vis:
10
# The following symbols come from running a script over the generated docs. Vis:
75
11
# ../tools/process_doxygen_xml.py doc/xml/*.xml | grep "^mirserver public" | sed "s/mirserver public: /    /" | sort  
11
# ../tools/process_doxygen_xml.py doc/xml/*.xml | grep "^mirserver public" | sed "s/mirserver public: /    /" | sort
76
12
    mir::check_for_termination_exception*;
12
    mir::check_for_termination_exception*;
77
13
    mir::clear_termination_exception*;
13
    mir::clear_termination_exception*;
78
14
    mir::compositor::Compositor::Compositor*;
14
    mir::compositor::Compositor::Compositor*;
79
@@ -839,3 +839,10 @@
80
839
  };
839
  };
81
840
 local: *;
840
 local: *;
82
841
};
841
};
83
842
84
843
MIR_SERVER_0.26 {
85
844
 global:
86
845
  extern "C++" {
87
846
    mir::Server::add_pre_init_callback*;
88
847
  };
89
848
} MIR_SERVER_0.25;
Reviewer	Review Type	Date Requested	Status
Daniel van Vugt			Approve on 2016-11-29
Kevin DuBois (community)			Approve on 2016-11-28
Cemil Azizoglu (community)			Needs Fixing on 2016-11-28
Andreas Pokorny (community)		2016-11-28	Approve on 2016-11-28
Mir CI Bot	continuous-integration		Approve on 2016-11-28
Review via email: mp+311941@code.launchpad.net