Mir

Merge lp:~raof/mir/actually-call-input-receiver-report into lp:mir

  1. actually-call-input-receiver-report
  2. Merge into development-branch
Proposed by Chris Halse Rogers
Status: Merged
Approved by: Brandon Schaefer
Approved revision: no longer in the source branch.
Merged at revision: 4279
Proposed branch: lp:~raof/mir/actually-call-input-receiver-report
Merge into: lp:mir
Diff against target: 279 lines (+45/-2)
9 files modified
src/client/default_connection_configuration.cpp (+1/-1)
src/client/rpc/make_rpc_channel.h (+6/-0)
src/client/rpc/make_socket_rpc_channel.cpp (+2/-1)
src/client/rpc/mir_protobuf_rpc_channel.cpp (+6/-0)
src/client/rpc/mir_protobuf_rpc_channel.h (+10/-0)
tests/include/mir/test/test_protobuf_client.h (+8/-0)
tests/mir_test_doubles/test_protobuf_client.cpp (+2/-0)
tests/unit-tests/client/test_protobuf_rpc_channel.cpp (+6/-0)
tests/unit-tests/frontend/stress_protobuf_communicator.cpp (+4/-0)
To merge this branch: bzr merge lp:~raof/mir/actually-call-input-receiver-report
Reviewer Review Type Date Requested Status
Mir CI Bot continuous-integration Approve
Alan Griffiths Approve
Review via email: mp+331587@code.launchpad.net

Commit message

input: Make the client InputReceiverReport work

By actually calling it during event processing"

To post a comment you must log in.
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

LGTM

review: Approve
Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

PASSED: Continuous integration, rev:4276
https://mir-jenkins.ubuntu.com/job/mir-ci/3712/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/5090
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5328
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5316
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5316
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5316
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5135
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5135/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5135
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5135/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5135
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5135/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5135
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5135/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5135
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5135/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5135
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5135/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5135
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5135/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5135
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5135/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3712/rebuild

review: Approve (continuous-integration)
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

