1
=== modified file 'include/client/mir_toolkit/mir_connection.h'
2
--- include/client/mir_toolkit/mir_connection.h	2016-10-12 06:03:15 +0000
3
+++ include/client/mir_toolkit/mir_connection.h	2016-12-23 15:34:22 +0000
4
@@ -202,6 +202,30 @@
5
202
MirWaitHandle* mir_connection_apply_display_config(MirConnection *connection, MirDisplayConfiguration* display_configuration);
202
MirWaitHandle* mir_connection_apply_display_config(MirConnection *connection, MirDisplayConfiguration* display_configuration);
6
203
203
7
204
/**
204
/**
8
205
 * Apply the display configuration for the connection
9
206
 *
10
207
 * The display configuration is applied to this connection only (per-connection
11
208
 * configuration) and is invalidated when a hardware change occurs. Clients should
12
209
 * register a callback with mir_connection_set_display_config_change_callback()
13
210
 * to get notified about hardware changes, so that they can apply a new configuration.
14
211
 *
15
212
 *   \param [in] connection             The connection
16
213
 *   \param [in] display_config         The display_config to apply
17
214
 */
18
215
void mir_connection_apply_session_display_configuration(MirConnection* connection, MirDisplayConfig const* display_config);
19
216
20
217
/**
21
218
 * Remove the display configuration for the connection
22
219
 *
23
220
 * If a session display configuration is applied to the connection it is removed, and
24
221
 * the base display configuration is used. If there was no previous call to
25
222
 * mir_connection_apply_session_display_config this will do nothing.
26
223
 *
27
224
 *   \param [in] connection             The connection
28
225
 */
29
226
void mir_connection_remove_session_display_configuration(MirConnection* connection);
30
227
31
228
/**
32
205
 * Set the base display configuration
229
 * Set the base display configuration
33
206
 *
230
 *
34
207
 * The base display configuration is the configuration the server applies when
231
 * The base display configuration is the configuration the server applies when
35
208
232
36
=== modified file 'include/server/mir/graphics/display_configuration_observer.h'
37
--- include/server/mir/graphics/display_configuration_observer.h	2016-12-09 02:54:31 +0000
38
+++ include/server/mir/graphics/display_configuration_observer.h	2016-12-23 15:34:22 +0000
39
@@ -24,6 +24,10 @@
40
24
24
41
25
namespace mir
25
namespace mir
42
26
{
26
{
43
27
namespace frontend
44
28
{
45
29
class Session;
46
30
}
47
27
namespace graphics
31
namespace graphics
48
28
{
32
{
49
29
class DisplayConfiguration;
33
class DisplayConfiguration;
50
@@ -58,6 +62,21 @@
51
58
    virtual void base_configuration_updated(std::shared_ptr<DisplayConfiguration const> const& base_config) = 0;
62
    virtual void base_configuration_updated(std::shared_ptr<DisplayConfiguration const> const& base_config) = 0;
52
59
63
53
60
    /**
64
    /**
54
65
     * Notification after updating the session display configuration.
55
66
     *
56
67
     * \param [in] session  The session that is updating its display configuration.
57
68
     * \param [in] config   The configuration that is being applied to the session.
58
69
     */
59
70
    virtual void session_configuration_applied(std::shared_ptr<frontend::Session> const& session,
60
71
        std::shared_ptr<DisplayConfiguration> const& config) = 0;
61
72
    /**
62
73
     * Notification after removing the session display configuration.
63
74
     *
64
75
     * \param [in] session  The session that is removing its display configuration.
65
76
     */
66
77
    virtual void session_configuration_removed(std::shared_ptr<frontend::Session> const& session) = 0;
