1
=== modified file 'include/client/mir_toolkit/client_types.h'
2
--- include/client/mir_toolkit/client_types.h	2015-05-29 04:23:56 +0000
3
+++ include/client/mir_toolkit/client_types.h	2015-06-16 12:28:06 +0000
4
@@ -283,6 +283,16 @@
5
283
    MirDisplayCard *cards;
283
    MirDisplayCard *cards;
6
284
} MirDisplayConfiguration;
284
} MirDisplayConfiguration;
7
285
285
8
286
/**
9
287
 * The displacement from the top-left corner of the surface.
10
288
 */
11
289
typedef struct MirBufferStreamInfo
12
290
{
13
291
    MirBufferStream* stream;
14
292
    int displacement_x;
15
293
    int displacement_y;
16
294
} MirBufferStreamInfo;
17
295
18
286
typedef struct MirRectangle
296
typedef struct MirRectangle
19
287
{
297
{
20
288
    int left;
298
    int left;
21
289
299
22
=== modified file 'include/client/mir_toolkit/mir_surface.h'
23
--- include/client/mir_toolkit/mir_surface.h	2015-06-10 09:00:22 +0000
24
+++ include/client/mir_toolkit/mir_surface.h	2015-06-16 12:28:06 +0000
25
@@ -433,6 +433,28 @@
26
433
void mir_surface_spec_release(MirSurfaceSpec* spec);
433
void mir_surface_spec_release(MirSurfaceSpec* spec);
27
434
434
28
435
/**
435
/**
29
436
 * Set the streams associated with the spec.
30
437
 * streams[0] is the bottom-most stream, and streams[size-1] is the topmost.
31
438
 * On application of the spec, a stream that is present in the surface,
32
439
 * but is not in the list will be disassociated from the surface.
33
440
 * On application of the spec, a stream that is not present in the surface,
34
441
 * but is in the list will be associated with the surface.
35
442
 * Streams set a displacement from the top-left corner of the surface.
36
443
 * 
37
444
 * \warning disassociating streams from the surface will not release() them.
38
445
 * \warning It is wiser to arrange the streams within the bounds of the
39
446
 *          surface the spec is applied to. Shells can define their own
40
447
 *          behavior as to what happens to an out-of-bound stream.
41
448
 * 
42
449
 * \param [in] spec        The spec to accumulate the request in.
43
450
 * \param [in] streams     The an array of non-null streams info.
44
451
 * \param [in] num_streams The number of elements in the streams array.
45
452
 */
46
453
void mir_surface_spec_set_streams(MirSurfaceSpec* spec,
47
454
                                  MirBufferStreamInfo* streams,
48
455
                                  unsigned int num_streams);
49
456
50
457
/**
51
436
 * Set the event handler to be called when events arrive for a surface.
458
 * Set the event handler to be called when events arrive for a surface.
52
437
 *   \warning event_handler could be called from another thread. You must do
459
 *   \warning event_handler could be called from another thread. You must do
53
438
 *            any locking appropriate to protect your data accessed in the
460
 *            any locking appropriate to protect your data accessed in the
54
439
461
55
=== modified file 'include/server/mir/scene/session.h'
56
--- include/server/mir/scene/session.h	2015-05-19 21:34:34 +0000
57
+++ include/server/mir/scene/session.h	2015-06-16 12:28:06 +0000
58
@@ -22,10 +22,12 @@
59
22
#include "mir/frontend/session.h"
22
#include "mir/frontend/session.h"
60
23
#include "mir/scene/snapshot.h"
23
#include "mir/scene/snapshot.h"
61
24
24
62
25
#include <vector>
63
25
#include <sys/types.h>
26
#include <sys/types.h>
64
26
27
65
27
namespace mir
28
namespace mir
66
28
{
29
{
67
30
namespace shell { struct StreamSpecification; }
68
29
namespace scene
31
namespace scene
69
30
{
32
{
70
31
class Surface;
33
class Surface;
71
@@ -60,6 +62,7 @@
72
60
62
73
61
    virtual frontend::BufferStreamId create_buffer_stream(graphics::BufferProperties const& props) = 0;
63
    virtual frontend::BufferStreamId create_buffer_stream(graphics::BufferProperties const& props) = 0;
74
62
    virtual void destroy_buffer_stream(frontend::BufferStreamId stream) = 0;
64
    virtual void destroy_buffer_stream(frontend::BufferStreamId stream) = 0;
75
65
    virtual void configure_streams(Surface& surface, std::vector<shell::StreamSpecification> const& config) = 0;
76
63
};
66
};
77
64
}
67
}
78
65
}
68
}
79
66
69
80
=== modified file 'src/client/mir_surface.cpp'
81
--- src/client/mir_surface.cpp	2015-06-10 11:13:15 +0000
82
+++ src/client/mir_surface.cpp	2015-06-16 12:28:06 +0000
83
@@ -23,6 +23,7 @@
84
23
#include "cursor_configuration.h"
23
#include "cursor_configuration.h"
85
24
#include "client_buffer_stream_factory.h"
24
#include "client_buffer_stream_factory.h"
86
25
#include "mir_connection.h"
25
#include "mir_connection.h"
87
26
#include "client_buffer_stream.h"
88
26
#include "mir/dispatch/threaded_dispatcher.h"
27
#include "mir/dispatch/threaded_dispatcher.h"
89
27
#include "mir/input/input_platform.h"
28
#include "mir/input/input_platform.h"
90
28
#include "mir/input/xkb_mapper.h"
29
#include "mir/input/xkb_mapper.h"
91
@@ -664,6 +665,18 @@
92
664
        aspect->set_height(spec.max_aspect.value().height);
665
        aspect->set_height(spec.max_aspect.value().height);
93
665
    }
666
    }
94
666
667
95
668
    if (spec.streams.is_set())
96
669
    {
97
670
        for(auto const& stream : spec.streams.value())
98
671
        {
99
672
            auto const new_stream = surface_specification->add_stream();
100
673
            new_stream->set_displacement_x(stream.displacement_x);
101
674
            new_stream->set_displacement_y(stream.displacement_y);
102
675
            new_stream->mutable_id()->set_value(
103
676
                reinterpret_cast<mcl::ClientBufferStream*>(stream.stream)->rpc_id().as_value());
104
677
        }
105
678
    }
106
679
107
667
    modify_wait_handle.expect_result();
680
    modify_wait_handle.expect_result();
108
668
    server->modify_surface(0, &mods, &modify_result,
681
    server->modify_surface(0, &mods, &modify_result,
109
669
              google::protobuf::NewCallback(this, &MirSurface::on_modified));
682
              google::protobuf::NewCallback(this, &MirSurface::on_modified));
110
670
683
111
=== modified file 'src/client/mir_surface.h'
112
--- src/client/mir_surface.h	2015-05-29 04:23:56 +0000
113
+++ src/client/mir_surface.h	2015-06-16 12:28:06 +0000
114
@@ -97,6 +97,7 @@
115
97
    mir::optional_value<int> height_inc;
97
    mir::optional_value<int> height_inc;
116
98
    mir::optional_value<AspectRatio> min_aspect;
98
    mir::optional_value<AspectRatio> min_aspect;
117
99
    mir::optional_value<AspectRatio> max_aspect;
99
    mir::optional_value<AspectRatio> max_aspect;
118
100
    mir::optional_value<std::vector<MirBufferStreamInfo>> streams;
119
100
};
101
};
120
101
102
121
102
struct MirPersistentId
103
struct MirPersistentId
122
103
104
123
=== modified file 'src/client/mir_surface_api.cpp'
124
--- src/client/mir_surface_api.cpp	2015-06-10 09:00:22 +0000
125
+++ src/client/mir_surface_api.cpp	2015-06-16 12:28:06 +0000
126
@@ -516,9 +516,29 @@
127
516
    // Keep calm and carry on
516
    // Keep calm and carry on
128
517
}
517
}
129
518
518
130
519
void mir_surface_spec_set_streams(MirSurfaceSpec* spec, MirBufferStreamInfo* streams, unsigned int size)
131
520
try
132
521
{
133
522
    mir::require(spec);
134
523
135
524
    std::vector<MirBufferStreamInfo> copy;
136
525
    for (auto i = 0u; i < size; i++)
137
526
    {
138
527
        mir::require(mir_buffer_stream_is_valid(streams[i].stream));
139
528
        copy.emplace_back(streams[i]);
140
529
    }
141
530
    spec->streams = copy;
142
531
}
143
532
catch (std::exception const& ex)
144
533
{
145
534
    MIR_LOG_UNCAUGHT_EXCEPTION(ex);
146
535
}
147
536
148
537
149
519
void mir_surface_spec_set_parent(MirSurfaceSpec* spec, MirSurface* parent)
538
void mir_surface_spec_set_parent(MirSurfaceSpec* spec, MirSurface* parent)
150
520
try
539
try
151
521
{
540
{
152
541
    mir::require(spec);
153
522
    spec->parent = parent;
542
    spec->parent = parent;
154
523
}
543
}
155
524
catch (std::exception const& ex)
544
catch (std::exception const& ex)
156
525
545
157
=== modified file 'src/client/symbols.map'
158
--- src/client/symbols.map	2015-06-10 23:37:28 +0000
159
+++ src/client/symbols.map	2015-06-16 12:28:06 +0000
160
@@ -142,6 +142,7 @@
161
142
    mir_surface_spec_set_parent;
142
    mir_surface_spec_set_parent;
162
143
    mir_surface_spec_set_pixel_format;
143
    mir_surface_spec_set_pixel_format;
163
144
    mir_surface_spec_set_preferred_orientation;
144
    mir_surface_spec_set_preferred_orientation;
164
145
    mir_surface_spec_set_streams;
165
145
    mir_surface_spec_set_type;
146
    mir_surface_spec_set_type;
166
146
    mir_surface_spec_set_width;
147
    mir_surface_spec_set_width;
167
147
    mir_surface_spec_set_width_increment;
148
    mir_surface_spec_set_width_increment;
168
148
149
169
=== modified file 'src/server/frontend/session_mediator.cpp'
170
--- src/server/frontend/session_mediator.cpp	2015-06-09 07:20:56 +0000
171
+++ src/server/frontend/session_mediator.cpp	2015-06-16 12:28:06 +0000
172
@@ -451,15 +451,18 @@
173
451
    // max_aspect is a special case (below)
451
    // max_aspect is a special case (below)
174
452
452
175
453
#undef COPY_IF_SET
453
#undef COPY_IF_SET
178
454
    std::vector<msh::StreamSpecification> stream_spec;
454
    if (surface_specification.stream_size() > 0)
177
455
    for(auto& stream : surface_specification.stream())
179
456
    {
455
    {
184
457
        stream_spec.emplace_back(
456
        std::vector<msh::StreamSpecification> stream_spec;
185
458
            msh::StreamSpecification{
457
        for (auto& stream : surface_specification.stream())
186
459
                mf::BufferStreamId{stream.id().value()},
458
        {
187
460
                geom::Displacement{stream.displacement_x(), stream.displacement_y()}});
459
            stream_spec.emplace_back(
188
460
                msh::StreamSpecification{
189
461
                    mf::BufferStreamId{stream.id().value()},
190
462
                    geom::Displacement{stream.displacement_x(), stream.displacement_y()}});
191
463
        }
192
464
        mods.streams = std::move(stream_spec);
193
461
    }
465
    }
194
462
    mods.streams = std::move(stream_spec);
195
463
466
196
464
    if (surface_specification.has_aux_rect())
467
    if (surface_specification.has_aux_rect())
197
465
    {
468
    {
198
466
469
199
=== modified file 'src/server/scene/application_session.cpp'
200
--- src/server/scene/application_session.cpp	2015-06-02 13:41:40 +0000
201
+++ src/server/scene/application_session.cpp	2015-06-16 12:28:06 +0000
202
@@ -322,3 +322,12 @@
203
322
    std::unique_lock<std::mutex> lock(surfaces_and_streams_mutex);
322
    std::unique_lock<std::mutex> lock(surfaces_and_streams_mutex);
204
323
    streams.erase(checked_find(id));
323
    streams.erase(checked_find(id));
205
324
}
324
}
206
325
207
326
void ms::ApplicationSession::configure_streams(
208
327
    ms::Surface& surface, std::vector<shell::StreamSpecification> const& streams)
209
328
{
210
329
    std::list<ms::StreamInfo> list;
211
330
    for (auto& stream : streams)
212
331
        list.emplace_back(ms::StreamInfo{checked_find(stream.stream_id)->second, stream.displacement});
213
332
    surface.set_streams(list); 
214
333
}
215
325
334
216
=== modified file 'src/server/scene/application_session.h'
217
--- src/server/scene/application_session.h	2015-05-19 21:34:34 +0000
218
+++ src/server/scene/application_session.h	2015-06-16 12:28:06 +0000
219
@@ -85,6 +85,7 @@
220
85
    std::shared_ptr<frontend::BufferStream> get_buffer_stream(frontend::BufferStreamId stream) const override;
85
    std::shared_ptr<frontend::BufferStream> get_buffer_stream(frontend::BufferStreamId stream) const override;
221
86
    frontend::BufferStreamId create_buffer_stream(graphics::BufferProperties const& params) override;
86
    frontend::BufferStreamId create_buffer_stream(graphics::BufferProperties const& params) override;
222
87
    void destroy_buffer_stream(frontend::BufferStreamId stream) override;
87
    void destroy_buffer_stream(frontend::BufferStreamId stream) override;
223
88
    void configure_streams(Surface& surface, std::vector<shell::StreamSpecification> const& config) override;
224
88
89
225
89
protected:
90
protected:
226
90
    ApplicationSession(ApplicationSession const&) = delete;
91
    ApplicationSession(ApplicationSession const&) = delete;
227
91
92
228
=== modified file 'src/server/scene/basic_surface.cpp'
229
--- src/server/scene/basic_surface.cpp	2015-06-08 17:22:32 +0000
230
+++ src/server/scene/basic_surface.cpp	2015-06-16 12:28:06 +0000
231
@@ -844,15 +844,18 @@
232
844
844
233
845
void ms::BasicSurface::set_streams(std::list<scene::StreamInfo> const& s)
845
void ms::BasicSurface::set_streams(std::list<scene::StreamInfo> const& s)
234
846
{
846
{
235
847
    std::unique_lock<std::mutex> lk(guard);
236
848
237
849
    if (s.end() == std::find_if(s.begin(), s.end(),
238
850
        [this] (ms::StreamInfo const& info) { return info.stream == surface_buffer_stream; }))
239
851
    {
847
    {
241
852
        BOOST_THROW_EXCEPTION(std::logic_error("cannot remove the created-with buffer stream yet"));
848
        std::unique_lock<std::mutex> lk(guard);
242
849
243
850
        if (s.end() == std::find_if(s.begin(), s.end(),
244
851
            [this] (ms::StreamInfo const& info) { return info.stream == surface_buffer_stream; }))
245
852
        {
246
853
            BOOST_THROW_EXCEPTION(std::logic_error("cannot remove the created-with buffer stream yet"));
247
854
        }
248
855
249
856
        layers = s;
250
853
    }
857
    }
253
854
858
    observers.moved_to(surface_rect.top_left);
252
855
    layers = s;
254
856
}
859
}
255
857
860
256
858
mg::RenderableList ms::BasicSurface::generate_renderables(mc::CompositorID id) const
861
mg::RenderableList ms::BasicSurface::generate_renderables(mc::CompositorID id) const
257
859
862
258
=== modified file 'src/server/shell/canonical_window_manager.cpp'
259
--- src/server/shell/canonical_window_manager.cpp	2015-06-11 09:41:30 +0000
260
+++ src/server/shell/canonical_window_manager.cpp	2015-06-16 12:28:06 +0000
261
@@ -274,7 +274,7 @@
262
274
}
274
}
263
275
275
264
276
void msh::CanonicalWindowManagerPolicy::handle_modify_surface(
276
void msh::CanonicalWindowManagerPolicy::handle_modify_surface(
266
277
    std::shared_ptr<scene::Session> const& /*session*/,
277
    std::shared_ptr<scene::Session> const& session,
267
278
    std::shared_ptr<scene::Surface> const& surface,
278
    std::shared_ptr<scene::Surface> const& surface,
268
279
    SurfaceSpecification const& modifications)
279
    SurfaceSpecification const& modifications)
