← Back to branch summary

~mir-team/mir/x11-multi-window

« back to all changes in this revision

Viewing changes to src/server/scene/surface_allocator.cpp

  • Committer: Andreas Pokorny
  • Date: 2017-02-15 14:45:41 UTC
  • mto: This revision was merged to the branch mainline in revision 4036.
  • Revision ID: andreas.pokorny@canonical.com-20170215144541-f0i749qairmbt9yv
mirserver: remove android-input and mirserver parts no longer neede

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/server/scene/surface_allocator.cpp
19
19
#include "surface_allocator.h"
20
20
#include "mir/scene/buffer_stream_factory.h"
21
21
#include "mir/compositor/buffer_stream.h"
22
 
#include "mir/input/input_channel_factory.h"
23
22
#include "basic_surface.h"
24
23
 
25
24
namespace geom=mir::geometry;
30
29
namespace mi=mir::input;
31
30
 
32
31
ms::SurfaceAllocator::SurfaceAllocator(
33
 
    std::shared_ptr<input::InputChannelFactory> const& input_factory,
34
 
    std::shared_ptr<input::InputSender> const& input_sender,
35
32
    std::shared_ptr<mg::CursorImage> const& default_cursor_image,
36
33
    std::shared_ptr<SceneReport> const& report) :
37
 
    input_factory(input_factory),
38
 
    input_sender(input_sender),
39
34
    default_cursor_image(default_cursor_image),
40
35
    report(report)
41
36
{
45
40
    std::list<ms::StreamInfo> const& streams,
46
41
    SurfaceCreationParameters const& params)
47
42
{
48
 
    auto input_channel = input_factory->make_input_channel();
49
43
    auto confine = params.confine_pointer.is_set() ? params.confine_pointer.value() : mir_pointer_unconfined;
50
44
    auto const surface = std::make_shared<BasicSurface>(
51
45
        params.name,
53
47
        params.parent,
54
48
        confine,
55
49
        streams,
56
 
        input_channel,
57
 
        input_sender,
58
50
        default_cursor_image,
59
51
        report);
60
52