67
78
68
79
    /**
69
61
     * Notification after every failed display configuration attempt.
80
     * Notification after every failed display configuration attempt.
70
62
     *
81
     *
71
63
     * This is called if the graphics platform throws an exception when trying
82
     * This is called if the graphics platform throws an exception when trying
72
64
83
73
=== modified file 'include/test/mir/test/display_config_matchers.h'
74
--- include/test/mir/test/display_config_matchers.h	2016-11-02 05:07:18 +0000
75
+++ include/test/mir/test/display_config_matchers.h	2016-12-23 15:34:22 +0000
76
@@ -111,6 +111,11 @@
77
111
    MirDisplayConfig const* config1,
111
    MirDisplayConfig const* config1,
78
112
    MirDisplayConfig const* config2);
112
    MirDisplayConfig const* config2);
79
113
113
80
114
bool compare_display_configurations(
81
115
    testing::MatchResultListener* listener,
82
116
    std::shared_ptr<graphics::DisplayConfiguration> const& config1,
83
117
    MirDisplayConfig const* config2);
84
118
85
114
MATCHER_P(DisplayConfigMatches, config, "")
119
MATCHER_P(DisplayConfigMatches, config, "")
86
115
{
120
{
87
116
    return compare_display_configurations(result_listener, arg, config);
121
    return compare_display_configurations(result_listener, arg, config);
88
117
122
89
=== modified file 'include/test/mir/test/signal.h'
90
--- include/test/mir/test/signal.h	2016-07-18 07:38:38 +0000
91
+++ include/test/mir/test/signal.h	2016-12-23 15:34:22 +0000
92
@@ -69,6 +69,13 @@
93
69
{
69
{
94
70
    signal->raise();
70
    signal->raise();
95
71
}
71
}
96
72
ACTION_P2(WakeUpWhenZero, signal, atomic_int)
97
73
{
98
74
    if (atomic_int->fetch_sub(1) == 1)
99
75
    {
100
76
        signal->raise();
101
77
    }
102
78
}
103
72
79
104
73
}
80
}
105
74
}
81
}
106
75
82
107
=== modified file 'src/client/mir_connection.cpp'
108
--- src/client/mir_connection.cpp	2016-12-14 19:53:10 +0000
109
+++ src/client/mir_connection.cpp	2016-12-23 15:34:22 +0000
110
@@ -1054,13 +1054,15 @@
111
1054
1054
112
1055
namespace
1055
namespace
113
1056
{
1056
{
115
1057
struct HandleErrorVoid
1057
template <class T>
116
1058
struct HandleError
117
1058
{
1059
{
120
1059
    std::unique_ptr<mp::Void> result;
1060
    std::unique_ptr<T> result;
121
1060
    std::function<void(mp::Void const&)> on_error;
1061
    std::function<void(T const&)> on_error;
122
1061
};
1062
};
123
1062
1063
125
1063
void handle_structured_error(HandleErrorVoid* handler)
1064
template <class T>
126
1065
void handle_structured_error(HandleError<T>* handler)
127
1064
{
1066
{
128
1065
    if (handler->result->has_structured_error())
1067
    if (handler->result->has_structured_error())
129
1066
    {
1068
    {
130
@@ -1068,6 +1070,22 @@
131
1068
    }
1070
    }
132
1069
    delete handler;
1071
    delete handler;
133
1070
}
1072
}
134
1073
135
1074
template <class T>
136
1075
HandleError<T>* create_stored_error_result(std::shared_ptr<mcl::ErrorHandler> const& error_handler)
137
1076
{
138
1077
    auto store_error_result = new HandleError<T>;
139
1078
    store_error_result->result = std::make_unique<T>();
140
1079
    store_error_result->on_error = [error_handler](T const& message)
141
1080
    {
142
1081
        MirError const error{
143
1082
            static_cast<MirErrorDomain>(message.structured_error().domain()),
144
1083
            message.structured_error().code()};
145
1084
        (*error_handler)(&error);
146
1085
    };
147
1086
148
1087
    return store_error_result;
149
1088
}
150
1071
}
1089
}
151
1072
1090
152
1073
void MirConnection::preview_base_display_configuration(
1091
void MirConnection::preview_base_display_configuration(
153
@@ -1079,15 +1097,7 @@
154
1079
    request.mutable_configuration()->CopyFrom(configuration);
1097
    request.mutable_configuration()->CopyFrom(configuration);
155
1080
    request.set_timeout(timeout.count());
1098
    request.set_timeout(timeout.count());
156
1081
1099
166
1082
    auto store_error_result = new HandleErrorVoid;
1100
    auto store_error_result = create_stored_error_result<mp::Void>(error_handler);
158
1083
    store_error_result->result = std::make_unique<mp::Void>();
159
1084
    store_error_result->on_error = [this](mp::Void const& message)
160
1085
    {
161
1086
        MirError const error{
162
1087
            static_cast<MirErrorDomain>(message.structured_error().domain()),
163
1088
            message.structured_error().code()};
164
1089
        (*error_handler)(&error);
165
1090
    };
167
1091
1101
168
1092
    server.preview_base_display_configuration(
1102
    server.preview_base_display_configuration(
169
1093
        &request,
1103
        &request,
170
@@ -1099,15 +1109,7 @@
171
1099
{
1109
{
172
1100
    mp::Void request;
1110
    mp::Void request;
173
1101
1111
183
1102
    auto store_error_result = new HandleErrorVoid;
1112
    auto store_error_result = create_stored_error_result<mp::Void>(error_handler);
175
1103
    store_error_result->result = std::make_unique<mp::Void>();
176
1104
    store_error_result->on_error = [this](mp::Void const& message)
177
1105
    {
178
1106
        MirError const error{
179
1107
            static_cast<MirErrorDomain>(message.structured_error().domain()),
180
1108
            message.structured_error().code()};
181
1109
        (*error_handler)(&error);
182
1110
    };
184
1111
1113
185
1112
    server.cancel_base_display_configuration_preview(
1114
    server.cancel_base_display_configuration_preview(
186
1113
        &request,
1115
        &request,
187
@@ -1115,6 +1117,27 @@
188
1115
        google::protobuf::NewCallback(&handle_structured_error, store_error_result));
1117
        google::protobuf::NewCallback(&handle_structured_error, store_error_result));
189
1116
}
1118
}
190
1117
1119
191
1120
void MirConnection::configure_session_display(mp::DisplayConfiguration const& configuration)
192
1121
{
193
1122
    auto store_error_result = create_stored_error_result<mp::DisplayConfiguration>(error_handler);
194
1123
195
1124
    server.configure_display(
196
1125
        &configuration,
197
1126
        store_error_result->result.get(),
198
1127
        google::protobuf::NewCallback(&handle_structured_error, store_error_result));
199
1128
}
200
1129
201
1130
void MirConnection::remove_session_display()
202
1131
{
203
1132
    mp::Void request;
204
1133
    auto store_error_result = create_stored_error_result<mp::Void>(error_handler);
205
1134
206
1135
    server.remove_session_configuration(
207
1136
        &request,
208
1137
        store_error_result->result.get(),
209
1138
        google::protobuf::NewCallback(&handle_structured_error, store_error_result));
210
1139
}
211
1140
212
1118
void MirConnection::confirm_base_display_configuration(
1141
void MirConnection::confirm_base_display_configuration(
213
1119
    mp::DisplayConfiguration const& configuration)
1142
    mp::DisplayConfiguration const& configuration)
214
1120
{
1143
{
215
1121
1144
216
=== modified file 'src/client/mir_connection.h'
217
--- src/client/mir_connection.h	2016-12-14 19:53:10 +0000
218
+++ src/client/mir_connection.h	2016-12-23 15:34:22 +0000
219
@@ -187,6 +187,9 @@
220
187
    MirWaitHandle* configure_display(MirDisplayConfiguration* configuration);
187
    MirWaitHandle* configure_display(MirDisplayConfiguration* configuration);
221
188
    void done_display_configure();
188
    void done_display_configure();
222
189
189
223
190
    void configure_session_display(mir::protobuf::DisplayConfiguration const& configuration);
224
191
    void remove_session_display();
225
192
226
190
    MirWaitHandle* set_base_display_configuration(MirDisplayConfiguration const* configuration);
193
    MirWaitHandle* set_base_display_configuration(MirDisplayConfiguration const* configuration);
227
191
    void preview_base_display_configuration(
194
    void preview_base_display_configuration(
228
192
        mir::protobuf::DisplayConfiguration const& configuration,
195
        mir::protobuf::DisplayConfiguration const& configuration,
229
193
196
230
=== modified file 'src/client/mir_connection_api.cpp'
231
--- src/client/mir_connection_api.cpp	2016-12-13 06:00:32 +0000
232
+++ src/client/mir_connection_api.cpp	2016-12-23 15:34:22 +0000
233
@@ -427,3 +427,22 @@
234
427
    }
427
    }
235
428
}
428
}
236
429
429
237
430
void mir_connection_apply_session_display_configuration(MirConnection* connection, MirDisplayConfig const* display_config)
238
431
try
239
432
{
240
433
    connection->configure_session_display(*display_config);
241
434
}
242
435
catch (std::exception const& ex)
243
436
{
244
437
    MIR_LOG_UNCAUGHT_EXCEPTION(ex);
245
438
}
246
439
247
440
void mir_connection_remove_session_display_configuration(MirConnection* connection)
248
441
try
249
442
{
250
443
    connection->remove_session_display();
251
444
}
252
445
catch (std::exception const& ex)
253
446
{
254
447
    MIR_LOG_UNCAUGHT_EXCEPTION(ex);
255
448
}
256
430
449
257
=== modified file 'src/client/rpc/mir_display_server.cpp'
258
--- src/client/rpc/mir_display_server.cpp	2016-11-28 16:58:23 +0000
259
+++ src/client/rpc/mir_display_server.cpp	2016-12-23 15:34:22 +0000
260
@@ -84,6 +84,13 @@
261
84
{
84
{
262
85
    channel->call_method(std::string(__func__), request, response, done);
85
    channel->call_method(std::string(__func__), request, response, done);
263
86
}
86
}
264
87
void mclr::DisplayServer::remove_session_configuration(
265
88
    mir::protobuf::Void const* request,
266
89
    mir::protobuf::Void* response,
267
90
    google::protobuf::Closure* done)
268
91
{
269
92
    channel->call_method(std::string(__func__), request, response, done);
270
93
}
271
87
void mclr::DisplayServer::set_base_display_configuration(
94
void mclr::DisplayServer::set_base_display_configuration(
272
88
    mir::protobuf::DisplayConfiguration const* request,
95
    mir::protobuf::DisplayConfiguration const* request,
273
89
    mir::protobuf::Void* response,
96
    mir::protobuf::Void* response,
274
90
97
275
=== modified file 'src/client/rpc/mir_display_server.h'
276
--- src/client/rpc/mir_display_server.h	2016-11-28 16:58:23 +0000
277
+++ src/client/rpc/mir_display_server.h	2016-12-23 15:34:22 +0000
278
@@ -67,6 +67,10 @@
279
67
        mir::protobuf::DisplayConfiguration const* request,
67
        mir::protobuf::DisplayConfiguration const* request,
280
68
        mir::protobuf::DisplayConfiguration* response,
68
        mir::protobuf::DisplayConfiguration* response,
281
69
        google::protobuf::Closure* done) override;
69
        google::protobuf::Closure* done) override;
282
70
    void remove_session_configuration(
283
71
        mir::protobuf::Void const* request,
284
72
        mir::protobuf::Void* response,
285
73
        google::protobuf::Closure* done) override;
286
70
    void set_base_display_configuration(
74
    void set_base_display_configuration(
287
71
        mir::protobuf::DisplayConfiguration const* request,
75
        mir::protobuf::DisplayConfiguration const* request,
288
72
        mir::protobuf::Void* response,
76
        mir::protobuf::Void* response,
289
73
77
290
=== modified file 'src/client/symbols.map'
291
--- src/client/symbols.map	2016-12-23 04:18:57 +0000
292
+++ src/client/symbols.map	2016-12-23 15:34:22 +0000
293
@@ -500,6 +500,8 @@
294
500
    mir_touchpad_configuration_set_tap_to_click;
500
    mir_touchpad_configuration_set_tap_to_click;
295
501
    mir_connection_request_extension;
501
    mir_connection_request_extension;
296
502
    mir_output_get_model;
502
    mir_output_get_model;
297
503
    mir_connection_apply_session_display_configuration;
298
504
    mir_connection_remove_session_display_configuration;
299
503
    mir_blob_from_display_config;
505
    mir_blob_from_display_config;
300
504
    mir_blob_to_display_config;
506
    mir_blob_to_display_config;
301
505
} MIR_CLIENT_0.25;
507
} MIR_CLIENT_0.25;
302
506
508
303
=== modified file 'src/include/common/mir/protobuf/display_server.h'
304
--- src/include/common/mir/protobuf/display_server.h	2016-11-28 16:58:23 +0000
305
+++ src/include/common/mir/protobuf/display_server.h	2016-12-23 15:34:22 +0000
306
@@ -63,6 +63,10 @@
307
63
        mir::protobuf::DisplayConfiguration const* request,
63
        mir::protobuf::DisplayConfiguration const* request,
308
64
        mir::protobuf::DisplayConfiguration* response,
64
        mir::protobuf::DisplayConfiguration* response,
309
65
        google::protobuf::Closure* done) = 0;
65
        google::protobuf::Closure* done) = 0;
310
66
    virtual void remove_session_configuration(
311
67
        mir::protobuf::Void const* request,
312
68
        mir::protobuf::Void* response,
313
69
        google::protobuf::Closure* done) = 0;
314
66
    virtual void set_base_display_configuration(
70
    virtual void set_base_display_configuration(
315
67
        mir::protobuf::DisplayConfiguration const* request,
71
        mir::protobuf::DisplayConfiguration const* request,
316
68
        mir::protobuf::Void* response,
72
        mir::protobuf::Void* response,
317
69
73
318
=== modified file 'src/include/server/mir/frontend/display_changer.h'
319
--- src/include/server/mir/frontend/display_changer.h	2016-10-12 06:03:15 +0000
320
+++ src/include/server/mir/frontend/display_changer.h	2016-12-23 15:34:22 +0000
321
@@ -39,6 +39,7 @@
322
39
39
323
40
    virtual std::shared_ptr<graphics::DisplayConfiguration> base_configuration() = 0;
40
    virtual std::shared_ptr<graphics::DisplayConfiguration> base_configuration() = 0;
324
41
    virtual void configure(std::shared_ptr<Session> const&, std::shared_ptr<graphics::DisplayConfiguration> const&) = 0;
41
    virtual void configure(std::shared_ptr<Session> const&, std::shared_ptr<graphics::DisplayConfiguration> const&) = 0;
325
42
    virtual void remove_session_configuration(std::shared_ptr<Session> const&) = 0;
326
42
    virtual void set_base_configuration(std::shared_ptr<graphics::DisplayConfiguration> const&) = 0;
43
    virtual void set_base_configuration(std::shared_ptr<graphics::DisplayConfiguration> const&) = 0;
327
43
    virtual void preview_base_configuration(
44
    virtual void preview_base_configuration(
328
44
        std::weak_ptr<Session> const& session,
45
        std::weak_ptr<Session> const& session,
329
45
46
330
=== modified file 'src/server/frontend/authorizing_display_changer.cpp'
331
--- src/server/frontend/authorizing_display_changer.cpp	2016-10-12 06:03:15 +0000
332
+++ src/server/frontend/authorizing_display_changer.cpp	2016-12-23 15:34:22 +0000
333
@@ -69,6 +69,15 @@
334
69
        BOOST_THROW_EXCEPTION(std::runtime_error("not authorized to apply display configurations"));
69
        BOOST_THROW_EXCEPTION(std::runtime_error("not authorized to apply display configurations"));
335
70
}
70
}
336
71
71
337
72
void mf::AuthorizingDisplayChanger::remove_session_configuration(
338
73
    std::shared_ptr<mf::Session> const& session)
339
74
{
340
75
    if (configure_display_is_allowed)
341
76
        changer->remove_session_configuration(session);
342
77
    else
343
78
        BOOST_THROW_EXCEPTION(std::runtime_error("not authorized to remove display configurations"));
344
79
}
345
80
346
72
void mf::AuthorizingDisplayChanger::set_base_configuration(
81
void mf::AuthorizingDisplayChanger::set_base_configuration(
347
73
    std::shared_ptr<graphics::DisplayConfiguration> const& config)
82
    std::shared_ptr<graphics::DisplayConfiguration> const& config)
348
74
{
83
{
349
75
84
350
=== modified file 'src/server/frontend/authorizing_display_changer.h'
351
--- src/server/frontend/authorizing_display_changer.h	2016-10-12 06:03:15 +0000
352
+++ src/server/frontend/authorizing_display_changer.h	2016-12-23 15:34:22 +0000
353
@@ -49,6 +49,8 @@
354
49
    void configure(
49
    void configure(
355
50
        std::shared_ptr<frontend::Session> const&,
50
        std::shared_ptr<frontend::Session> const&,
356
51
        std::shared_ptr<graphics::DisplayConfiguration> const&) override;
51
        std::shared_ptr<graphics::DisplayConfiguration> const&) override;
357
52
    void remove_session_configuration(
358
53
        std::shared_ptr<frontend::Session> const&) override;
359
52
    void set_base_configuration(
54
    void set_base_configuration(
360
53
        std::shared_ptr<graphics::DisplayConfiguration> const&) override;
55
        std::shared_ptr<graphics::DisplayConfiguration> const&) override;
361
54
    void preview_base_configuration(
56
    void preview_base_configuration(
362
55
57
363
=== modified file 'src/server/frontend/protobuf_message_processor.cpp'
364
--- src/server/frontend/protobuf_message_processor.cpp	2016-11-28 16:58:23 +0000
365
+++ src/server/frontend/protobuf_message_processor.cpp	2016-12-23 15:34:22 +0000
366
@@ -249,6 +249,10 @@
367
249
        {
249
        {
368
250
            invoke(this, display_server.get(), &DisplayServer::configure_display, invocation);
250
            invoke(this, display_server.get(), &DisplayServer::configure_display, invocation);
369
251
        }
251
        }
370
252
        else if ("remove_session_configuration" == invocation.method_name())
371
253
        {
372
254
            invoke(this, display_server.get(), &DisplayServer::remove_session_configuration, invocation);
373
255
        }
374
252
        else if ("set_base_display_configuration" == invocation.method_name())
256
        else if ("set_base_display_configuration" == invocation.method_name())
375
253
        {
257
        {
376
254
            invoke(this, display_server.get(), &DisplayServer::set_base_display_configuration, invocation);
258
            invoke(this, display_server.get(), &DisplayServer::set_base_display_configuration, invocation);
377
255
259
378
=== modified file 'src/server/frontend/session_mediator.cpp'
379
--- src/server/frontend/session_mediator.cpp	2016-12-21 03:07:05 +0000
380
+++ src/server/frontend/session_mediator.cpp	2016-12-23 15:34:22 +0000
381
@@ -646,7 +646,7 @@
382
646
}
646
}
383
647
647
384
648
void mf::SessionMediator::configure_display(
648
void mf::SessionMediator::configure_display(
386
649
    const ::mir::protobuf::DisplayConfiguration* request,
649
    ::mir::protobuf::DisplayConfiguration const* request,
387
650
    ::mir::protobuf::DisplayConfiguration* response,
650
    ::mir::protobuf::DisplayConfiguration* response,
388
651
    ::google::protobuf::Closure* done)
651
    ::google::protobuf::Closure* done)
389
652
{
652
{
390
@@ -666,6 +666,21 @@
391
666
    done->Run();
666
    done->Run();
392
667
}
667
}
393
668
668
394
669
void mf::SessionMediator::remove_session_configuration(
395
670
    ::mir::protobuf::Void const* /*request*/,