269
280
{
280
{
270
@@ -369,6 +369,13 @@
271
369
    if (modifications.name.is_set())
369
    if (modifications.name.is_set())
272
370
        surface->rename(modifications.name.value());
370
        surface->rename(modifications.name.value());
273
371
371
274
372
    if (modifications.streams.is_set())
275
373
    {
276
374
        auto v = modifications.streams.value();
277
375
        std::vector<shell::StreamSpecification> l (v.begin(), v.end());
278
376
        session->configure_streams(*surface, l);
279
377
    }
280
378
281
372
    if (modifications.width.is_set() || modifications.height.is_set())
379
    if (modifications.width.is_set() || modifications.height.is_set())
282
373
    {
380
    {
283
374
        auto new_size = surface->size();
381
        auto new_size = surface->size();
284
375
382
285
=== modified file 'tests/acceptance-tests/CMakeLists.txt'
286
--- tests/acceptance-tests/CMakeLists.txt	2015-06-11 09:41:30 +0000
287
+++ tests/acceptance-tests/CMakeLists.txt	2015-06-16 12:28:06 +0000
288
@@ -32,6 +32,7 @@
289
32
  test_prompt_session_client_api.cpp
32
  test_prompt_session_client_api.cpp
290
33
  test_client_screencast.cpp
33
  test_client_screencast.cpp
291
34
  test_client_surface_visibility.cpp
34
  test_client_surface_visibility.cpp
292
35
  test_buffer_stream_arrangement.cpp
293
35
  test_client_with_custom_display_config_deadlock.cpp
36
  test_client_with_custom_display_config_deadlock.cpp
294
36
  test_server_without_active_outputs.cpp
37
  test_server_without_active_outputs.cpp
295
37
  test_server_startup.cpp
38
  test_server_startup.cpp
296
38
39
297
=== added file 'tests/acceptance-tests/test_buffer_stream_arrangement.cpp'
298
--- tests/acceptance-tests/test_buffer_stream_arrangement.cpp	1970-01-01 00:00:00 +0000
299
+++ tests/acceptance-tests/test_buffer_stream_arrangement.cpp	2015-06-16 12:28:06 +0000
300
@@ -0,0 +1,239 @@
301
1
/*
302
2
 * Copyright © 2015 Canonical Ltd.
303
3
 *
304
4
 * This program is free software: you can redistribute it and/or modify it
305
5
 * under the terms of the GNU General Public License version 3,
306
6
 * as published by the Free Software Foundation.
307
7
 *
308
8
 * This program is distributed in the hope that it will be useful,
309
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
310
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
311
11
 * GNU General Public License for more details.
312
12
 *
313
13
 * You should have received a copy of the GNU General Public License
314
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
315
15
 *
316
16
 * Authored by: Kevin DuBois <kevin.dubois@canonical.com>
317
17
 */
318
18
319
19
#include "mir_toolkit/mir_client_library.h"
320
20
#include "mir_test_framework/connected_client_with_a_surface.h"
321
21
#include "mir/compositor/display_buffer_compositor.h"
322
22
#include "mir/compositor/display_buffer_compositor_factory.h"
323
23
#include "mir/compositor/scene_element.h"
324
24
#include "mir/graphics/renderable.h"
325
25
#include "mir/graphics/cursor.h"
326
26
#include "mir/geometry/displacement.h"
327
27
328
28
#include <mutex>
329
29
#include <condition_variable>
330
30
#include <stdexcept>
331
31
#include <gtest/gtest.h>
332
32
#include <gmock/gmock.h>
333
33
334
34
namespace mtf = mir_test_framework;
335
35
namespace geom = mir::geometry;
336
36
namespace mc = mir::compositor;
337
37
namespace mg = mir::graphics;
338
38
namespace
339
39
{
340
40
341
41
MirPixelFormat an_available_format(MirConnection* connection)
342
42
{
343
43
    using namespace testing;
344
44
    MirPixelFormat format{mir_pixel_format_invalid};
345
45
    unsigned int valid_formats{0};
346
46
    mir_connection_get_available_surface_formats(connection, &format, 1, &valid_formats);
347
47
    return format;
348
48
}
349
49
350
50
struct Stream
351
51
{
352
52
    Stream(MirBufferStream* stream, geom::Point pt) :
353
53
        stream(stream),
354
54
        pos{pt},
355
55
        needs_release{false}
356
56
    {
357
57
        mir_buffer_stream_swap_buffers_sync(stream);
358
58
    }
359
59
360
60
    Stream(MirConnection* connection, geom::Rectangle rect) :
361
61
        stream(mir_connection_create_buffer_stream_sync(
362
62
            connection,
363
63
            rect.size.width.as_int(),
364
64
            rect.size.height.as_int(),
365
65
            an_available_format(connection),
366
66
            mir_buffer_usage_hardware)),
367
67
        pos{rect.top_left},
368
68
        needs_release{true}
369
69
    {
370
70
        mir_buffer_stream_swap_buffers_sync(stream);
371
71
    }
372
72
373
73
    ~Stream()
374
74
    {
375
75
        if (needs_release)
376
76
            mir_buffer_stream_release_sync(stream);
377
77
    }
378
78
379
79
    MirBufferStream* handle() const
380
80
    {
381
81
        return stream;
382
82
    }
383
83
384
84
    geom::Point position()
385
85
    {
386
86
        return pos;
387
87
    }
388
88
389
89
    Stream(Stream const&) = delete;
390
90
    Stream& operator=(Stream const&) = delete;
391
91
private:
392
92
    MirBufferStream* stream;
393
93
    geom::Point const pos;
394
94
    bool const needs_release;
395
95
};
396
96
397
97
struct Ordering
398
98
{
399
99
    void note_scene_element_sequence(mc::SceneElementSequence& sequence)
400
100
    {
401
101
        if (sequence.empty())
402
102
            return;
403
103
404
104
        std::unique_lock<decltype(mutex)> lk(mutex);
405
105
        displacements.clear();
406
106
407
107
        auto first_position = (*sequence.begin())->renderable()->screen_position().top_left;
408
108
        for (auto const& element : sequence)
409
109
            displacements.emplace_back(element->renderable()->screen_position().top_left - first_position);
410
110
        post_count++;
411
111
412
112
        cv.notify_all();
413
113
    }
414
114
415
115
    template<typename T, typename S>
416
116
    bool wait_for_another_post_within(std::chrono::duration<T,S> duration)
417
117
    {
418
118
        std::unique_lock<decltype(mutex)> lk(mutex);
419
119
        auto count = post_count + 1;
420
120
        return cv.wait_for(lk, duration, [this, count]{return (post_count >= count);});
421
121
    }
422
122
423
123
    std::vector<geom::Displacement> last_ordering()
424
124
    {
425
125
        return displacements;
426
126
    }
427
127
private:
428
128
    std::mutex mutex;
429
129
    std::condition_variable cv;
430
130
    unsigned int post_count{0};
431
131
    std::vector<geom::Displacement> displacements;
432
132
};
433
133
434
134
struct OrderTrackingDBC : mc::DisplayBufferCompositor
435
135
{
436
136
    OrderTrackingDBC(
437
137
        std::shared_ptr<mc::DisplayBufferCompositor> const& wrapped,
438
138
        std::shared_ptr<Ordering> const& ordering) :
439
139
        wrapped(wrapped),
440
140
        ordering(ordering)
441
141
    {
442
142
    }
443
143
444
144
    void composite(mc::SceneElementSequence&& scene_sequence) override
445
145
    {
446
146
        ordering->note_scene_element_sequence(scene_sequence);
447
147
        wrapped->composite(std::move(scene_sequence));
448
148
    }
449
149
450
150
    std::shared_ptr<mc::DisplayBufferCompositor> const wrapped;
451
151
    std::shared_ptr<Ordering> const ordering;
452
152
};
453
153
454
154
struct OrderTrackingDBCFactory : mc::DisplayBufferCompositorFactory
455
155
{
456
156
    OrderTrackingDBCFactory(
457
157
        std::shared_ptr<mc::DisplayBufferCompositorFactory> const& wrapped,
458
158
        std::shared_ptr<Ordering> const& ordering) :
459
159
        wrapped(wrapped),
460
160
        ordering(ordering)
461
161
    {
462
162
    }
463
163
464
164
    std::unique_ptr<mc::DisplayBufferCompositor> create_compositor_for(mg::DisplayBuffer& db) override
465
165
    {
466
166
        return std::make_unique<OrderTrackingDBC>(wrapped->create_compositor_for(db), ordering);
467
167
    }
468
168
469
169
    std::shared_ptr<OrderTrackingDBC> last_dbc{nullptr};
470
170
    std::shared_ptr<mc::DisplayBufferCompositorFactory> const wrapped;
471
171
    std::shared_ptr<Ordering> const ordering;
472
172
};
473
173
474
174
struct BufferStreamArrangement : mtf::ConnectedClientWithASurface
475
175
{
476
176
    void SetUp() override
477
177
    {
478
178
        ordering = std::make_shared<Ordering>();
479
179
        server.wrap_display_buffer_compositor_factory(
480
180
            [this](std::shared_ptr<mc::DisplayBufferCompositorFactory> const& wrapped)
481
181
            {
482
182
                order_tracker = std::make_shared<OrderTrackingDBCFactory>(wrapped, ordering);
483
183
                return order_tracker;
484
184
            });
485
185
486
186
        ConnectedClientWithASurface::SetUp();
487
187
        server.the_cursor()->hide();
488
188
489
189
        streams.emplace_back(
490
190
            std::make_unique<Stream>(mir_surface_get_buffer_stream(surface), geom::Point{0,0}));
491
191
        int const additional_streams{3};
492
192
        for (auto i = 0; i < additional_streams; i++)
493
193
        {
494
194
            geom::Size size{30 * i + 1, 40* i + 1};
495
195
            geom::Point position{i * 2, i * 3};
496
196
            streams.emplace_back(std::make_unique<Stream>(connection, geom::Rectangle{position, size}));
497
197
        }
498
198
    }
499
199
500
200
    void TearDown() override
501
201
    {
502
202
        streams.clear();
503
203
        ConnectedClientWithASurface::TearDown();
504
204
    }
505
205
506
206
    std::shared_ptr<Ordering> ordering;
507
207
    std::shared_ptr<OrderTrackingDBCFactory> order_tracker{nullptr};
508
208
    std::vector<std::unique_ptr<Stream>> streams;
509
209
};
510
210
}
511
211
512
212
TEST_F(BufferStreamArrangement, arrangements_are_applied)
513
213
{
514
214
    using namespace testing;
515
215
    std::vector<MirBufferStreamInfo> infos(streams.size());
516
216
    auto i = 0u;
517
217
    for (auto const& stream : streams)
518
218
    {
519
219
        infos[i++] = MirBufferStreamInfo{
520
220
            stream->handle(),
521
221
            stream->position().x.as_int(),
522
222
            stream->position().y.as_int()};
523
223
    }
524
224
525
225
    auto change_spec = mir_connection_create_spec_for_changes(connection);
526
226
    mir_surface_spec_set_streams(change_spec, infos.data(), infos.size());
527
227
    mir_surface_apply_spec(surface, change_spec);
528
228
    mir_surface_spec_release(change_spec);
529
229
530
230
    std::vector<geom::Displacement> displacements;
531
231
    for (auto& info : infos)
532
232
        displacements.emplace_back(geom::Displacement{info.displacement_x, info.displacement_y});
533
233
534
234
    //check that the compositor rendered correctly
535
235
    using namespace std::literals::chrono_literals;
536
236
    EXPECT_TRUE(ordering->wait_for_another_post_within(5s))
537
237
         << "timed out waiting for another post";
538
238
    EXPECT_THAT(ordering->last_ordering(), ContainerEq(displacements));
539
239
}
540
0
240
541
=== modified file 'tests/include/mir_test_doubles/mock_scene_session.h'
542
--- tests/include/mir_test_doubles/mock_scene_session.h	2015-05-19 21:34:34 +0000
543
+++ tests/include/mir_test_doubles/mock_scene_session.h	2015-06-16 12:28:06 +0000
544
@@ -20,6 +20,7 @@
545
20
#define MIR_TEST_DOUBLES_MOCK_SCENE_SESSION_H_
20
#define MIR_TEST_DOUBLES_MOCK_SCENE_SESSION_H_
546
21
21
547
22
#include "mir/scene/session.h"
22
#include "mir/scene/session.h"
548
23
#include "mir/scene/surface.h"
549
23
#include "mir/scene/surface_creation_parameters.h"
24
#include "mir/scene/surface_creation_parameters.h"
550
24
#include "mir/graphics/display_configuration.h"
25
#include "mir/graphics/display_configuration.h"
551
25
26
552
@@ -64,6 +65,7 @@
553
64
    MOCK_METHOD1(destroy_buffer_stream, void(frontend::BufferStreamId));
65
    MOCK_METHOD1(destroy_buffer_stream, void(frontend::BufferStreamId));
554
65
    MOCK_METHOD1(create_buffer_stream, frontend::BufferStreamId(graphics::BufferProperties const&));
66
    MOCK_METHOD1(create_buffer_stream, frontend::BufferStreamId(graphics::BufferProperties const&));
555
66
    
67
    
556
68
    MOCK_METHOD2(configure_streams, void(scene::Surface&, std::vector<shell::StreamSpecification> const&));
557
67
};
69
};
558
68
70
559
69
}
71
}
560
70
72
561
=== modified file 'tests/include/mir_test_doubles/mock_surface.h'
562
--- tests/include/mir_test_doubles/mock_surface.h	2015-06-08 17:28:38 +0000
563
+++ tests/include/mir_test_doubles/mock_surface.h	2015-06-16 12:28:06 +0000
564
@@ -74,6 +74,7 @@
565
74
    MOCK_METHOD1(consume, void(MirEvent const&));