Was stuck for 16 hours... on some strange jenkins issues. Restarting

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/client/default_connection_configuration.cpp'
--- src/client/default_connection_configuration.cpp 2017-07-28 17:00:43 +0000
+++ src/client/default_connection_configuration.cpp 2017-09-29 16:27:00 +0000
@@ -71,7 +71,7 @@
71 return mcl::rpc::make_rpc_channel(71 return mcl::rpc::make_rpc_channel(
72 the_socket_file(), the_surface_map(), the_buffer_factory(),72 the_socket_file(), the_surface_map(), the_buffer_factory(),
73 the_display_configuration(), the_input_devices(), the_rpc_report(),73 the_display_configuration(), the_input_devices(), the_rpc_report(),
74 the_lifecycle_control(), the_ping_handler(),74 the_input_receiver_report(), the_lifecycle_control(), the_ping_handler(),
75 the_error_handler(), the_event_sink());75 the_error_handler(), the_event_sink());
76 });76 });
77}77}
7878
=== modified file 'src/client/rpc/make_rpc_channel.h'
--- src/client/rpc/make_rpc_channel.h 2017-07-28 17:00:43 +0000
+++ src/client/rpc/make_rpc_channel.h 2017-09-29 16:27:00 +0000
@@ -29,6 +29,11 @@
29namespace input29namespace input
30{30{
31class InputDevices;31class InputDevices;
32
33namespace receiver
34{
35class InputReceiverReport;
36}
32}37}
33namespace client38namespace client
34{39{
@@ -50,6 +55,7 @@
50 std::shared_ptr<DisplayConfiguration> const& disp_conf,55 std::shared_ptr<DisplayConfiguration> const& disp_conf,
51 std::shared_ptr<input::InputDevices> const& input_devices,56 std::shared_ptr<input::InputDevices> const& input_devices,
52 std::shared_ptr<RpcReport> const& rpc_report,57 std::shared_ptr<RpcReport> const& rpc_report,
58 std::shared_ptr<input::receiver::InputReceiverReport> const& input_report,
53 std::shared_ptr<LifecycleControl> const& lifecycle_control,59 std::shared_ptr<LifecycleControl> const& lifecycle_control,
54 std::shared_ptr<PingHandler> const& ping_handler,60 std::shared_ptr<PingHandler> const& ping_handler,
55 std::shared_ptr<ErrorHandler> const& error_handler,61 std::shared_ptr<ErrorHandler> const& error_handler,
5662
=== modified file 'src/client/rpc/make_socket_rpc_channel.cpp'
--- src/client/rpc/make_socket_rpc_channel.cpp 2017-07-28 17:00:43 +0000
+++ src/client/rpc/make_socket_rpc_channel.cpp 2017-09-29 16:27:00 +0000
@@ -48,6 +48,7 @@
48 std::shared_ptr<mcl::DisplayConfiguration> const& disp_conf,48 std::shared_ptr<mcl::DisplayConfiguration> const& disp_conf,
49 std::shared_ptr<input::InputDevices> const& input_devices,49 std::shared_ptr<input::InputDevices> const& input_devices,
50 std::shared_ptr<RpcReport> const& rpc_report,50 std::shared_ptr<RpcReport> const& rpc_report,
51 std::shared_ptr<input::receiver::InputReceiverReport> const& input_report,
51 std::shared_ptr<mcl::LifecycleControl> const& lifecycle_control,52 std::shared_ptr<mcl::LifecycleControl> const& lifecycle_control,
52 std::shared_ptr<mcl::PingHandler> const& ping_handler,53 std::shared_ptr<mcl::PingHandler> const& ping_handler,
53 std::shared_ptr<mcl::ErrorHandler> const& error_handler,54 std::shared_ptr<mcl::ErrorHandler> const& error_handler,
@@ -65,6 +66,6 @@
65 }66 }
66 return std::make_shared<MirProtobufRpcChannel>(67 return std::make_shared<MirProtobufRpcChannel>(
67 std::move(transport), map, buffer_factory, disp_conf,68 std::move(transport), map, buffer_factory, disp_conf,
68 input_devices, rpc_report, lifecycle_control, ping_handler,69 input_devices, rpc_report, input_report, lifecycle_control, ping_handler,
69 error_handler, event_sink);70 error_handler, event_sink);
70}71}
7172
=== modified file 'src/client/rpc/mir_protobuf_rpc_channel.cpp'
--- src/client/rpc/mir_protobuf_rpc_channel.cpp 2017-07-28 17:00:43 +0000
+++ src/client/rpc/mir_protobuf_rpc_channel.cpp 2017-09-29 16:27:00 +0000
@@ -18,6 +18,7 @@
1818
19#include "mir_protobuf_rpc_channel.h"19#include "mir_protobuf_rpc_channel.h"
20#include "rpc_report.h"20#include "rpc_report.h"
21#include "mir/input/input_receiver_report.h"
2122
22#include "mir/client/surface_map.h"23#include "mir/client/surface_map.h"
23#include "../buffer.h"24#include "../buffer.h"
@@ -61,12 +62,14 @@
61 std::shared_ptr<DisplayConfiguration> const& disp_config,62 std::shared_ptr<DisplayConfiguration> const& disp_config,
62 std::shared_ptr<input::InputDevices> const& input_devices,63 std::shared_ptr<input::InputDevices> const& input_devices,
63 std::shared_ptr<RpcReport> const& rpc_report,64 std::shared_ptr<RpcReport> const& rpc_report,
65 std::shared_ptr<input::receiver::InputReceiverReport> const& input_report,
64 std::shared_ptr<LifecycleControl> const& lifecycle_control,66 std::shared_ptr<LifecycleControl> const& lifecycle_control,
65 std::shared_ptr<PingHandler> const& ping_handler,67 std::shared_ptr<PingHandler> const& ping_handler,
66 std::shared_ptr<ErrorHandler> const& error_handler,68 std::shared_ptr<ErrorHandler> const& error_handler,
67 std::shared_ptr<EventSink> const& event_sink) :69 std::shared_ptr<EventSink> const& event_sink) :
68 rpc_report(rpc_report),70 rpc_report(rpc_report),
69 pending_calls(rpc_report),71 pending_calls(rpc_report),
72 input_report(input_report),
70 surface_map(surface_map),73 surface_map(surface_map),
71 buffer_factory(buffer_factory),74 buffer_factory(buffer_factory),
72 display_configuration(disp_config),75 display_configuration(disp_config),
@@ -426,6 +429,7 @@
426 window_id = e->to_close_window()->surface_id();429 window_id = e->to_close_window()->surface_id();
427 break;430 break;
428 case mir_event_type_keymap:431 case mir_event_type_keymap:
432 input_report->received_event(*e);
429 window_id = e->to_keymap()->surface_id();433 window_id = e->to_keymap()->surface_id();
430 break;434 break;
431 case mir_event_type_window_output:435 case mir_event_type_window_output:
@@ -435,9 +439,11 @@
435 window_id = e->to_window_placement()->id();439 window_id = e->to_window_placement()->id();
436 break;440 break;
437 case mir_event_type_input:441 case mir_event_type_input:
442 input_report->received_event(*e);
438 window_id = e->to_input()->window_id();443 window_id = e->to_input()->window_id();
439 break;444 break;
440 case mir_event_type_input_device_state:445 case mir_event_type_input_device_state:
446 input_report->received_event(*e);
441 window_id = e->to_input_device_state()->window_id();447 window_id = e->to_input_device_state()->window_id();
442 break;448 break;
443 default:449 default:
444450
=== modified file 'src/client/rpc/mir_protobuf_rpc_channel.h'
--- src/client/rpc/mir_protobuf_rpc_channel.h 2017-07-28 17:00:43 +0000
+++ src/client/rpc/mir_protobuf_rpc_channel.h 2017-09-29 16:27:00 +0000
@@ -39,6 +39,12 @@
39namespace input39namespace input
40{40{
41class InputDevices;41class InputDevices;
42
43namespace receiver
44{
45class InputReceiverReport;
46}
47
42}48}
43namespace client49namespace client
44{50{
@@ -46,6 +52,7 @@
46class SurfaceMap;52class SurfaceMap;
47class EventSink;53class EventSink;
48class AsyncBufferFactory;54class AsyncBufferFactory;
55
49namespace rpc56namespace rpc
50{57{
5158
@@ -63,6 +70,7 @@
63 std::shared_ptr<DisplayConfiguration> const& disp_config,70 std::shared_ptr<DisplayConfiguration> const& disp_config,
64 std::shared_ptr<input::InputDevices> const& input_devices,71 std::shared_ptr<input::InputDevices> const& input_devices,
65 std::shared_ptr<RpcReport> const& rpc_report,72 std::shared_ptr<RpcReport> const& rpc_report,
73 std::shared_ptr<input::receiver::InputReceiverReport> const& input_report,
66 std::shared_ptr<LifecycleControl> const& lifecycle_control,74 std::shared_ptr<LifecycleControl> const& lifecycle_control,
67 std::shared_ptr<PingHandler> const& ping_handler,75 std::shared_ptr<PingHandler> const& ping_handler,
68 std::shared_ptr<ErrorHandler> const& error_handler,76 std::shared_ptr<ErrorHandler> const& error_handler,
@@ -105,6 +113,8 @@
105 std::shared_ptr<RpcReport> const rpc_report;113 std::shared_ptr<RpcReport> const rpc_report;
106 detail::PendingCallCache pending_calls;114 detail::PendingCallCache pending_calls;
107115
116 std::shared_ptr<input::receiver::InputReceiverReport> const input_report;
117
108 std::mutex discard_mutex;118 std::mutex discard_mutex;
109 bool discard{false};119 bool discard{false};
110120
111121
=== modified file 'tests/include/mir/test/test_protobuf_client.h'
--- tests/include/mir/test/test_protobuf_client.h 2017-07-28 17:00:43 +0000
+++ tests/include/mir/test/test_protobuf_client.h 2017-09-29 16:27:00 +0000
@@ -33,6 +33,13 @@
3333
34namespace mir34namespace mir
35{35{
36namespace input
37{
38namespace receiver
39{
40class NullInputReceiverReport;
41}
42}
36namespace client43namespace client
37{44{
38class SurfaceMap;45class SurfaceMap;
@@ -53,6 +60,7 @@
53 TestProtobufClient(std::string socket_file, int timeout_ms);60 TestProtobufClient(std::string socket_file, int timeout_ms);
5461
55 std::shared_ptr<doubles::MockRpcReport> rpc_report;62 std::shared_ptr<doubles::MockRpcReport> rpc_report;
63 std::shared_ptr<input::receiver::NullInputReceiverReport> input_report;
56 std::shared_ptr<mir::client::SurfaceMap> surface_map;64 std::shared_ptr<mir::client::SurfaceMap> surface_map;
57 std::shared_ptr<mir::client::rpc::MirBasicRpcChannel> channel;65 std::shared_ptr<mir::client::rpc::MirBasicRpcChannel> channel;
58 std::shared_ptr<dispatch::ThreadedDispatcher> eventloop;66 std::shared_ptr<dispatch::ThreadedDispatcher> eventloop;
5967
=== modified file 'tests/mir_test_doubles/test_protobuf_client.cpp'
--- tests/mir_test_doubles/test_protobuf_client.cpp 2017-07-28 17:00:43 +0000
+++ tests/mir_test_doubles/test_protobuf_client.cpp 2017-09-29 16:27:00 +0000
@@ -18,6 +18,7 @@
1818
19#include "mir/test/test_protobuf_client.h"19#include "mir/test/test_protobuf_client.h"
20#include "mir/test/doubles/mock_rpc_report.h"20#include "mir/test/doubles/mock_rpc_report.h"
21#include "mir/input/null_input_receiver_report.h"
21#include "mir/test/doubles/null_client_event_sink.h"22#include "mir/test/doubles/null_client_event_sink.h"
2223
23#include "src/client/connection_surface_map.h"24#include "src/client/connection_surface_map.h"
@@ -50,6 +51,7 @@
50 std::make_shared<mir::client::DisplayConfiguration>(),51 std::make_shared<mir::client::DisplayConfiguration>(),
51 std::make_shared<mir::input::InputDevices>(surface_map),52 std::make_shared<mir::input::InputDevices>(surface_map),
52 rpc_report,53 rpc_report,
54 input_report,
53 std::make_shared<mir::client::LifecycleControl>(),55 std::make_shared<mir::client::LifecycleControl>(),
54 std::make_shared<mir::client::AtomicCallback<int32_t>>(),56 std::make_shared<mir::client::AtomicCallback<int32_t>>(),
55 std::make_shared<mir::client::AtomicCallback<MirError const*>>(),57 std::make_shared<mir::client::AtomicCallback<MirError const*>>(),
5658
=== modified file 'tests/unit-tests/client/test_protobuf_rpc_channel.cpp'
--- tests/unit-tests/client/test_protobuf_rpc_channel.cpp 2017-07-28 17:00:43 +0000
+++ tests/unit-tests/client/test_protobuf_rpc_channel.cpp 2017-09-29 16:27:00 +0000
@@ -31,6 +31,7 @@
31#include "mir/client/surface_map.h"31#include "mir/client/surface_map.h"
32#include "mir/input/input_devices.h"32#include "mir/input/input_devices.h"
3333
34#include "mir/input/null_input_receiver_report.h"
34#include "mir/test/doubles/null_client_event_sink.h"35#include "mir/test/doubles/null_client_event_sink.h"
35#include "mir/test/doubles/mock_mir_buffer_stream.h"36#include "mir/test/doubles/mock_mir_buffer_stream.h"
36#include "mir/test/doubles/mock_client_buffer.h"37#include "mir/test/doubles/mock_client_buffer.h"
@@ -248,6 +249,7 @@
248 std::make_shared<mcl::DisplayConfiguration>(),249 std::make_shared<mcl::DisplayConfiguration>(),
249 std::make_shared<mir::input::InputDevices>(surface_map),250 std::make_shared<mir::input::InputDevices>(surface_map),
250 std::make_shared<mclr::NullRpcReport>(),251 std::make_shared<mclr::NullRpcReport>(),
252 std::make_shared<mir::input::receiver::NullInputReceiverReport>(),
251 lifecycle,253 lifecycle,
252 std::make_shared<mir::client::PingHandler>(),254 std::make_shared<mir::client::PingHandler>(),
253 std::make_shared<mir::client::ErrorHandler>(),255 std::make_shared<mir::client::ErrorHandler>(),
@@ -404,6 +406,7 @@
404 std::make_shared<mcl::DisplayConfiguration>(),406 std::make_shared<mcl::DisplayConfiguration>(),
405 std::make_shared<mir::input::InputDevices>(stream_map),407 std::make_shared<mir::input::InputDevices>(stream_map),
406 std::make_shared<mclr::NullRpcReport>(),408 std::make_shared<mclr::NullRpcReport>(),
409 std::make_shared<mir::input::receiver::NullInputReceiverReport>(),
407 lifecycle,410 lifecycle,
408 std::make_shared<mir::client::PingHandler>(),411 std::make_shared<mir::client::PingHandler>(),
409 std::make_shared<mir::client::ErrorHandler>(),412 std::make_shared<mir::client::ErrorHandler>(),
@@ -760,6 +763,7 @@
760 std::make_shared<mcl::DisplayConfiguration>(),763 std::make_shared<mcl::DisplayConfiguration>(),
761 std::make_shared<mir::input::InputDevices>(stream_map),764 std::make_shared<mir::input::InputDevices>(stream_map),
762 std::make_shared<mclr::NullRpcReport>(),765 std::make_shared<mclr::NullRpcReport>(),
766 std::make_shared<mir::input::receiver::NullInputReceiverReport>(),
763 lifecycle,767 lifecycle,
764 std::make_shared<mir::client::PingHandler>(),768 std::make_shared<mir::client::PingHandler>(),
765 std::make_shared<mir::client::ErrorHandler>(),769 std::make_shared<mir::client::ErrorHandler>(),
@@ -798,6 +802,7 @@
798 std::make_shared<mcl::DisplayConfiguration>(),802 std::make_shared<mcl::DisplayConfiguration>(),
799 std::make_shared<mir::input::InputDevices>(stream_map),803 std::make_shared<mir::input::InputDevices>(stream_map),
800 std::make_shared<mclr::NullRpcReport>(),804 std::make_shared<mclr::NullRpcReport>(),
805 std::make_shared<mir::input::receiver::NullInputReceiverReport>(),
801 lifecycle,806 lifecycle,
802 std::make_shared<mir::client::PingHandler>(),807 std::make_shared<mir::client::PingHandler>(),
803 std::make_shared<mir::client::ErrorHandler>(),808 std::make_shared<mir::client::ErrorHandler>(),
@@ -834,6 +839,7 @@
834 std::make_shared<mcl::DisplayConfiguration>(),839 std::make_shared<mcl::DisplayConfiguration>(),
835 std::make_shared<mir::input::InputDevices>(stream_map),840 std::make_shared<mir::input::InputDevices>(stream_map),
836 std::make_shared<mclr::NullRpcReport>(),841 std::make_shared<mclr::NullRpcReport>(),
842 std::make_shared<mir::input::receiver::NullInputReceiverReport>(),
837 lifecycle,843 lifecycle,
838 std::make_shared<mir::client::PingHandler>(),844 std::make_shared<mir::client::PingHandler>(),
839 std::make_shared<mir::client::ErrorHandler>(),845 std::make_shared<mir::client::ErrorHandler>(),
840846
=== modified file 'tests/unit-tests/frontend/stress_protobuf_communicator.cpp'
--- tests/unit-tests/frontend/stress_protobuf_communicator.cpp 2017-07-28 17:00:43 +0000
+++ tests/unit-tests/frontend/stress_protobuf_communicator.cpp 2017-09-29 16:27:00 +0000
@@ -37,6 +37,7 @@
37#include "src/client/rpc/mir_display_server.h"37#include "src/client/rpc/mir_display_server.h"
38#include "src/client/buffer_factory.h"38#include "src/client/buffer_factory.h"
39#include "mir/input/input_devices.h"39#include "mir/input/input_devices.h"
40#include "mir/input/null_input_receiver_report.h"
4041
41#include <gtest/gtest.h>42#include <gtest/gtest.h>
42#include <gmock/gmock.h>43#include <gmock/gmock.h>
@@ -59,6 +60,7 @@
59 StubProtobufClient(std::string socket_file, int timeout_ms);60 StubProtobufClient(std::string socket_file, int timeout_ms);
6061
61 std::shared_ptr<mir::client::rpc::RpcReport> rpc_report;62 std::shared_ptr<mir::client::rpc::RpcReport> rpc_report;
63 std::shared_ptr<mir::input::receiver::InputReceiverReport> input_report;
62 std::shared_ptr<mir::client::SurfaceMap> surface_map;64 std::shared_ptr<mir::client::SurfaceMap> surface_map;
63 std::shared_ptr<mir::client::rpc::MirBasicRpcChannel> channel;65 std::shared_ptr<mir::client::rpc::MirBasicRpcChannel> channel;
64 mir::client::rpc::DisplayServer display_server;66 mir::client::rpc::DisplayServer display_server;
@@ -163,6 +165,7 @@
163 std::string socket_file,165 std::string socket_file,
164 int timeout_ms) :166 int timeout_ms) :
165 rpc_report(std::make_shared<mir::client::rpc::NullRpcReport>()),167 rpc_report(std::make_shared<mir::client::rpc::NullRpcReport>()),
168 input_report(std::make_shared<mir::input::receiver::NullInputReceiverReport>()),
166 surface_map(std::make_shared<mir::client::ConnectionSurfaceMap>()),169 surface_map(std::make_shared<mir::client::ConnectionSurfaceMap>()),
167 channel(mir::client::rpc::make_rpc_channel(170 channel(mir::client::rpc::make_rpc_channel(
168 socket_file,171 socket_file,
@@ -171,6 +174,7 @@
171 std::make_shared<mir::client::DisplayConfiguration>(),174 std::make_shared<mir::client::DisplayConfiguration>(),
172 std::make_shared<mir::input::InputDevices>(surface_map),175 std::make_shared<mir::input::InputDevices>(surface_map),
173 rpc_report,176 rpc_report,
177 input_report,
174 std::make_shared<mir::client::LifecycleControl>(),178 std::make_shared<mir::client::LifecycleControl>(),
175 std::make_shared<mir::client::PingHandler>(),179 std::make_shared<mir::client::PingHandler>(),
176 std::make_shared<mir::client::ErrorHandler>(),180 std::make_shared<mir::client::ErrorHandler>(),

Subscribers

People subscribed via source and target branches