396
671
    ::mir::protobuf::Void* /*response*/,
397
672
    ::google::protobuf::Closure* done)
398
673
{
399
674
    auto session = weak_session.lock();
400
675
401
676
    if (session.get() == nullptr)
402
677
        BOOST_THROW_EXCEPTION(std::logic_error("Invalid application session"));
403
678
404
679
    display_changer->remove_session_configuration(session);
405
680
406
681
    done->Run();
407
682
}
408
683
409
669
void mf::SessionMediator::set_base_display_configuration(
684
void mf::SessionMediator::set_base_display_configuration(
410
670
    mir::protobuf::DisplayConfiguration const* request,
685
    mir::protobuf::DisplayConfiguration const* request,
411
671
    mir::protobuf::Void* /*response*/,
686
    mir::protobuf::Void* /*response*/,
412
672
687
413
=== modified file 'src/server/frontend/session_mediator.h'
414
--- src/server/frontend/session_mediator.h	2016-11-28 16:58:23 +0000
415
+++ src/server/frontend/session_mediator.h	2016-12-23 15:34:22 +0000
416
@@ -144,6 +144,10 @@
417
144
        mir::protobuf::DisplayConfiguration const* request,
144
        mir::protobuf::DisplayConfiguration const* request,
418
145
        mir::protobuf::DisplayConfiguration* response,
145
        mir::protobuf::DisplayConfiguration* response,
419
146
        google::protobuf::Closure* done) override;
146
        google::protobuf::Closure* done) override;