74
    MOCK_METHOD1(consume, void(MirEvent const&));
566
75
75
567
76
    MOCK_CONST_METHOD0(primary_buffer_stream, std::shared_ptr<frontend::BufferStream>());
76
    MOCK_CONST_METHOD0(primary_buffer_stream, std::shared_ptr<frontend::BufferStream>());
568
77
    MOCK_METHOD1(set_streams, void(std::list<scene::StreamInfo> const&));
569
77
78
570
78
};
79
};
571
79
80
572
80
81
573
=== modified file 'tests/include/mir_test_doubles/stub_scene_session.h'
574
--- tests/include/mir_test_doubles/stub_scene_session.h	2015-05-19 21:34:34 +0000
575
+++ tests/include/mir_test_doubles/stub_scene_session.h	2015-06-16 12:28:06 +0000
576
@@ -117,6 +117,10 @@
577
117
        return frontend::BufferStreamId();
117
        return frontend::BufferStreamId();
578
118
    }
118
    }
579
119
119
580
120
    void configure_streams(scene::Surface&, std::vector<shell::StreamSpecification> const&)
581
121
    {
582
122
    }
583
123
584
120
    pid_t const pid;
124
    pid_t const pid;
585
121
};
125
};
586
122
126
587
123
127
588
=== modified file 'tests/unit-tests/scene/test_application_session.cpp'
589
--- tests/unit-tests/scene/test_application_session.cpp	2015-05-29 17:36:46 +0000
590
+++ tests/unit-tests/scene/test_application_session.cpp	2015-06-16 12:28:06 +0000
591
@@ -515,6 +515,53 @@
592
515
    session->destroy_surface(id);
