← Back to branch summary

~saviq/mir/ubuntu-virtual-unknown

« back to all changes in this revision

Viewing changes to src/server/frontend/session_mediator.cpp

  • Committer: CI Train Bot
  • Author(s): Christopher James Halse Rogers, Daniel van Vugt, Andreas Pokorny, Kevin Gunn, Alberto Aguirre, Alan Griffiths, raof at ubuntu, CI Train Bot, Cemil Azizoglu, Kevin DuBois, Kevin, Alexandros Frantzis, Alfonso Sanchez-Beato
  • Date: 2016-03-30 00:23:12 UTC
  • mfrom: (1160.2170.114 0.21)
  • Revision ID: ci-train-bot@canonical.com-20160330002312-47z3hdu0bfj3ii1z
Mir 0.21.0 release
Approved by: Daniel van Vugt, Alan Griffiths

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/server/frontend/session_mediator.cpp
46
46
#include "mir/frontend/screencast.h"
47
47
#include "mir/frontend/prompt_session.h"
48
48
#include "mir/frontend/buffer_stream.h"
 
49
#include "mir/input/input_device_hub.h"
 
50
#include "mir/input/device.h"
49
51
#include "mir/scene/prompt_session_creation_parameters.h"
50
52
#include "mir/fd.h"
51
53
#include "mir/cookie/authority.h"
89
91
    std::shared_ptr<mi::CursorImages> const& cursor_images,
90
92
    std::shared_ptr<scene::CoordinateTranslator> const& translator,
91
93
    std::shared_ptr<scene::ApplicationNotRespondingDetector> const& anr_detector,
92
 
    std::shared_ptr<mir::cookie::Authority> const& cookie_authority) :
 
94
    std::shared_ptr<mir::cookie::Authority> const& cookie_authority,
 
95
    std::shared_ptr<mir::input::InputDeviceHub> const& hub) :
93
96
    client_pid_(0),
94
97
    shell(shell),
95
98
    ipc_operations(ipc_operations),
106
109
    translator{translator},
107
110
    anr_detector{anr_detector},
108
111
    cookie_authority(cookie_authority),
 
112
    hub(hub),
109
113
    buffer_stream_tracker{static_cast<size_t>(client_buffer_cache_size)}
110
114
{
111
115
}
159
163
    auto protobuf_config = response->mutable_display_configuration();
160
164
    mfd::pack_protobuf_display_configuration(*protobuf_config, *display_config);
161
165
 
 
166
    hub->for_each_input_device(
 
167
        [response](auto const& dev)
 
168
        {
 
169
            auto dev_info = response->add_input_devices();
 
170
            dev_info->set_name(dev.name());
 
171
            dev_info->set_id(dev.id());
 
172
            dev_info->set_unique_id(dev.unique_id());
 
173
            dev_info->set_capabilities(dev.capabilities().value());
 
174
        });
 
175
 
162
176
    for (auto pf : surface_pixel_formats)
163
177
        response->add_surface_pixel_format(static_cast<::google::protobuf::uint32>(pf));
164
178