420
147
    void remove_session_configuration(
421
148
        mir::protobuf::Void const* request,
422
149
        mir::protobuf::Void* response,
423
150
        google::protobuf::Closure* done) override;
424
147
    void set_base_display_configuration(
151
    void set_base_display_configuration(
425
148
        mir::protobuf::DisplayConfiguration const* request,
152
        mir::protobuf::DisplayConfiguration const* request,
426
149
        mir::protobuf::Void* response,
153
        mir::protobuf::Void* response,
427
150
154
428
=== modified file 'src/server/graphics/display_configuration_observer_multiplexer.cpp'
429
--- src/server/graphics/display_configuration_observer_multiplexer.cpp	2016-12-09 02:54:31 +0000
430
+++ src/server/graphics/display_configuration_observer_multiplexer.cpp	2016-12-23 15:34:22 +0000
431
@@ -38,6 +38,19 @@
432
38
    for_each_observer(&mg::DisplayConfigurationObserver::base_configuration_updated, base_config);
38
    for_each_observer(&mg::DisplayConfigurationObserver::base_configuration_updated, base_config);
433
39
}
39
}
434
40
40
435
41
void mg::DisplayConfigurationObserverMultiplexer::session_configuration_applied(
436
42
    std::shared_ptr<frontend::Session> const& session,
437
43
    std::shared_ptr<DisplayConfiguration> const& config)
438
44
{
439
45
    for_each_observer(&mg::DisplayConfigurationObserver::session_configuration_applied, session, config);
440
46
}
441
47
442
48
void mg::DisplayConfigurationObserverMultiplexer::session_configuration_removed(
443
49
    std::shared_ptr<frontend::Session> const& session)
444
50
{
445
51
    for_each_observer(&mg::DisplayConfigurationObserver::session_configuration_removed, session);
446
52
}
447
53
448
41
void mg::DisplayConfigurationObserverMultiplexer::configuration_failed(
54
void mg::DisplayConfigurationObserverMultiplexer::configuration_failed(
449
42
    std::shared_ptr<mg::DisplayConfiguration const> const& attempted,
55
    std::shared_ptr<mg::DisplayConfiguration const> const& attempted,
450
43
    std::exception const& error)
56
    std::exception const& error)