515
    session->destroy_surface(id);
593
516
}
516
}
594
517
517
595
518
MATCHER(StreamEq, "")
596
519
{
597
520
    return (std::get<0>(arg).stream == std::get<1>(arg).stream) &&
598
521
        (std::get<0>(arg).displacement == std::get<1>(arg).displacement);
599
522
}
600
523
601
524
TEST_F(ApplicationSession, sets_and_looks_up_surface_streams)
602
525
{
603
526
    using namespace testing;
604
527
    NiceMock<MockBufferStreamFactory> mock_bufferstream_factory;
605
528
    NiceMock<MockSurfaceFactory> mock_surface_factory;
606
529
607
530
    auto mock_surface = make_mock_surface();
608
531
    EXPECT_CALL(mock_surface_factory, create_surface(_,_))
609
532
        .WillOnce(Return(mock_surface));
610
533
    
611
534
    std::array<std::shared_ptr<mc::BufferStream>,3> streams {{
612
535
        std::make_shared<mtd::StubBufferStream>(),
613
536
        std::make_shared<mtd::StubBufferStream>(),
614
537
        std::make_shared<mtd::StubBufferStream>()
615
538
    }};
616
539
    EXPECT_CALL(mock_bufferstream_factory, create_buffer_stream(_))
617
540
        .WillOnce(Return(streams[0]))
618
541
        .WillOnce(Return(streams[1]))
619
542
        .WillOnce(Return(streams[2]));
620
543
621
544
    auto stream_properties = mg::BufferProperties{{8,8}, mir_pixel_format_argb_8888, mg::BufferUsage::hardware};
622
545
    auto session = make_application_session(
623
546
        mt::fake_shared(mock_bufferstream_factory),
624
547
        mt::fake_shared(mock_surface_factory));
625
548
    auto stream_id0 = mf::BufferStreamId(session->create_surface(ms::a_surface().of_position({1,1})).as_value());
626
549
    auto stream_id1 = session->create_buffer_stream(stream_properties);
627
550
    auto stream_id2 = session->create_buffer_stream(stream_properties);
628
551
629
552
    std::list<ms::StreamInfo> info {
630
553
        {streams[2], geom::Displacement{0,3}},
631
554
        {streams[0], geom::Displacement{-1,1}},
632
555
        {streams[1], geom::Displacement{0,2}}
633
556
    };
634
557
    EXPECT_CALL(*mock_surface, set_streams(Pointwise(StreamEq(), info)));
635
558
    session->configure_streams(*mock_surface, {
636
559
        {stream_id2, geom::Displacement{0,3}},
637
560
        {stream_id0, geom::Displacement{-1,1}},
638
561
        {stream_id1, geom::Displacement{0,2}}
639
562
    });
640
563
}
641
564
642
518
TEST_F(ApplicationSession, buffer_stream_constructed_with_requested_parameters)
565
TEST_F(ApplicationSession, buffer_stream_constructed_with_requested_parameters)
643
519
{
566
{
644
520
    using namespace ::testing;
567
    using namespace ::testing;
Status:	Merged
Approved by:	Kevin DuBois on 2015-06-16
Approved revision:	no longer in the source branch.
Merged at revision:	2670
Proposed branch:	lp:~kdub/mir/multiple-bufferstream-api
Merge into:	lp:mir
Prerequisite:	lp:~kdub/mir/add-streams-to-surface
Diff against target:	644 lines (+402/-15) 18 files modified include/client/mir_toolkit/client_types.h (+10/-0) include/client/mir_toolkit/mir_surface.h (+22/-0) include/server/mir/scene/session.h (+3/-0) src/client/mir_surface.cpp (+13/-0) src/client/mir_surface.h (+1/-0) src/client/mir_surface_api.cpp (+20/-0) src/client/symbols.map (+1/-0) src/server/frontend/session_mediator.cpp (+10/-7) src/server/scene/application_session.cpp (+9/-0) src/server/scene/application_session.h (+1/-0) src/server/scene/basic_surface.cpp (+10/-7) src/server/shell/canonical_window_manager.cpp (+8/-1) tests/acceptance-tests/CMakeLists.txt (+1/-0) tests/acceptance-tests/test_buffer_stream_arrangement.cpp (+239/-0) tests/include/mir_test_doubles/mock_scene_session.h (+2/-0) tests/include/mir_test_doubles/mock_surface.h (+1/-0) tests/include/mir_test_doubles/stub_scene_session.h (+4/-0) tests/unit-tests/scene/test_application_session.cpp (+47/-0)
To merge this branch:	bzr merge lp:~kdub/mir/multiple-bufferstream-api
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Alberto Aguirre (community)			Approve on 2015-06-16
PS Jenkins bot (community)	continuous-integration		Approve on 2015-06-16
Alexandros Frantzis (community)		2015-06-04	Approve on 2015-06-10
Review via email: mp+261123@code.launchpad.net