451
44
57
452
=== modified file 'src/server/graphics/display_configuration_observer_multiplexer.h'
453
--- src/server/graphics/display_configuration_observer_multiplexer.h	2016-12-09 02:54:31 +0000
454
+++ src/server/graphics/display_configuration_observer_multiplexer.h	2016-12-23 15:34:22 +0000
455
@@ -25,6 +25,10 @@
456
25
25
457
26
namespace mir
26
namespace mir
458
27
{
27
{
459
28
namespace frontend
460
29
{
461
30
class Session;
462
31
}
463
28
namespace graphics
32
namespace graphics
464
29
{
33
{
465
30
class DisplayConfigurationObserverMultiplexer : public ObserverMultiplexer<DisplayConfigurationObserver>
34
class DisplayConfigurationObserverMultiplexer : public ObserverMultiplexer<DisplayConfigurationObserver>
466
@@ -38,6 +42,11 @@
467
38
42
468
39
    void base_configuration_updated(std::shared_ptr<DisplayConfiguration const> const& base_config) override;
43
    void base_configuration_updated(std::shared_ptr<DisplayConfiguration const> const& base_config) override;
469
40
44
470
45
    void session_configuration_applied(std::shared_ptr<frontend::Session> const& session,
471
46
                                       std::shared_ptr<DisplayConfiguration> const& config) override;
472
47
473
48
    void session_configuration_removed(std::shared_ptr<frontend::Session> const& session) override;
474
49
475
41
    void configuration_failed(
50
    void configuration_failed(
476
42
        std::shared_ptr<DisplayConfiguration const> const& attempted,
51
        std::shared_ptr<DisplayConfiguration const> const& attempted,
477
43
        std::exception const& error) override;
52
        std::exception const& error) override;
478
44
53
479
=== modified file 'src/server/report/logging/display_configuration_report.cpp'
480
--- src/server/report/logging/display_configuration_report.cpp	2016-12-14 04:09:02 +0000
481
+++ src/server/report/logging/display_configuration_report.cpp	2016-12-23 15:34:22 +0000
482
@@ -20,11 +20,13 @@
483
20
#include "mir/graphics/display_configuration.h"
20
#include "mir/graphics/display_configuration.h"
484
21
#include "mir/output_type_names.h"
21
#include "mir/output_type_names.h"
485
22
#include "mir/logging/logger.h"
22
#include "mir/logging/logger.h"
486
23
#include "mir/frontend/session.h"
487
23
#include "mir/graphics/edid.h"
24
#include "mir/graphics/edid.h"
488
24
25
489
25
#include <boost/exception/diagnostic_information.hpp>
26
#include <boost/exception/diagnostic_information.hpp>
490
26
#include <cmath>
27
#include <cmath>
491
27
28
492
29
namespace mf = mir::frontend;
493
28
namespace mg = mir::graphics;
30
namespace mg = mir::graphics;
494
29
namespace ml = mir::logging;
31
namespace ml = mir::logging;
495
30
namespace mrl= mir::report::logging;
32
namespace mrl= mir::report::logging;
496
@@ -65,6 +67,18 @@
497
65
    log_configuration(severity, *base_config);
67
    log_configuration(severity, *base_config);
498
66
}
68
}
499
67
69
500
70
void mrl::DisplayConfigurationReport::session_configuration_applied(std::shared_ptr<mf::Session> const& session,
501
71
                                   std::shared_ptr<mg::DisplayConfiguration> const& config)
502
72
{
503
73
    logger->log(component, severity, "Session %s applied display configuration", session->name().c_str());
504
74
    log_configuration(severity, *config);
505
75
}
506
76
507
77
void mrl::DisplayConfigurationReport::session_configuration_removed(std::shared_ptr<frontend::Session> const& session)
508
78
{
509
79
    logger->log(component, severity, "Session %s removed display configuration", session->name().c_str());
510
80
}
511
81
512
68
void mrl::DisplayConfigurationReport::configuration_failed(
82
void mrl::DisplayConfigurationReport::configuration_failed(
513
69
    std::shared_ptr<mg::DisplayConfiguration const> const& attempted,
83
    std::shared_ptr<mg::DisplayConfiguration const> const& attempted,
514
70
    std::exception const& error)
84
    std::exception const& error)
515
@@ -123,7 +137,7 @@
516
123
                {"on", "in standby", "suspended", "off"};
137
                {"on", "in standby", "suspended", "off"};
517
124
            logger->log(component, severity,
138
            logger->log(component, severity,
518
125
                        "%sPower is %s", indent, power_mode[out.power_mode]);
139
                        "%sPower is %s", indent, power_mode[out.power_mode]);
520
126
            
140
521
127
            if (out.used)
141
            if (out.used)
522
128
            {
142
            {
523
129
                if (out.current_mode_index < out.modes.size())
143
                if (out.current_mode_index < out.modes.size())
524
130
144
525
=== modified file 'src/server/report/logging/display_configuration_report.h'
526
--- src/server/report/logging/display_configuration_report.h	2016-12-09 02:54:31 +0000
527
+++ src/server/report/logging/display_configuration_report.h	2016-12-23 15:34:22 +0000
528
@@ -27,6 +27,10 @@
529
27
{
27
{
530
28
namespace logging { class Logger; enum class Severity; }
28
namespace logging { class Logger; enum class Severity; }
531
29
29
532
30
namespace frontend
533
31
{
534
32
class Session;
535
33
}
536
30
namespace report
34
namespace report
537
31
{
35
{
538
32
namespace logging
36
namespace logging
539
@@ -42,6 +46,11 @@
540
42
46
541
43
    void base_configuration_updated(std::shared_ptr<graphics::DisplayConfiguration const> const& base_config) override;
47
    void base_configuration_updated(std::shared_ptr<graphics::DisplayConfiguration const> const& base_config) override;
542
44
48
543
49
    void session_configuration_applied(std::shared_ptr<frontend::Session> const& session,
544
50
                                       std::shared_ptr<graphics::DisplayConfiguration> const& config) override;
545
51
546
52
    void session_configuration_removed(std::shared_ptr<frontend::Session> const& session) override;
547
53
548
45
    void configuration_failed(
54
    void configuration_failed(
549
46
        std::shared_ptr<graphics::DisplayConfiguration const> const& attempted,
55
        std::shared_ptr<graphics::DisplayConfiguration const> const& attempted,
550
47
        std::exception const& error) override;
56
        std::exception const& error) override;
551
48
57
552
=== modified file 'src/server/scene/mediating_display_changer.cpp'
553
--- src/server/scene/mediating_display_changer.cpp	2016-12-09 02:54:31 +0000
554
+++ src/server/scene/mediating_display_changer.cpp	2016-12-23 15:34:22 +0000
555
@@ -1,5 +1,5 @@
556
1
/*
1
/*
558
2
 * Copyright © 2013 Canonical Ltd.
2
 * Copyright © 2013-2016 Canonical Ltd.
559
3
 *
3
 *
560
4
 * This program is free software: you can redistribute it and/or modify it
4
 * This program is free software: you can redistribute it and/or modify it
561
5
 * under the terms of the GNU General Public License version 3,
5
 * under the terms of the GNU General Public License version 3,
562
@@ -191,6 +191,7 @@
563
191
    {
191
    {
564
192
        std::lock_guard<std::mutex> lg{configuration_mutex};
192
        std::lock_guard<std::mutex> lg{configuration_mutex};
565
193
        config_map[session] = conf;
193
        config_map[session] = conf;
566
194
        observer->session_configuration_applied(session, conf);
567
194
195
568
195
        if (session != focused_session.lock())
196
        if (session != focused_session.lock())
569
196
            return;
197
            return;
570
@@ -222,6 +223,43 @@
571
222
        });
223
        });
572
223
}
224
}
573
224
225
574
226
void ms::MediatingDisplayChanger::remove_session_configuration(
575
227
    std::shared_ptr<mf::Session> const& session)
576
228
{
577
229
    {
578
230
        std::lock_guard<std::mutex> lg{configuration_mutex};
579
231
        if (config_map.find(session) != config_map.end())
580
232
        {
581
233
            config_map.erase(session);
582
234
            observer->session_configuration_removed(session);
583
235
        }
584
236
585
237
        if (session != focused_session.lock())
586
238
            return;
587
239
    }
588
240
589
241
    std::weak_ptr<mf::Session> const weak_session{session};
590
242
591
243
    server_action_queue->enqueue(
592
244
        this,
593
245
        [this, weak_session]
594
246
        {
595
247
            if (auto const session = weak_session.lock())
596
248
            {
597
249
                std::lock_guard<std::mutex> lg{configuration_mutex};
598
250
599
251
                try
600
252
                {
601
253
                    apply_base_config();
602
254
                }
603
255
                catch (std::exception const&)
604
256
                {
605
257
                    session->send_error(DisplayConfigurationFailedError{});
606
258
                }
607
259
            }
608
260
        });
609
261
}
610
262
611
225
void
263
void
612
226
ms::MediatingDisplayChanger::preview_base_configuration(
264
ms::MediatingDisplayChanger::preview_base_configuration(
613
227
    std::weak_ptr<frontend::Session> const& session,
265
    std::weak_ptr<frontend::Session> const& session,
614
228
266
615
=== modified file 'src/server/scene/mediating_display_changer.h'
616
--- src/server/scene/mediating_display_changer.h	2016-11-15 23:48:01 +0000
617
+++ src/server/scene/mediating_display_changer.h	2016-12-23 15:34:22 +0000
618
@@ -75,6 +75,7 @@
619
75
    std::shared_ptr<graphics::DisplayConfiguration> base_configuration() override;
75
    std::shared_ptr<graphics::DisplayConfiguration> base_configuration() override;
620
76
    void configure(std::shared_ptr<frontend::Session> const& session,
76
    void configure(std::shared_ptr<frontend::Session> const& session,
621
77
                   std::shared_ptr<graphics::DisplayConfiguration> const& conf) override;
77
                   std::shared_ptr<graphics::DisplayConfiguration> const& conf) override;
622
78
    void remove_session_configuration(std::shared_ptr<frontend::Session> const& session) override;
623
78
    void preview_base_configuration(
79
    void preview_base_configuration(
624
79
        std::weak_ptr<frontend::Session> const& session,
80
        std::weak_ptr<frontend::Session> const& session,
625
80
        std::shared_ptr<graphics::DisplayConfiguration> const& conf,
81
        std::shared_ptr<graphics::DisplayConfiguration> const& conf,
626
81
82
627
=== modified file 'tests/acceptance-tests/test_nested_mir.cpp'
628
--- tests/acceptance-tests/test_nested_mir.cpp	2016-12-09 02:54:31 +0000
629
+++ tests/acceptance-tests/test_nested_mir.cpp	2016-12-23 15:34:22 +0000
630
@@ -127,6 +127,8 @@
631
127
{
127
{
632
128
    MOCK_METHOD1(initial_configuration, void (std::shared_ptr<mg::DisplayConfiguration const> const& configuration));
128
    MOCK_METHOD1(initial_configuration, void (std::shared_ptr<mg::DisplayConfiguration const> const& configuration));
633
129
    MOCK_METHOD1(configuration_applied, void (std::shared_ptr<mg::DisplayConfiguration const> const& configuration));
129
    MOCK_METHOD1(configuration_applied, void (std::shared_ptr<mg::DisplayConfiguration const> const& configuration));
634
130
    MOCK_METHOD2(session_configuration_applied, void (std::shared_ptr<mf::Session> const& session, std::shared_ptr<mg::DisplayConfiguration> const& configuration));
635
131
    MOCK_METHOD1(session_configuration_removed, void (std::shared_ptr<mf::Session> const& session));
636
130
    MOCK_METHOD1(base_configuration_updated, void (std::shared_ptr<mg::DisplayConfiguration const> const& base_config));
132
    MOCK_METHOD1(base_configuration_updated, void (std::shared_ptr<mg::DisplayConfiguration const> const& base_config));
637
131
    MOCK_METHOD2(configuration_failed, void(std::shared_ptr<mg::DisplayConfiguration const> const&, std::exception const&));
133
    MOCK_METHOD2(configuration_failed, void(std::shared_ptr<mg::DisplayConfiguration const> const&, std::exception const&));
638
132
    MOCK_METHOD2(catastrophic_configuration_error, void(std::shared_ptr<mg::DisplayConfiguration const> const&, std::exception const&));
134
    MOCK_METHOD2(catastrophic_configuration_error, void(std::shared_ptr<mg::DisplayConfiguration const> const&, std::exception const&));
639
133
135
640
=== modified file 'tests/acceptance-tests/test_new_display_configuration.cpp'
641
--- tests/acceptance-tests/test_new_display_configuration.cpp	2016-12-12 05:13:17 +0000
642
+++ tests/acceptance-tests/test_new_display_configuration.cpp	2016-12-23 15:34:22 +0000
643
@@ -41,6 +41,7 @@
644
41
41
645
42
#include <atomic>
42
#include <atomic>
646
43
#include <chrono>
43
#include <chrono>
647
44
#include <mutex>
648
44
45
649
45
#include <gmock/gmock.h>
46
#include <gmock/gmock.h>
650
46
#include <gtest/gtest.h>
47
#include <gtest/gtest.h>
651
@@ -109,6 +110,11 @@
652
109
            return expectations.back().notifier.get_future();
110
            return expectations.back().notifier.get_future();
653
110
        }
111
        }
654
111
112
655
113
        MOCK_METHOD2(session_configuration_applied, void(
656
114
            std::shared_ptr<mf::Session> const&,
657
115
            std::shared_ptr<mg::DisplayConfiguration> const&));
658
116
        MOCK_METHOD1(session_configuration_removed, void(std::shared_ptr<mf::Session> const&));
659
117
660
112
    protected:
118
    protected:
661
113
        void initial_configuration(
119
        void initial_configuration(
662
114
            std::shared_ptr<mg::DisplayConfiguration const> const&) override
120
            std::shared_ptr<mg::DisplayConfiguration const> const&) override
663
@@ -187,6 +193,7 @@
664
187
    testing::NiceMock<MockDisplay> mock_display;
193
    testing::NiceMock<MockDisplay> mock_display;
665
188
    std::shared_ptr<NotifyingConfigurationObserver> observer{std::make_shared<NotifyingConfigurationObserver>()};
194
    std::shared_ptr<NotifyingConfigurationObserver> observer{std::make_shared<NotifyingConfigurationObserver>()};
666
189
    StubAuthorizer stub_authorizer;
195
    StubAuthorizer stub_authorizer;
667
196
    mir::test::Signal observed_changed;
668
190
};
197
};
669
191
198
670
192
TEST_F(DisplayConfigurationTest, display_configuration_reaches_client)
199
TEST_F(DisplayConfigurationTest, display_configuration_reaches_client)
671
@@ -259,9 +266,31 @@
672
259
        connection = mir_connect_sync(mir_test_socket.c_str(), __PRETTY_FUNCTION__);
266
        connection = mir_connect_sync(mir_test_socket.c_str(), __PRETTY_FUNCTION__);
673
260
267
674
261
        auto const spec = mir_connection_create_spec_for_normal_surface(connection, 100, 100, mir_pixel_format_abgr_8888);
268
        auto const spec = mir_connection_create_spec_for_normal_surface(connection, 100, 100, mir_pixel_format_abgr_8888);
675
269
        mir_surface_spec_set_event_handler(spec, &handle_event, this);
676
262
        surface = mir_surface_create_sync(spec);
270
        surface = mir_surface_create_sync(spec);
677
263
        mir_surface_spec_release(spec);
271
        mir_surface_spec_release(spec);
678
264
        mir_buffer_stream_swap_buffers_sync(mir_surface_get_buffer_stream(surface));
272
        mir_buffer_stream_swap_buffers_sync(mir_surface_get_buffer_stream(surface));
679
273
680
274
        ready_to_accept_events.wait_for(4s);
681
275
        if (!ready_to_accept_events.raised())
682
276
            BOOST_THROW_EXCEPTION(std::runtime_error("Timeout waiting for surface to become focused and exposed"));
683
277
    }
684
278
685
279
    static void handle_event(MirSurface*, MirEvent const* ev, void* context)
686
280
    {
687
281
        auto const client = static_cast<SimpleClient*>(context);
688
282
        auto type = mir_event_get_type(ev);
689
283
        if (type == mir_event_type_surface)
690
284
        {
691
285
            auto surface_event = mir_event_get_surface_event(ev);
692
286
            auto const attrib  = mir_surface_event_get_attribute(surface_event);
693
287
            auto const value   = mir_surface_event_get_attribute_value(surface_event);
694
288
695
289
            std::lock_guard<std::mutex> lk(client->mutex);
696
290
            if (mir_surface_attrib_focus == attrib &&
697
291
                mir_surface_focused == value)
698
292
                client->ready_to_accept_events.raise();
699
293
        }
700
265
    }
294
    }
701
266
295
702
267
    void disconnect()
296
    void disconnect()
703
@@ -278,6 +307,9 @@
704
278
    std::string mir_test_socket;
307
    std::string mir_test_socket;
705
279
    MirConnection* connection{nullptr};
308
    MirConnection* connection{nullptr};
706
280
    MirSurface* surface{nullptr};
309
    MirSurface* surface{nullptr};
707
310
    mutable std::mutex mutex;
708
311
    mir::test::Signal ready_to_accept_events;
709
312
    bool focused{false};
710
281
};
313
};
711
282
314
712
283
struct DisplayClient : SimpleClient
315
struct DisplayClient : SimpleClient
713
@@ -1743,3 +1775,244 @@
714
1743
1775
715
1744
    client.disconnect();
1776
    client.disconnect();
716
1745
}
1777
}
717
1778
718
1779
TEST_F(DisplayConfigurationTest, configure_session_display)
719
1780
{
720
1781
    auto configuration = mir_connection_create_display_configuration(connection);
721
1782
722
1783
    EXPECT_CALL(*observer, session_configuration_applied(_, _))
723
1784
        .Times(1)
724
1785
        .WillOnce(mt::WakeUp(&observed_changed));
725
1786
726
1787
    mir_connection_apply_session_display_configuration(connection, configuration);
727
1788
728
1789
    observed_changed.wait_for(10s);
729
1790
730
1791
    mir_display_config_release(configuration);
731
1792
}
732
1793
733
1794
TEST_F(DisplayConfigurationTest, configure_session_removed_display)
734
1795
{
735
1796
    auto configuration = mir_connection_create_display_configuration(connection);
736
1797
737
1798
    EXPECT_CALL(*observer, session_configuration_applied(_, _))
738
1799
        .Times(1)
739
1800
        .WillOnce(mt::WakeUp(&observed_changed));
740
1801
741
1802
    mir_connection_apply_session_display_configuration(connection, configuration);
742
1803
743
1804
    observed_changed.wait_for(10s);
744
1805
    observed_changed.reset();
745
1806
746
1807
    mir_connection_remove_session_display_configuration(connection);
747
1808
748
1809
    EXPECT_CALL(*observer, session_configuration_removed(_))
749
1810
        .Times(1)
750
1811
        .WillOnce(mt::WakeUp(&observed_changed));
751
1812
752
1813
    observed_changed.wait_for(10s);
753
1814
754
1815
    mir_display_config_release(configuration);
755
1816
}
756
1817
757
1818
TEST_F(DisplayConfigurationTest, remove_is_noop_when_no_session_configuration_set)
758
1819
{
759
1820
    EXPECT_CALL(*observer, session_configuration_removed(_))
760
1821
        .Times(0);
761
1822
762
1823
    mir_connection_remove_session_display_configuration(connection);
763
1824
764
1825
    std::this_thread::sleep_for(1s);
765
1826
}
766
1827
767
1828
TEST_F(DisplayConfigurationTest, remove_from_focused_client_causes_hardware_change)
768
1829
{
769
1830
    DisplayClient client{new_connection()};
770
1831
771
1832
    client.connect();
772
1833
773
1834
    std::atomic<int> times{2};
774
1835
    auto new_config = mir_connection_create_display_configuration(client.connection);
775
1836
776
1837
    // Apply a configuration to the client, assert it has been configured for the display
777
1838
    {
778
1839
        mir_output_set_position(mir_display_config_get_mutable_output(new_config, 0), 500, 12000);
779
1840
780
1841
        EXPECT_CALL(*observer, session_configuration_applied(_, mt::DisplayConfigMatches(new_config)))
781
1842
            .Times(1)
782
1843
            .WillOnce(mt::WakeUpWhenZero(&observed_changed, &times));
783
1844
        EXPECT_CALL(mock_display, configure(mt::DisplayConfigMatches(new_config)))
784
1845
            .Times(1)
785
1846
            .WillOnce(mt::WakeUpWhenZero(&observed_changed, &times));
786
1847
787
1848
        mir_connection_apply_session_display_configuration(client.connection, new_config);
788
1849
789
1850
        observed_changed.wait_for(10s);
790
1851
        observed_changed.reset();
791
1852
        mir_display_config_release(new_config);
792
1853
    }
793
1854
794
1855
    // Remove the configuration, assert we have been re-configured back to the base config
795
1856
    {
796
1857
        times = 2;
797
1858
798
1859
        EXPECT_CALL(*observer, session_configuration_removed(_))
799
1860
            .Times(1)
800
1861
            .WillOnce(mt::WakeUpWhenZero(&observed_changed, &times));
801
1862
        EXPECT_CALL(mock_display, configure(mt::DisplayConfigMatches(std::cref(stub_display_config))))
802
1863
            .Times(1)
803
1864
            .WillOnce(mt::WakeUpWhenZero(&observed_changed, &times));
804
1865
805
1866
        mir_connection_remove_session_display_configuration(client.connection);
806
1867
807
1868
        observed_changed.wait_for(10s);
808
1869
    }
809
1870
810
1871
    client.disconnect();
811
1872
}
812
1873
813
1874
TEST_F(DisplayConfigurationTest, remove_from_unfocused_client_causes_no_hardware_change)
814
1875
{
815
1876
    DisplayClient client{new_connection()};
816
1877
817
1878
    client.connect();
818
1879
819
1880
    auto new_config = mir_connection_create_display_configuration(client.connection);
820
1881
    std::atomic<int> times{2};
821
1882
822
1883
    // Set the first clients display config
823
1884
    {
824
1885
        mir_output_set_position(mir_display_config_get_mutable_output(new_config, 0), 500, 12000);
825
1886
826
1887
        EXPECT_CALL(*observer, session_configuration_applied(_, mt::DisplayConfigMatches(new_config)))
827
1888
            .Times(1)
828
1889
            .WillOnce(mt::WakeUpWhenZero(&observed_changed, &times));
829
1890
        EXPECT_CALL(mock_display, configure(mt::DisplayConfigMatches(new_config)))
830
1891
            .Times(1)
831
1892
            .WillOnce(mt::WakeUpWhenZero(&observed_changed, &times));
832
1893
833
1894
        mir_connection_apply_session_display_configuration(client.connection, new_config);
834
1895
835
1896
        observed_changed.wait_for(10s);
836
1897
        observed_changed.reset();
837
1898
        mir_display_config_release(new_config);
838
1899
    }
839
1900
840
1901
    DisplayClient client2{new_connection()};
841
1902
842
1903
    // Connect and wait for the second client to get setup and config. Which will be the focused session
843
1904
    {
844
1905
        EXPECT_CALL(mock_display, configure(mt::DisplayConfigMatches(std::cref(stub_display_config))))
845
1906
            .Times(1)
846
1907
            .WillOnce(mt::WakeUp(&observed_changed));
847
1908
848
1909
        client2.connect();
849
1910
        observed_changed.wait_for(10s);
850
1911
        observed_changed.reset();
851
1912
    }
852
1913
853
1914
    // Remove the display config from the first config and assert no hardware changes happen
854
1915
    {
855
1916
        EXPECT_CALL(*observer, session_configuration_removed(_))
856
1917
            .Times(1)
857
1918
            .WillOnce(mt::WakeUp(&observed_changed));
858
1919
        EXPECT_CALL(mock_display, configure(_))
859
1920
            .Times(0);
860
1921
861
1922
        mir_connection_remove_session_display_configuration(client.connection);
862
1923
863
1924
        observed_changed.wait_for(10s);
864
1925
        std::this_thread::sleep_for(1s);
865
1926
    }
866
1927
867
1928
    client2.disconnect();
868
1929
    client.disconnect();
869
1930
}
870
1931
871
1932
TEST_F(DisplayConfigurationTest, remove_from_unfocused_client_causes_hardware_change_when_focused)
872
1933
{
873
1934
    DisplayClient client{new_connection()};
874
1935
875
1936
    client.connect();
876
1937
877
1938
    auto new_config = mir_connection_create_display_configuration(client.connection);
878
1939
    std::atomic<int> times{2};
879
1940
880
1941
    // Set the first clients display config
881
1942
    {
882
1943
        mir_output_set_position(mir_display_config_get_mutable_output(new_config, 0), 500, 12000);
883
1944
884
1945
        EXPECT_CALL(*observer, session_configuration_applied(_, mt::DisplayConfigMatches(new_config)))
885
1946
            .Times(1)
886
1947
            .WillOnce(mt::WakeUpWhenZero(&observed_changed, &times));
887
1948
        EXPECT_CALL(mock_display, configure(mt::DisplayConfigMatches(new_config)))
888
1949
            .Times(1)
889
1950
            .WillOnce(mt::WakeUpWhenZero(&observed_changed, &times));
890
1951
891
1952
        mir_connection_apply_session_display_configuration(client.connection, new_config);
892
1953
893
1954
        observed_changed.wait_for(10s);
894
1955
        observed_changed.reset();
895
1956
    }
896
1957
897
1958
    DisplayClient client2{new_connection()};
898
1959
899
1960
    // Connect and wait for the second client to get setup and config. Which will be the focused session
900
1961
    {
901
1962
        EXPECT_CALL(mock_display, configure(mt::DisplayConfigMatches(std::cref(stub_display_config))))
902
1963
            .Times(1)
903
1964
            .WillOnce(mt::WakeUp(&observed_changed));
904
1965
905
1966
        client2.connect();
906
1967
        observed_changed.wait_for(10s);
907
1968
        observed_changed.reset();
908
1969
    }
909
1970
910
1971
    // Apply the new_config to client 2 as well so we can see disconnecting will apply the base config
911
1972
    {
912
1973
        times = 2;
913
1974
914
1975
        EXPECT_CALL(*observer, session_configuration_applied(_, mt::DisplayConfigMatches(new_config)))
915
1976
            .Times(1)
916
1977
            .WillOnce(mt::WakeUpWhenZero(&observed_changed, &times));
917
1978
        EXPECT_CALL(mock_display, configure(mt::DisplayConfigMatches(new_config)))
918
1979
            .Times(1)
919
1980
            .WillOnce(mt::WakeUpWhenZero(&observed_changed, &times));
920
1981
921
1982
        mir_connection_apply_session_display_configuration(client2.connection, new_config);
922
1983
        observed_changed.wait_for(10s);
923
1984
        observed_changed.reset();
924
1985
        mir_display_config_release(new_config);
925
1986
    }
926
1987
927
1988
    // Remove the display config from the first config and assert no hardware changes happen
928
1989
    {
929
1990
930
1991
        EXPECT_CALL(*observer, session_configuration_removed(_))
931
1992
            .Times(1)
932
1993
            .WillOnce(mt::WakeUp(&observed_changed));
933
1994
        EXPECT_CALL(mock_display, configure(_))
934
1995
            .Times(0);
935
1996
936
1997
        mir_connection_remove_session_display_configuration(client.connection);
937
1998
938
1999
        observed_changed.wait_for(10s);
939
2000
        std::this_thread::sleep_for(1s);
940
2001
        observed_changed.reset();
941
2002
    }
942
2003
943
2004
    testing::Mock::VerifyAndClearExpectations(&mock_display);
944
2005
945
2006
    // Disconnect client 2 which makes client 1 regain focus. Assert the base config is configured
946
2007
    {
947
2008
        EXPECT_CALL(mock_display, configure(mt::DisplayConfigMatches(std::cref(stub_display_config))))
948
2009
            .Times(1)
949
2010
            .WillOnce(mt::WakeUp(&observed_changed));
950
2011
951
2012
        client2.disconnect();
952
2013
953
2014
        observed_changed.wait_for(10s);
954
2015
    }
955
2016
956
2017
    client.disconnect();
957
2018
}
958
1746
2019
959
=== modified file 'tests/include/mir/test/doubles/null_display_changer.h'
960
--- tests/include/mir/test/doubles/null_display_changer.h	2016-10-12 06:03:15 +0000
961
+++ tests/include/mir/test/doubles/null_display_changer.h	2016-12-23 15:34:22 +0000
962
@@ -39,6 +39,9 @@
963
39
    void configure(std::shared_ptr<frontend::Session> const&, std::shared_ptr<graphics::DisplayConfiguration> const&) override
39
    void configure(std::shared_ptr<frontend::Session> const&, std::shared_ptr<graphics::DisplayConfiguration> const&) override
964
40
    {
40
    {
965
41
    }
41
    }
966
42
    void remove_session_configuration(std::shared_ptr<frontend::Session> const&) override
967
43
    {
968
44
    }
969
42
    void set_base_configuration(std::shared_ptr<graphics::DisplayConfiguration> const&) override
45
    void set_base_configuration(std::shared_ptr<graphics::DisplayConfiguration> const&) override
970
43
    {
46
    {
971
44
    }
47
    }
972
45
48
973
=== modified file 'tests/include/mir/test/doubles/stub_display_server.h'
974
--- tests/include/mir/test/doubles/stub_display_server.h	2016-12-21 03:07:05 +0000
975
+++ tests/include/mir/test/doubles/stub_display_server.h	2016-12-23 15:34:22 +0000
976
@@ -66,6 +66,10 @@
977
66
        mir::protobuf::DisplayConfiguration const* /*request*/,
66
        mir::protobuf::DisplayConfiguration const* /*request*/,
978
67
        mir::protobuf::DisplayConfiguration* /*response*/,
67
        mir::protobuf::DisplayConfiguration* /*response*/,
979
68
        google::protobuf::Closure* /*done*/) {}
68
        google::protobuf::Closure* /*done*/) {}
980
69
    void remove_session_configuration(
981
70
        mir::protobuf::Void const* /*request*/,
982
71
        mir::protobuf::Void* /*response*/,
983
72
        google::protobuf::Closure* /*done*/) {}
984
69
    void set_base_display_configuration(
73
    void set_base_display_configuration(
985
70
        mir::protobuf::DisplayConfiguration const* /*request*/,
74
        mir::protobuf::DisplayConfiguration const* /*request*/,
986
71
        mir::protobuf::Void* /*response*/,
75
        mir::protobuf::Void* /*response*/,
987
72
76
988
=== modified file 'tests/mir_test/display_config_matchers.cpp'
989
--- tests/mir_test/display_config_matchers.cpp	2016-12-09 02:54:31 +0000
990
+++ tests/mir_test/display_config_matchers.cpp	2016-12-23 15:34:22 +0000
991
@@ -423,3 +423,12 @@
992
423
    TestDisplayConfiguration translated_config_two{config2};
423
    TestDisplayConfiguration translated_config_two{config2};
993
424
    return compare_display_configurations(listener, translated_config_one, translated_config_two);
424
    return compare_display_configurations(listener, translated_config_one, translated_config_two);
994
425
}
425
}
995
426
996
427
bool mt::compare_display_configurations(
997
428
    testing::MatchResultListener* listener,
998
429
    std::shared_ptr<mg::DisplayConfiguration> const& config1,
999
430
    MirDisplayConfig const* config2)
1000
431
{
1001
432
    TestDisplayConfiguration translated_config_two{config2};
1002
433
    return compare_display_configurations(listener, *config1, translated_config_two);
1003
434
}
1004
426
435
1005
=== modified file 'tests/unit-tests/scene/test_mediating_display_changer.cpp'
1006
--- tests/unit-tests/scene/test_mediating_display_changer.cpp	2016-12-09 02:54:31 +0000
1007
+++ tests/unit-tests/scene/test_mediating_display_changer.cpp	2016-12-23 15:34:22 +0000
1008
@@ -174,6 +174,10 @@
1009
174
    void initial_configuration(std::shared_ptr<mg::DisplayConfiguration const> const&) override {}
174
    void initial_configuration(std::shared_ptr<mg::DisplayConfiguration const> const&) override {}
1010
175
    void configuration_applied(std::shared_ptr<mg::DisplayConfiguration const> const&) override {}
175
    void configuration_applied(std::shared_ptr<mg::DisplayConfiguration const> const&) override {}
1011
176
    void base_configuration_updated(std::shared_ptr<mg::DisplayConfiguration const> const&) override {}
176
    void base_configuration_updated(std::shared_ptr<mg::DisplayConfiguration const> const&) override {}
1012
177
    void session_configuration_applied(
1013
178
        std::shared_ptr<mf::Session> const&,
1014
179
        std::shared_ptr<mg::DisplayConfiguration> const&) override {};
1015
180
    void session_configuration_removed(std::shared_ptr<mf::Session> const&) override {};
1016
177
    void configuration_failed(
181
    void configuration_failed(
1017
178
        std::shared_ptr<mg::DisplayConfiguration const> const&,
182
        std::shared_ptr<mg::DisplayConfiguration const> const&,
1018
179
        std::exception const&) override {}
183
        std::exception const&) override {}
Status:	Merged
Approved by:	Brandon Schaefer on 2016-12-23
Approved revision:	no longer in the source branch.
Merged at revision:	3900
Proposed branch:	lp:~brandontschaefer/mir/client-api-apply-remove-display-config
Merge into:	lp:mir
Diff against target:	1018 lines (+556/-25) 29 files modified include/client/mir_toolkit/mir_connection.h (+24/-0) include/server/mir/graphics/display_configuration_observer.h (+19/-0) include/test/mir/test/display_config_matchers.h (+5/-0) include/test/mir/test/signal.h (+7/-0) src/client/mir_connection.cpp (+45/-22) src/client/mir_connection.h (+3/-0) src/client/mir_connection_api.cpp (+19/-0) src/client/rpc/mir_display_server.cpp (+7/-0) src/client/rpc/mir_display_server.h (+4/-0) src/client/symbols.map (+2/-0) src/include/common/mir/protobuf/display_server.h (+4/-0) src/include/server/mir/frontend/display_changer.h (+1/-0) src/server/frontend/authorizing_display_changer.cpp (+9/-0) src/server/frontend/authorizing_display_changer.h (+2/-0) src/server/frontend/protobuf_message_processor.cpp (+4/-0) src/server/frontend/session_mediator.cpp (+16/-1) src/server/frontend/session_mediator.h (+4/-0) src/server/graphics/display_configuration_observer_multiplexer.cpp (+13/-0) src/server/graphics/display_configuration_observer_multiplexer.h (+9/-0) src/server/report/logging/display_configuration_report.cpp (+15/-1) src/server/report/logging/display_configuration_report.h (+9/-0) src/server/scene/mediating_display_changer.cpp (+39/-1) src/server/scene/mediating_display_changer.h (+1/-0) tests/acceptance-tests/test_nested_mir.cpp (+2/-0) tests/acceptance-tests/test_new_display_configuration.cpp (+273/-0) tests/include/mir/test/doubles/null_display_changer.h (+3/-0) tests/include/mir/test/doubles/stub_display_server.h (+4/-0) tests/mir_test/display_config_matchers.cpp (+9/-0) tests/unit-tests/scene/test_mediating_display_changer.cpp (+4/-0)
To merge this branch:	bzr merge lp:~brandontschaefer/mir/client-api-apply-remove-display-config
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration		Approve on 2016-12-23
Chris Halse Rogers		2016-12-09	Approve on 2016-12-22
Alan Griffiths			Approve on 2016-12-13
Daniel van Vugt			Abstain on 2016-12-12
Review via email: mp+312951@code.launchpad.net