Mir

Merge lp:~andreas-pokorny/mir/07-csdi-rpc-for-setting-input-device-configurations into lp:mir

07-csdi-rpc-for-setting-input-device-configurations
Merge into development-branch

Proposed by Andreas Pokorny on 2016-11-11

Status:	Work in progress
Proposed branch:	lp:~andreas-pokorny/mir/07-csdi-rpc-for-setting-input-device-configurations
Merge into:	lp:mir
Prerequisite:	lp:~andreas-pokorny/mir/06-csdi-client-api-for-input-device-settings
Diff against target:	1066 lines (+419/-20) 46 files modified include/client/mir_toolkit/mir_connection.h (+14/-0) include/server/mir/frontend/session_mediator_observer.h (+2/-0) include/server/mir/input/input_device_hub.h (+1/-0) include/test/mir/test/doubles/mock_input_device_hub.h (+1/-1) src/client/logging/rpc_report.cpp (+14/-3) src/client/logging/rpc_report.h (+1/-0) src/client/lttng/rpc_report.cpp (+4/-0) src/client/lttng/rpc_report.h (+1/-0) src/client/mir_connection.cpp (+12/-0) src/client/mir_connection.h (+1/-0) src/client/mir_connection_api.cpp (+16/-1) src/client/rpc/mir_display_server.cpp (+7/-0) src/client/rpc/mir_display_server.h (+4/-0) src/client/rpc/mir_protobuf_rpc_channel.cpp (+1/-0) src/client/rpc/null_rpc_report.cpp (+5/-0) src/client/rpc/null_rpc_report.h (+1/-1) src/client/rpc/rpc_report.h (+2/-0) src/client/symbols.map (+1/-0) src/include/common/mir/protobuf/display_server.h (+4/-0) src/protobuf/mir_protobuf.proto (+6/-0) src/protobuf/symbols.map (+25/-9) src/server/frontend/protobuf_input_converter.cpp (+29/-0) src/server/frontend/protobuf_input_converter.h (+2/-0) src/server/frontend/protobuf_message_processor.cpp (+4/-0) src/server/frontend/session_mediator.cpp (+22/-0) src/server/frontend/session_mediator.h (+4/-0) src/server/frontend/session_mediator_observer_multiplexer.cpp (+7/-0) src/server/frontend/session_mediator_observer_multiplexer.h (+2/-0) src/server/input/default_device.cpp (+15/-2) src/server/input/default_device.h (+7/-0) src/server/input/default_input_device_hub.cpp (+73/-1) src/server/input/default_input_device_hub.h (+6/-0) src/server/report/logging/session_mediator_report.cpp (+5/-0) src/server/report/logging/session_mediator_report.h (+2/-0) src/server/report/lttng/session_mediator_report.cpp (+1/-0) src/server/report/lttng/session_mediator_report.h (+1/-0) src/server/report/lttng/session_mediator_report_tp.h (+1/-0) src/server/report/null/session_mediator_report.cpp (+4/-0) src/server/report/null/session_mediator_report.h (+2/-0) tests/acceptance-tests/test_client_input.cpp (+36/-2) tests/acceptance-tests/test_nested_mir.cpp (+1/-0) tests/acceptance-tests/test_session_mediator_report.cpp (+1/-0) tests/include/mir/test/doubles/mock_rpc_report.h (+4/-0) tests/include/mir/test/doubles/stub_display_server.h (+5/-0) tests/include/mir/test/stub_server_tool.h (+8/-0) tests/unit-tests/input/test_default_input_device_hub.cpp (+54/-0)
To merge this branch:	bzr merge lp:~andreas-pokorny/mir/07-csdi-rpc-for-setting-input-device-configurations
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration		Approve on 2016-11-18
Mir development team		2016-11-11	Pending
Review via email: mp+310640@code.launchpad.net

Commit message

Add client server RPC code to apply input device changes done by a client

This change adds code to transport input device configurations from clients back to the server, using a new rpc. On the server side the changed configuration is forwarded to the respective input device.

Description of the change

This change adds RPC to apply configuration changes of a single device.

So the process for a client would be to get the current configuration of all devices, search for relevant devices. Inspect and update the retrieved configuration, and then apply the configuration of the devices that should be changed.

The following has been left out - and is to be added with upcoming MPs
* Forwardng configuration changes through nested
* Allowing the shell to filter or deny configuration changes..

Not considered by this API yet:
* Storing configuration changes inside sessions, and applying those on session switch - I do not see a use case for that, I think nested platforms and uss are usually the main users of that API
* Letting clients configure the keymap that should be used for each keyboard

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-11-11:

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

review: Needs Fixing (continuous-integration)

lp:~andreas-pokorny/mir/07-csdi-rpc-for-setting-input-device-configurations updated on 2016-11-11

3801. By Andreas Pokorny on 2016-11-11: merge lp:mir

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-11-11:

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

review: Needs Fixing (continuous-integration)

lp:~andreas-pokorny/mir/07-csdi-rpc-for-setting-input-device-configurations updated on 2016-11-11

3802. By Andreas Pokorny on 2016-11-11: release input device config in test case

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-11-11:

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

review: Approve (continuous-integration)

lp:~andreas-pokorny/mir/07-csdi-rpc-for-setting-input-device-configurations updated on 2016-11-15

3803. By Andreas Pokorny on 2016-11-15: merge prereq

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-11-15:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-11-18:

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

review: Needs Fixing (continuous-integration)

lp:~andreas-pokorny/mir/07-csdi-rpc-for-setting-input-device-configurations updated on 2016-11-18

3804. By Andreas Pokorny on 2016-11-18: merge lp:mir and adapt to observer reports

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-11-18:

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

review: Approve (continuous-integration)

Revision history for this message

Andreas Pokorny (andreas-pokorny) wrote on 2016-11-21:

Ok I have to rework the way configuration is stored inside the server -
I think that will make me revisit the RPC again.. so back to WIP

Unmerged revisions

3804. By Andreas Pokorny on 2016-11-18: merge lp:mir and adapt to observer reports
3803. By Andreas Pokorny on 2016-11-15: merge prereq
3802. By Andreas Pokorny on 2016-11-11: release input device config in test case
3801. By Andreas Pokorny on 2016-11-11: merge lp:mir
3800. By Andreas Pokorny on 2016-11-11: merge prereq
3799. By Andreas Pokorny on 2016-11-11: update prereq
3798. By Andreas Pokorny on 2016-11-08: get changes from lp:mir
3797. By Andreas Pokorny on 2016-11-03: use rpc channel
3796. By Andreas Pokorny on 2016-11-03: Extend RPC Report
3795. By Andreas Pokorny on 2016-11-03: more reports

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Andreas Pokorny

Emanuele Antonio Faraone

Gerry Boland

Mir development team

 === modified file 'include/client/mir_toolkit/mir_connection.h'
 --- include/client/mir_toolkit/mir_connection.h	2016-10-12 06:03:15 +0000
 +++ include/client/mir_toolkit/mir_connection.h	2016-11-18 09:52:03 +0000
@@ -360,6 +360,20 @@
  MirInputConfig* mir_connection_create_input_config(MirConnection *connection);
  /**
++ * Apply the input configuration for a device
++ *
++ * Configure the behavior of input device attached to a server. This does not
++ * only affect the input device when events are dispatched to surfaces of this
++ * connection, but the behavior of the devices in general.
++ *
++ *   \warning This request may be denied. Check that the request succeeded with mir_connection_get_error_message.
++ *   \param [in] connection             The connection
++ *   \param [in] device                 The input device
++ */
++void mir_connection_apply_input_device_configuration(
++    MirConnection* connection, MirInputDevice const* device);
++
++/**
   * Release this snapshot of the input configuration.
   * This invalidates any pointers retrieved from this structure.
+  *
 === modified file 'include/server/mir/frontend/session_mediator_observer.h'
 --- include/server/mir/frontend/session_mediator_observer.h	2016-11-02 05:07:18 +0000
 +++ include/server/mir/frontend/session_mediator_observer.h	2016-11-18 09:52:03 +0000
@@ -72,6 +72,8 @@
          std::string const& app_name,
          char const* method,
          std::string const& what) = 0;
++
++    virtual void session_apply_input_device_configuration_called(std::string const& app_name) = 0;
  };
+ }
 === modified file 'include/server/mir/input/input_device_hub.h'
 --- include/server/mir/input/input_device_hub.h	2016-07-18 07:38:38 +0000
 +++ include/server/mir/input/input_device_hub.h	2016-11-18 09:52:03 +0000
@@ -38,6 +38,7 @@
      virtual void add_observer(std::shared_ptr<InputDeviceObserver> const&) = 0;
      virtual void remove_observer(std::weak_ptr<InputDeviceObserver> const&) = 0;
      virtual void for_each_input_device(std::function<void(Device const& device)> const& callback) = 0;
++    virtual void for_each_mutable_input_device(std::function<void(Device& device)> const& callback) = 0;
      InputDeviceHub(InputDeviceHub const&) = delete;
      InputDeviceHub& operator=(InputDeviceHub const&) = delete;
 === modified file 'include/test/mir/test/doubles/mock_input_device_hub.h'
 --- include/test/mir/test/doubles/mock_input_device_hub.h	2016-07-18 07:38:38 +0000
 +++ include/test/mir/test/doubles/mock_input_device_hub.h	2016-11-18 09:52:03 +0000
@@ -33,7 +33,7 @@
      MOCK_METHOD1(add_observer, void(std::shared_ptr<input::InputDeviceObserver> const&));
      MOCK_METHOD1(remove_observer, void(std::weak_ptr<input::InputDeviceObserver> const&));
      MOCK_METHOD1(for_each_input_device, void(std::function<void(input::Device const&)> const&));
--
++    MOCK_METHOD1(for_each_mutable_input_device, void(std::function<void(input::Device&)> const&));
  };
+ }
 === modified file 'src/client/logging/rpc_report.cpp'
 --- src/client/logging/rpc_report.cpp	2016-07-20 04:54:07 +0000
 +++ src/client/logging/rpc_report.cpp	2016-11-18 09:52:03 +0000
@@ -19,8 +19,10 @@
  #include "rpc_report.h"
  #include "mir/logging/logger.h"
++#include "mir/event_printer.h"
  #include "mir_protobuf_wire.pb.h"
++#include "mir_protobuf.pb.h"
  #include <boost/exception/diagnostic_information.hpp>
  #include <sstream>
@@ -89,11 +91,10 @@
+ }
  void mcll::RpcReport::event_parsing_succeeded(
--    MirEvent const& /*event*/)
++    MirEvent const& event)
+ {
      std::stringstream ss;
--    /* TODO: Log more information about event */
--    ss << "Event parsed";
++    ss << "Event parsed : " << event;
      logger->log(ml::Severity::debug, ss.str(), component);
+ }
@@ -147,3 +148,13 @@
      logger->log(ml::Severity::debug, ss.str(), component);
+ }
++
++void mcll::RpcReport::input_device_configuration_received(mir::protobuf::InputDevices const& event)
++{
++    std::stringstream ss;
++    ss << "Input device information received: ";
++    for (auto info : event.device_info())
++        ss << info.id() << ":" << info.name() << " ";
++
++    logger->log(ml::Severity::debug, ss.str(), component);
++}
 === modified file 'src/client/logging/rpc_report.h'
 --- src/client/logging/rpc_report.h	2016-01-29 08:18:22 +0000
 +++ src/client/logging/rpc_report.h	2016-11-18 09:52:03 +0000
@@ -61,6 +61,7 @@
      void file_descriptors_received(google::protobuf::MessageLite const& response,
                                     std::vector<Fd> const& fds) override;
++    void input_device_configuration_received(mir::protobuf::InputDevices const& event) override;
  private:
      std::shared_ptr<mir::logging::Logger> const logger;
  };
 === modified file 'src/client/lttng/rpc_report.cpp'
 --- src/client/lttng/rpc_report.cpp	2016-01-29 08:18:22 +0000
 +++ src/client/lttng/rpc_report.cpp	2016-11-18 09:52:03 +0000
@@ -99,3 +99,7 @@
      mir_tracepoint(mir_client_rpc, file_descriptors_received,
                     handles.get(), fds.size());
+ }
++
++void mcl::lttng::RpcReport::input_device_configuration_received(mir::protobuf::InputDevices const& /*event*/)
++{
++}
 === modified file 'src/client/lttng/rpc_report.h'
 --- src/client/lttng/rpc_report.h	2016-01-29 08:18:22 +0000
 +++ src/client/lttng/rpc_report.h	2016-11-18 09:52:03 +0000
@@ -52,6 +52,7 @@
      void file_descriptors_received(google::protobuf::MessageLite const& response,
                                     std::vector<Fd> const& fds) override;
++    void input_device_configuration_received(mir::protobuf::InputDevices const& event) override;
  private:
      ClientTracepointProvider tp_provider;
  };
 === modified file 'src/client/mir_connection.cpp'
 --- src/client/mir_connection.cpp	2016-11-15 20:53:57 +0000
 +++ src/client/mir_connection.cpp	2016-11-18 09:52:03 +0000
@@ -1320,3 +1320,15 @@
          BOOST_THROW_EXCEPTION(std::invalid_argument("cannot query extensions before connecting to server"));
      return platform->request_interface(name, version);
+ }
++
++void MirConnection::apply_input_device_configuration(mp::InputDeviceInfo const* device_info)
++{
++    mp::InputDeviceSetting setting;
++    setting.set_id(device_info->id());
++    if (device_info->has_pointer_configuration())
++        *setting.mutable_pointer_configuration() = device_info->pointer_configuration();
++    if (device_info->has_touchpad_configuration())
++        *setting.mutable_touchpad_configuration() = device_info->touchpad_configuration();
++
++    server.apply_input_device_configuration(&setting, ignored.get(), gp::NewCallback(ignore));
++}
 === modified file 'src/client/mir_connection.h'
 --- src/client/mir_connection.h	2016-11-14 00:28:49 +0000
 +++ src/client/mir_connection.h	2016-11-18 09:52:03 +0000
@@ -182,6 +182,7 @@
      void done_display_configure();
      MirWaitHandle* set_base_display_configuration(MirDisplayConfiguration const* configuration);
++    void apply_input_device_configuration(mir::protobuf::InputDeviceInfo const* config);
      void preview_base_display_configuration(
          mir::protobuf::DisplayConfiguration const& configuration,
          std::chrono::seconds timeout);
 === modified file 'src/client/mir_connection_api.cpp'
 --- src/client/mir_connection_api.cpp	2016-10-28 22:28:15 +0000
 +++ src/client/mir_connection_api.cpp	2016-11-18 09:52:03 +0000
@@ -312,12 +312,28 @@
      MirConnection* connection,
      mir_input_config_callback callback,
      void* context)
++try
+ {
      if (!connection)
          return;
      auto devices = connection->the_input_devices();
      devices->set_change_callback([connection, context, callback]{callback(connection, context);});
+ }
++catch (std::exception const& ex)
++{
++    MIR_LOG_UNCAUGHT_EXCEPTION(ex);
++}
++
++void mir_connection_apply_input_device_configuration(MirConnection* connection, MirInputDevice const* config) try
++{
++    if (!connection)
++        return;
++    connection->apply_input_device_configuration(reinterpret_cast<mp::InputDeviceInfo const*>(config));
++}
++catch (std::exception const& ex)
++{
++    MIR_LOG_UNCAUGHT_EXCEPTION(ex);
++}
  void mir_input_config_destroy(MirInputConfig const* config)
+ {
@@ -430,4 +446,3 @@
          MIR_LOG_UNCAUGHT_EXCEPTION(ex);
+     }
+ }
--
 === modified file 'src/client/rpc/mir_display_server.cpp'
 --- src/client/rpc/mir_display_server.cpp	2016-10-12 06:03:15 +0000
 +++ src/client/rpc/mir_display_server.cpp	2016-11-18 09:52:03 +0000
@@ -224,3 +224,10 @@
+ {
      channel->call_method(std::string(__func__), request, response, done);
+ }
++void mclr::DisplayServer::apply_input_device_configuration(
++    mir::protobuf::InputDeviceSetting const* request,
++    mir::protobuf::Void* response,
++    google::protobuf::Closure* done)
++{
++    channel->call_method(std::string(__func__), request, response, done);
++}
 === modified file 'src/client/rpc/mir_display_server.h'
 --- src/client/rpc/mir_display_server.h	2016-10-12 06:03:15 +0000
 +++ src/client/rpc/mir_display_server.h	2016-11-18 09:52:03 +0000
@@ -147,6 +147,10 @@
          mir::protobuf::RaiseRequest const* request,
          mir::protobuf::Void* response,
          google::protobuf::Closure* done) override;
++    virtual void apply_input_device_configuration(
++        mir::protobuf::InputDeviceSetting const* request,
++        mir::protobuf::Void* response,
++        google::protobuf::Closure* done) override;
  private:
      std::shared_ptr<mir::client::rpc::MirBasicRpcChannel> const channel;
  };
 === modified file 'src/client/rpc/mir_protobuf_rpc_channel.cpp'
 --- src/client/rpc/mir_protobuf_rpc_channel.cpp	2016-11-15 20:53:57 +0000
 +++ src/client/rpc/mir_protobuf_rpc_channel.cpp	2016-11-18 09:52:03 +0000
@@ -271,6 +271,7 @@
      if (seq.has_input_devices())
+     {
++        rpc_report->input_device_configuration_received(seq.input_devices());
          input_devices->update_devices(seq.input_devices());
+     }
 === modified file 'src/client/rpc/null_rpc_report.cpp'
 --- src/client/rpc/null_rpc_report.cpp	2016-01-29 08:18:22 +0000
 +++ src/client/rpc/null_rpc_report.cpp	2016-11-18 09:52:03 +0000
@@ -79,3 +79,8 @@
      std::vector<mir::Fd> const& /*fds*/)
+ {
+ }
++
++void mclr::NullRpcReport::input_device_configuration_received(
++    mir::protobuf::InputDevices const& /*event*/)
++{
++}
 === modified file 'src/client/rpc/null_rpc_report.h'
 --- src/client/rpc/null_rpc_report.h	2016-01-29 08:18:22 +0000
 +++ src/client/rpc/null_rpc_report.h	2016-11-18 09:52:03 +0000
@@ -50,8 +50,8 @@
      void file_descriptors_received(google::protobuf::MessageLite const& response,
                                     std::vector<Fd> const& fds) override;
++    void input_device_configuration_received(mir::protobuf::InputDevices const& event) override;
  };
--
+ }
+ }
+ }
 === modified file 'src/client/rpc/rpc_report.h'
 --- src/client/rpc/rpc_report.h	2016-01-29 08:18:22 +0000
 +++ src/client/rpc/rpc_report.h	2016-11-18 09:52:03 +0000
@@ -38,6 +38,7 @@
  namespace protobuf
+ {
  class Event;
++class InputDevices;
  namespace wire
+ {
@@ -75,6 +76,7 @@
      virtual void file_descriptors_received(google::protobuf::MessageLite const& response,
                                             std::vector<mir::Fd> const& fds) = 0;
++    virtual void input_device_configuration_received(mir::protobuf::InputDevices const& event) = 0;
  protected:
      RpcReport() = default;
      RpcReport(RpcReport const&) = delete;
 === modified file 'src/client/symbols.map'
 --- src/client/symbols.map	2016-11-17 08:45:49 +0000
 +++ src/client/symbols.map	2016-11-18 09:52:03 +0000
@@ -467,6 +467,7 @@
  MIR_CLIENT_0.26 {  # New functions in Mir 0.26
    global:
++    mir_connection_apply_input_device_configuration;
      mir_input_device_get_mutable_pointer_configuration;
      mir_input_device_get_mutable_touchpad_configuration;
      mir_input_device_get_pointer_configuration;
 === modified file 'src/include/common/mir/protobuf/display_server.h'
 --- src/include/common/mir/protobuf/display_server.h	2016-10-12 06:03:15 +0000
 +++ src/include/common/mir/protobuf/display_server.h	2016-11-18 09:52:03 +0000
@@ -143,6 +143,10 @@
          mir::protobuf::RaiseRequest const* request,
          mir::protobuf::Void* response,
          google::protobuf::Closure* done) = 0;
++    virtual void apply_input_device_configuration(
++        mir::protobuf::InputDeviceSetting const* request,
++        mir::protobuf::Void* response,
++        google::protobuf::Closure* done) = 0;
  protected:
      DisplayServer() = default;
 === modified file 'src/protobuf/mir_protobuf.proto'
 --- src/protobuf/mir_protobuf.proto	2016-11-15 20:53:57 +0000
 +++ src/protobuf/mir_protobuf.proto	2016-11-18 09:52:03 +0000
@@ -430,6 +430,12 @@
    optional TouchpadConfiguration touchpad_configuration = 6;
+ }
++message InputDeviceSetting {
++  optional int64 id = 1;
++  optional PointerConfiguration pointer_configuration = 2;
++  optional TouchpadConfiguration touchpad_configuration = 3;
++}
++
  message PointerConfiguration {
    optional uint32 handedness = 1;
    optional uint32 acceleration = 2;
 === modified file 'src/protobuf/symbols.map'
 --- src/protobuf/symbols.map	2016-11-11 11:23:52 +0000
 +++ src/protobuf/symbols.map	2016-11-18 09:52:03 +0000
@@ -1047,26 +1047,42 @@
  MIR_PROTOBUF_0.26 {
   global:
    extern "C++" {
++    mir::protobuf::InputDeviceConfiguration::?InputDeviceConfiguration*;
++    mir::protobuf::InputDeviceConfiguration::CopyFrom*;
++    mir::protobuf::InputDeviceConfiguration::InputDeviceConfiguration*;
++    mir::protobuf::InputDeviceConfiguration::New*;
++    mir::protobuf::InputDeviceConfiguration::add_setting*;
++    mir::protobuf::InputDeviceConfiguration::setting*;
++    mir::protobuf::InputDeviceInfo::CopyFrom*;
      mir::protobuf::InputDeviceInfo::MergeFrom*;
      mir::protobuf::InputDeviceInfo::default_instance_;
--    mir::protobuf::PointerConfiguration::?PointerConfiguration*;
--    mir::protobuf::PointerConfiguration::PointerConfiguration*;
--    mir::protobuf::PointerConfiguration::default_instance_;
--    mir::protobuf::TouchpadConfiguration::TouchpadConfiguration*;
--    mir::protobuf::TouchpadConfiguration::?TouchpadConfiguration*;
--    mir::protobuf::TouchpadConfiguration::default_instance_;
--    mir::protobuf::PointerConfiguration::?PointerConfiguration*;
--    mir::protobuf::InputDeviceInfo::CopyFrom*;
++    mir::protobuf::InputDeviceSetting::?InputDeviceSetting*;
++    mir::protobuf::InputDeviceSetting::CopyFrom*;
++    mir::protobuf::InputDeviceSetting::InputDeviceSetting*;
++    mir::protobuf::InputDeviceSetting::New*;
++    mir::protobuf::InputDeviceSetting::default_instance*;
++    mir::protobuf::InputDeviceSetting::pointer_configuration*;
++    mir::protobuf::InputDeviceSetting::touchpad_configuration*;
++    mir::protobuf::InputDevices::?InputDevices*;
      mir::protobuf::InputDevices::Clear*;
      mir::protobuf::InputDevices::CopyFrom*;
      mir::protobuf::InputDevices::InputDevices*;
--    mir::protobuf::InputDevices::?InputDevices*;
      mir::protobuf::InputDevices::MergeFrom*;
      mir::protobuf::InputDevices::New*;
      mir::protobuf::InputDevices::default_instance_;
++    mir::protobuf::PointerConfiguration::?PointerConfiguration*;
      mir::protobuf::PointerConfiguration::CopyFrom*;
++    mir::protobuf::PointerConfiguration::PointerConfiguration*;
++    mir::protobuf::PointerConfiguration::default_instance_;
++    mir::protobuf::TouchpadConfiguration::?TouchpadConfiguration*;
      mir::protobuf::TouchpadConfiguration::CopyFrom*;
++    mir::protobuf::TouchpadConfiguration::TouchpadConfiguration*;
++    mir::protobuf::TouchpadConfiguration::default_instance_;
++    typeinfo?for?mir::protobuf::InputDeviceConfiguration;
++    typeinfo?for?mir::protobuf::InputDeviceSetting;
      typeinfo?for?mir::protobuf::InputDevices;
++    vtable?for?mir::protobuf::InputDeviceConfiguration;
++    vtable?for?mir::protobuf::InputDeviceSetting;
      vtable?for?mir::protobuf::InputDevices;
    };
  } MIR_PROTOBUF_0.22;
 === modified file 'src/server/frontend/protobuf_input_converter.cpp'
 --- src/server/frontend/protobuf_input_converter.cpp	2016-10-27 14:31:48 +0000
 +++ src/server/frontend/protobuf_input_converter.cpp	2016-11-18 09:52:03 +0000
@@ -61,3 +61,32 @@
          msg_conf->set_disable_while_typing(dev_conf.disable_while_typing);
+     }
+ }
++
++void mfd::apply_protobuf_device_settting(protobuf::InputDeviceSetting const& device_setting,
++                                         input::Device& device)
++{
++    if (device_setting.has_pointer_configuration())
++    {
++        mi::PointerConfiguration pointer_config;
++        auto const& conf = device_setting.pointer_configuration();
++        pointer_config.handedness = static_cast<MirPointerHandedness>(conf.handedness());
++        pointer_config.acceleration = static_cast<MirPointerAcceleration>(conf.acceleration());
++        pointer_config.cursor_acceleration_bias = conf.acceleration_bias();
++        pointer_config.horizontal_scroll_scale = conf.horizontal_scroll_scale();
++        pointer_config.vertical_scroll_scale = conf.vertical_scroll_scale();
++        device.apply_pointer_configuration(pointer_config);
++    }
++    if (device_setting.has_touchpad_configuration())
++    {
++        mi::TouchpadConfiguration touchpad_config;
++        auto const& conf = device_setting.touchpad_configuration();
++        touchpad_config.click_mode = conf.click_modes();
++        touchpad_config.scroll_mode = conf.scroll_modes();
++        touchpad_config.button_down_scroll_button = conf.button_down_scroll_button();
++        touchpad_config.tap_to_click = conf.tap_to_click();
++        touchpad_config.middle_mouse_button_emulation = conf.middle_mouse_button_emulation();
++        touchpad_config.disable_with_mouse = conf.disable_with_mouse();
++        touchpad_config.disable_while_typing = conf.disable_while_typing();
++        device.apply_touchpad_configuration(touchpad_config);
++    }
++}
 === modified file 'src/server/frontend/protobuf_input_converter.h'
 --- src/server/frontend/protobuf_input_converter.h	2016-10-27 14:31:48 +0000
 +++ src/server/frontend/protobuf_input_converter.h	2016-11-18 09:52:03 +0000
@@ -43,6 +43,8 @@
  void pack_protobuf_input_device_info(protobuf::InputDeviceInfo& device_info,
                                       input::Device const& device);
++void apply_protobuf_device_settting(protobuf::InputDeviceSetting const& setting,
++                                    input::Device& device);
+ }
+ }
+ }
 === modified file 'src/server/frontend/protobuf_message_processor.cpp'
 --- src/server/frontend/protobuf_message_processor.cpp	2016-11-11 17:40:29 +0000
 +++ src/server/frontend/protobuf_message_processor.cpp	2016-11-18 09:52:03 +0000
@@ -348,6 +348,10 @@
+         {
              invoke(this, display_server.get(), &protobuf::DisplayServer::cancel_base_display_configuration_preview, invocation);
+         }
++        else if ("apply_input_device_configuration" == invocation.method_name())
++        {
++            invoke(this, display_server.get(), &protobuf::DisplayServer::apply_input_device_configuration, invocation);
++        }
          else
+         {
              report->unknown_method(display_server.get(), invocation.id(), invocation.method_name());
 === modified file 'src/server/frontend/session_mediator.cpp'
 --- src/server/frontend/session_mediator.cpp	2016-11-17 08:45:49 +0000
 +++ src/server/frontend/session_mediator.cpp	2016-11-18 09:52:03 +0000
@@ -1109,6 +1109,28 @@
      done->Run();
+ }
++void mf::SessionMediator::apply_input_device_configuration(
++    mir::protobuf::InputDeviceSetting const* request,
++    mir::protobuf::Void*,
++    google::protobuf::Closure* done)
++{
++    auto const session = weak_session.lock();
++    if (!session)
++        BOOST_THROW_EXCEPTION(std::logic_error("Invalid application session"));
++
++    observer->session_apply_input_device_configuration_called(session->name());
++
++    hub->for_each_mutable_input_device(
++        [request](mi::Device& device)
++        {
++            if (device.id() == request->id())
++                mfd::apply_protobuf_device_settting(*request, device);
++        });
++
++    done->Run();
++}
++
++
  std::shared_ptr<mg::DisplayConfiguration>
  mf::SessionMediator::unpack_and_sanitize_display_configuration(
      mir::protobuf::DisplayConfiguration const* protobuf_config)
 === modified file 'src/server/frontend/session_mediator.h'
 --- src/server/frontend/session_mediator.h	2016-11-15 23:48:01 +0000
 +++ src/server/frontend/session_mediator.h	2016-11-18 09:52:03 +0000
@@ -224,6 +224,10 @@
          mir::protobuf::RaiseRequest const* request,
          mir::protobuf::Void*,
          google::protobuf::Closure* done) override;
++    void apply_input_device_configuration(
++        mir::protobuf::InputDeviceSetting const* request,
++        mir::protobuf::Void* response,
++        google::protobuf::Closure* done) override;
      // TODO: Split this into a separate thing
      void translate_surface_to_screen(
 === modified file 'src/server/frontend/session_mediator_observer_multiplexer.cpp'
 --- src/server/frontend/session_mediator_observer_multiplexer.cpp	2016-11-02 05:07:18 +0000
 +++ src/server/frontend/session_mediator_observer_multiplexer.cpp	2016-11-18 09:52:03 +0000
@@ -126,6 +126,13 @@
      for_each_observer(&mf::SessionMediatorObserver::session_error, app_name, method, what);
+ }
++
++void mf::SessionMediatorObserverMultiplexer::session_apply_input_device_configuration_called(
++    std::string const& app_name)
++{
++    for_each_observer(&mf::SessionMediatorObserver::session_apply_input_device_configuration_called, app_name);
++}
++
  mir::frontend::SessionMediatorObserverMultiplexer::SessionMediatorObserverMultiplexer(
      std::shared_ptr<mir::Executor> const& default_executor)
      : ObserverMultiplexer(*default_executor),
 === modified file 'src/server/frontend/session_mediator_observer_multiplexer.h'
 --- src/server/frontend/session_mediator_observer_multiplexer.h	2016-11-02 05:07:18 +0000
 +++ src/server/frontend/session_mediator_observer_multiplexer.h	2016-11-18 09:52:03 +0000
@@ -67,6 +67,8 @@
      void session_error(std::string const& app_name, char const* method, std::string const& what) override;
++    void session_apply_input_device_configuration_called(std::string const& app_name) override;
++
  private:
      std::shared_ptr<Executor> const executor;
  };
 === modified file 'src/server/input/default_device.cpp'
 --- src/server/input/default_device.cpp	2016-07-18 07:38:38 +0000
 +++ src/server/input/default_device.cpp	2016-11-18 09:52:03 +0000
@@ -18,6 +18,7 @@
   */
  #include "default_device.h"
++#include "default_input_device_hub.h"
  #include "mir/dispatch/action_queue.h"
  #include "mir/input/device_capability.h"
  #include "mir/input/input_device.h"
@@ -31,9 +32,10 @@
  namespace mi = mir::input;
  mi::DefaultDevice::DefaultDevice(MirInputDeviceId id, std::shared_ptr<dispatch::ActionQueue> const& actions,
--                                 InputDevice& device, std::shared_ptr<KeyMapper> const& key_mapper)
++                                 InputDevice& device, std::shared_ptr<KeyMapper> const& key_mapper,
++                                 std::function<void(Device*)> const& callback)
      : device_id{id}, device{device}, info(device.get_device_info()), pointer{device.get_pointer_settings()},
--      touchpad{device.get_touchpad_settings()}, actions{actions}, key_mapper{key_mapper}
++      touchpad{device.get_touchpad_settings()}, actions{actions}, key_mapper{key_mapper}, device_changed_callback{callback}
+ {
      if (contains(info.capabilities, mi::DeviceCapability::keyboard))
+     {
@@ -42,6 +44,12 @@
+     }
+ }
++mi::DefaultDevice::DefaultDevice(MirInputDeviceId id, std::shared_ptr<dispatch::ActionQueue> const& actions,
++                                 InputDevice& device, std::shared_ptr<KeyMapper> const& key_mapper)
++    : DefaultDevice(id, actions, device, key_mapper, [](Device*){})
++{
++}
++
  mi::DeviceCapabilities mi::DefaultDevice::capabilities() const
+ {
      return info.capabilities;
@@ -107,6 +115,7 @@
+                      {
                           dev->apply_settings(settings);
                       });
++    device_changed_callback(this);
+ }
  void mi::DefaultDevice::apply_touchpad_configuration(mi::TouchpadConfiguration const& conf)
@@ -132,6 +141,7 @@
+                      {
                           dev->apply_settings(settings);
                       });
++    device_changed_callback(this);
+ }
  mir::optional_value<mi::KeyboardConfiguration> mi::DefaultDevice::keyboard_configuration() const
@@ -148,5 +158,8 @@
+     {
          keyboard = conf;
          key_mapper->set_keymap_for_device(device_id, conf.device_keymap);
++
++        device_changed_callback(this);
+     }
+ }
++
 === modified file 'src/server/input/default_device.h'
 --- src/server/input/default_device.h	2016-07-18 07:38:38 +0000
 +++ src/server/input/default_device.h	2016-11-18 09:52:03 +0000
@@ -29,6 +29,7 @@
  #include "mir/optional_value.h"
  #include <memory>
++#include <functional>
  namespace mir
+ {
@@ -41,12 +42,16 @@
  class KeyMapper;
  class InputDevice;
++class DefaultInputDeviceHub;
  class DefaultDevice : public Device
+ {
  public:
      DefaultDevice(MirInputDeviceId id, std::shared_ptr<dispatch::ActionQueue> const& actions,
                    InputDevice& device, std::shared_ptr<KeyMapper> const& key_mapper);
++    DefaultDevice(MirInputDeviceId id, std::shared_ptr<dispatch::ActionQueue> const& actions,
++                  InputDevice& device, std::shared_ptr<KeyMapper> const& key_mapper,
++                  std::function<void(Device*)> const& change_callback);
      MirInputDeviceId id() const override;
      DeviceCapabilities capabilities() const override;
      std::string name() const override;
@@ -59,6 +64,7 @@
      optional_value<KeyboardConfiguration> keyboard_configuration() const override;
      void apply_keyboard_configuration(KeyboardConfiguration const&) override;
  private:
++    void wake_hub_for_device_change();
      MirInputDeviceId const device_id;
      InputDevice& device;
      InputDeviceInfo const info;
@@ -67,6 +73,7 @@
      optional_value<KeyboardConfiguration> keyboard;
      std::shared_ptr<dispatch::ActionQueue> const actions;
      std::shared_ptr<KeyMapper> const key_mapper;
++    std::function<void(Device*)> device_changed_callback;
  };
+ }
 === modified file 'src/server/input/default_input_device_hub.cpp'
 --- src/server/input/default_input_device_hub.cpp	2016-11-09 02:30:14 +0000
 +++ src/server/input/default_input_device_hub.cpp	2016-11-18 09:52:03 +0000
@@ -35,6 +35,7 @@
  #include <algorithm>
  #include <atomic>
++#include <memory>
  namespace mi = mir::input;
  namespace mf = mir::frontend;
@@ -75,7 +76,7 @@
      if (it == end(devices))
+     {
          auto id = create_new_device_id();
--        auto handle = std::make_shared<DefaultDevice>(id, device_queue, *device, key_mapper);
++        auto handle = std::make_shared<DefaultDevice>(id, device_queue, *device, key_mapper, [this](Device *d){device_changed(d);});
          // send input device info to observer loop..
          devices.push_back(std::make_unique<RegisteredDevice>(
              device, id, input_dispatchable, cookie_authority, handle));
@@ -244,6 +245,22 @@
          callback(*item);
+ }
++void mi::DefaultInputDeviceHub::for_each_mutable_input_device(std::function<void(Device&)> const& callback)
++{
++    {
++        std::unique_lock<std::mutex> lock(changed_devices_guard);
++        changed_devices = std::make_unique<std::vector<std::shared_ptr<Device>>>();
++    }
++
++    {
++        std::unique_lock<std::mutex> lock(observer_guard);
++        for (auto const& item : handles)
++            callback(*item);
++    }
++
++    emit_changed_devices();
++}
++
  void mi::DefaultInputDeviceHub::remove_observer(std::weak_ptr<InputDeviceObserver> const& element)
+ {
      auto observer = element.lock();
@@ -305,3 +322,58 @@
          server_status_listener->stop_receiving_input();
+     }
+ }
++
++void mi::DefaultInputDeviceHub::device_changed(Device* dev)
++{
++    auto more_changes_in_progress = false;
++    {
++        std::unique_lock<std::mutex> lock(changed_devices_guard);
++        if (changed_devices)
++        {
++            more_changes_in_progress = true;
++            auto dev_it = find_if(begin(handles), end(handles), [dev](auto const& ptr){return ptr.get() == dev;});
++            changed_devices->push_back(*dev_it);
++        }
++    }
++
++    if (!more_changes_in_progress)
++    {
++        std::unique_lock<std::mutex> lock(observer_guard);
++        sink->handle_input_device_change(handles);
++        auto dev_it = find_if(begin(handles), end(handles), [dev](auto const& ptr){return ptr.get() == dev;});
++
++        if (dev_it==end(handles))
++            return;
++
++        for (auto const& observer : observers)
++        {
++            observer->device_changed(*dev_it);
++            observer->changes_complete();
++        }
++    }
++}
++
++void mi::DefaultInputDeviceHub::emit_changed_devices()
++{
++    std::vector<std::shared_ptr<mi::Device>> devices_to_notify;
++    {
++        std::unique_lock<std::mutex> lock(changed_devices_guard);
++        if (changed_devices)
++        {
++            std::swap(devices_to_notify, *changed_devices);
++            changed_devices.reset();
++        }
++    }
++    {
++        std::unique_lock<std::mutex> lock(observer_guard);
++        for (auto const& observer : observers)
++        {
++            for (auto const& dev : devices_to_notify)
++                observer->device_changed(dev);
++            observer->changes_complete();
++        }
++
++        sink->handle_input_device_change(handles);
++    }
++}
++
 === modified file 'src/server/input/default_input_device_hub.h'
 --- src/server/input/default_input_device_hub.h	2016-10-12 06:03:15 +0000
 +++ src/server/input/default_input_device_hub.h	2016-11-18 09:52:03 +0000
@@ -79,11 +79,15 @@
      void add_observer(std::shared_ptr<InputDeviceObserver> const&) override;
      void remove_observer(std::weak_ptr<InputDeviceObserver> const&) override;
      void for_each_input_device(std::function<void(Device const& device)> const& callback) override;
++    void for_each_mutable_input_device(std::function<void(Device& device)> const& callback) override;
++
  private:
      void update_spots();
      void add_device_handle(std::shared_ptr<DefaultDevice> const& handle);
      void remove_device_handle(MirInputDeviceId id);
++    void device_changed(Device* dev);
++    void emit_changed_devices();
      MirInputDeviceId create_new_device_id();
      std::shared_ptr<Seat> const seat;
      std::shared_ptr<frontend::EventSink> const sink;
@@ -125,6 +129,8 @@
      std::vector<std::shared_ptr<Device>> handles;
      std::vector<std::unique_ptr<RegisteredDevice>> devices;
      std::vector<std::shared_ptr<InputDeviceObserver>> observers;
++    std::mutex changed_devices_guard;
++    std::unique_ptr<std::vector<std::shared_ptr<Device>>> changed_devices;
      MirInputDeviceId device_id_generator;
      bool ready{false};
 === modified file 'src/server/report/logging/session_mediator_report.cpp'
 --- src/server/report/logging/session_mediator_report.cpp	2016-10-05 08:42:26 +0000
 +++ src/server/report/logging/session_mediator_report.cpp	2016-11-18 09:52:03 +0000
@@ -118,6 +118,11 @@
      log->log(ml::Severity::informational, "session_release_buffer_stream_called(\"" + app_name + "\")", component);
+ }
++void mrl::SessionMediatorReport::session_apply_input_device_configuration_called(std::string const& app_name)
++{
++    log->log(ml::Severity::informational, "session_apply_input_device_configuration_called(\"" + app_name + "\")", component);
++}
++
  void mrl::SessionMediatorReport::session_error(
          std::string const& app_name,
          char const* method,
 === modified file 'src/server/report/logging/session_mediator_report.h'
 --- src/server/report/logging/session_mediator_report.h	2016-11-02 05:07:18 +0000
 +++ src/server/report/logging/session_mediator_report.h	2016-11-18 09:52:03 +0000
@@ -74,6 +74,8 @@
      void session_create_buffer_stream_called(std::string const& app_name) override;
      void session_release_buffer_stream_called(std::string const& app_name) override;
++    void session_apply_input_device_configuration_called(std::string const& app_name) override;
++
      virtual void session_error(
          std::string const& app_name,
          char const* method,
 === modified file 'src/server/report/lttng/session_mediator_report.cpp'
 --- src/server/report/lttng/session_mediator_report.cpp	2016-10-05 08:42:26 +0000
 +++ src/server/report/lttng/session_mediator_report.cpp	2016-11-18 09:52:03 +0000
@@ -46,6 +46,7 @@
  MIR_SESSION_MEDIATOR_EVENT_METHOD(session_stop_prompt_session_called)
  MIR_SESSION_MEDIATOR_EVENT_METHOD(session_create_buffer_stream_called)
  MIR_SESSION_MEDIATOR_EVENT_METHOD(session_release_buffer_stream_called)
++MIR_SESSION_MEDIATOR_EVENT_METHOD(session_apply_input_device_configuration_called)
  void mir::report::lttng::SessionMediatorReport::session_start_prompt_session_called(std::string const& app_name, pid_t application_process)
 === modified file 'src/server/report/lttng/session_mediator_report.h'
 --- src/server/report/lttng/session_mediator_report.h	2016-11-02 05:07:18 +0000
 +++ src/server/report/lttng/session_mediator_report.h	2016-11-18 09:52:03 +0000
@@ -50,6 +50,7 @@
      void session_stop_prompt_session_called(std::string const& app_name) override;
      void session_create_buffer_stream_called(std::string const& app_name) override;
      void session_release_buffer_stream_called(std::string const& app_name) override;
++    void session_apply_input_device_configuration_called(std::string const& app_name) override;
      void session_error(std::string const& app_name, char const* method, std::string const& what) override;
  private:
 === modified file 'src/server/report/lttng/session_mediator_report_tp.h'
 --- src/server/report/lttng/session_mediator_report_tp.h	2016-10-05 08:42:26 +0000
 +++ src/server/report/lttng/session_mediator_report_tp.h	2016-11-18 09:52:03 +0000
@@ -56,6 +56,7 @@
  MIR_SESSION_MEDIATOR_EVENT(session_stop_prompt_session_called)
  MIR_SESSION_MEDIATOR_EVENT(session_create_buffer_stream_called)
  MIR_SESSION_MEDIATOR_EVENT(session_release_buffer_stream_called)
++MIR_SESSION_MEDIATOR_EVENT(session_apply_input_device_configuration_called)
  TRACEPOINT_EVENT(
      mir_server_session_mediator,
 === modified file 'src/server/report/null/session_mediator_report.cpp'
 --- src/server/report/null/session_mediator_report.cpp	2016-10-05 08:42:26 +0000
 +++ src/server/report/null/session_mediator_report.cpp	2016-11-18 09:52:03 +0000
@@ -86,6 +86,10 @@
+ {
+ }
++void mir::report::null::SessionMediatorReport::session_apply_input_device_configuration_called(std::string const&)
++{
++}
++
  void mir::report::null::SessionMediatorReport::session_error(
          std::string const&,
          char const* ,
 === modified file 'src/server/report/null/session_mediator_report.h'
 --- src/server/report/null/session_mediator_report.h	2016-11-02 05:07:18 +0000
 +++ src/server/report/null/session_mediator_report.h	2016-11-18 09:52:03 +0000
@@ -69,6 +69,8 @@
      void session_release_buffer_stream_called(std::string const& app_name) override;
++    void session_apply_input_device_configuration_called(std::string const& app_name) override;
++
      void session_error(
          std::string const& app_name,
          char const* method,
 === modified file 'tests/acceptance-tests/test_client_input.cpp'
 --- tests/acceptance-tests/test_client_input.cpp	2016-11-15 20:53:57 +0000
 +++ tests/acceptance-tests/test_client_input.cpp	2016-11-18 09:52:03 +0000
@@ -54,7 +54,6 @@
  using namespace std::chrono_literals;
  using namespace testing;
--using namespace std::chrono_literals;
  namespace
+ {
@@ -1100,4 +1099,39 @@
      mir_input_config_destroy(config);
+ }
--
++TEST_F(TestClientInput, changes_on_input_configuration)
++{
++    wait_for_input_devices();
++
++    Client a_client(new_connection(), first);
++    auto config = mir_connection_create_input_config(a_client.connection);
++    auto mouse = get_mutable_device_with_capabilities(config, mir_input_device_capability_pointer);
++    auto pointer_config = mir_input_device_get_mutable_pointer_configuration(mouse);
++    auto increased_acceleration = 0.7;
++
++    mir_pointer_configuration_set_acceleration(pointer_config, mir_pointer_acceleration_adaptive);
++    mir_pointer_configuration_set_acceleration_bias(pointer_config, increased_acceleration);
++
++    mt::Signal changes_complete;
++    mir_connection_set_input_config_change_callback(
++        a_client.connection,
++        [](MirConnection*, void* context)
++        {
++            static_cast<mt::Signal*>(context)->raise();
++        },
++        &changes_complete
++        );
++    mir_connection_apply_input_device_configuration(a_client.connection, mouse);
++    mir_input_config_destroy(config);
++
++    EXPECT_THAT(changes_complete.wait_for(2s), Eq(true));
++
++    config = mir_connection_create_input_config(a_client.connection);
++    mouse = get_mutable_device_with_capabilities(config, mir_input_device_capability_pointer);
++    pointer_config = mir_input_device_get_mutable_pointer_configuration(mouse);
++
++    EXPECT_THAT(mir_pointer_configuration_get_acceleration(pointer_config), Eq(mir_pointer_acceleration_adaptive));
++    EXPECT_THAT(mir_pointer_configuration_get_acceleration_bias(pointer_config), Eq(increased_acceleration));
++
++    mir_input_config_destroy(config);
++}
 === modified file 'tests/acceptance-tests/test_nested_mir.cpp'
 --- tests/acceptance-tests/test_nested_mir.cpp	2016-11-15 23:48:01 +0000
 +++ tests/acceptance-tests/test_nested_mir.cpp	2016-11-18 09:52:03 +0000
@@ -110,6 +110,7 @@
      void session_confirm_base_display_configuration_called(std::string const&) override {};
      void session_create_buffer_stream_called(std::string const&) override {}
      void session_release_buffer_stream_called(std::string const&) override {}
++    void session_apply_input_device_configuration_called(std::string const&) override {}
      void session_error(const std::string&, const char*, const std::string&) override {};
  };
 === modified file 'tests/acceptance-tests/test_session_mediator_report.cpp'
 --- tests/acceptance-tests/test_session_mediator_report.cpp	2016-11-15 04:59:25 +0000
 +++ tests/acceptance-tests/test_session_mediator_report.cpp	2016-11-18 09:52:03 +0000
@@ -61,6 +61,7 @@
      void session_set_base_display_configuration_called(std::string const&) override {};
      void session_preview_base_display_configuration_called(std::string const&) override {};
      void session_confirm_base_display_configuration_called(std::string const&) override {};
++    void session_apply_input_device_configuration_called(std::string const&) override {};
      void session_error(const std::string&, const char*, const std::string&) override {};
  };
 === modified file 'tests/include/mir/test/doubles/mock_rpc_report.h'
 --- tests/include/mir/test/doubles/mock_rpc_report.h	2016-01-29 08:18:22 +0000
 +++ tests/include/mir/test/doubles/mock_rpc_report.h	2016-11-18 09:52:03 +0000
@@ -67,6 +67,10 @@
      MOCK_METHOD2(file_descriptors_received,
                   void(google::protobuf::MessageLite const&,
                        std::vector<Fd> const&));
++
++    MOCK_METHOD1(input_device_configuration_received,
++                 void(mir::protobuf::InputDevices const&));
++
  };
 === modified file 'tests/include/mir/test/doubles/stub_display_server.h'
 --- tests/include/mir/test/doubles/stub_display_server.h	2016-10-12 06:03:15 +0000
 +++ tests/include/mir/test/doubles/stub_display_server.h	2016-11-18 09:52:03 +0000
@@ -150,6 +150,11 @@
          mir::protobuf::RaiseRequest const* /*request*/,
          mir::protobuf::Void* /*response*/,
          google::protobuf::Closure* /*done*/) {}
++    void apply_input_device_configuration(
++        mir::protobuf::InputDeviceSetting const* /*request*/,
++        mir::protobuf::Void* /*response*/,
++        google::protobuf::Closure* /*done*/) {}
++
  };
+ }
 === modified file 'tests/include/mir/test/stub_server_tool.h'
 --- tests/include/mir/test/stub_server_tool.h	2016-10-05 08:42:26 +0000
 +++ tests/include/mir/test/stub_server_tool.h	2016-11-18 09:52:03 +0000
@@ -108,6 +108,14 @@
          done->Run();
+     }
++    virtual void apply_input_device_configuration(
++        mir::protobuf::InputDeviceSetting const* /*request*/,
++        mir::protobuf::Void* /*response*/,
++        google::protobuf::Closure* done) override
++    {
++        done->Run();
++    }
++
      std::string application_name() const
+     {
          std::lock_guard<std::mutex> lock(guard);
 === modified file 'tests/unit-tests/input/test_default_input_device_hub.cpp'
 --- tests/unit-tests/input/test_default_input_device_hub.cpp	2016-10-27 14:31:48 +0000
 +++ tests/unit-tests/input/test_default_input_device_hub.cpp	2016-11-18 09:52:03 +0000
@@ -236,3 +236,57 @@
      observer_loop.trigger_server_actions();
+ }
++TEST_F(InputDeviceHubTest, when_pointer_configuration_is_applied_successfully_observer_is_triggerd)
++{
++    std::shared_ptr<mi::Device> dev_ptr;
++    mi::PointerConfiguration pointer_conf;
++
++    ON_CALL(mock_observer, device_added(WithName("mouse"))).WillByDefault(SaveArg<0>(&dev_ptr));
++
++    hub.add_device(mt::fake_shared(mouse));
++    hub.add_observer(mt::fake_shared(mock_observer));
++    observer_loop.trigger_server_actions();
++
++    EXPECT_CALL(mock_observer, device_changed(WithName("mouse")));
++    EXPECT_CALL(mock_observer, changes_complete());
++
++    dev_ptr->apply_pointer_configuration(pointer_conf);
++    observer_loop.trigger_server_actions();
++}
++
++TEST_F(InputDeviceHubTest, when_tpd_configuration_is_applied_successfully_observer_is_triggerd)
++{
++    std::shared_ptr<mi::Device> dev_ptr;
++    mi::TouchpadConfiguration tpd_conf;
++
++    ON_CALL(mock_observer, device_added(WithName("tpd"))).WillByDefault(SaveArg<0>(&dev_ptr));
++
++    hub.add_device(mt::fake_shared(touchpad));
++    hub.add_observer(mt::fake_shared(mock_observer));
++    observer_loop.trigger_server_actions();
++
++    EXPECT_CALL(mock_observer, device_changed(WithName("tpd")));
++    EXPECT_CALL(mock_observer, changes_complete());
++
++    dev_ptr->apply_touchpad_configuration(tpd_conf);
++    observer_loop.trigger_server_actions();
++}
++
++TEST_F(InputDeviceHubTest, when_configuration_attempt_fails_observer_is_not_triggerd)
++{
++    std::shared_ptr<mi::Device> dev_ptr;
++    mi::TouchpadConfiguration tpd_conf;
++
++    ON_CALL(mock_observer, device_added(WithName("mouse"))).WillByDefault(SaveArg<0>(&dev_ptr));
++
++    hub.add_device(mt::fake_shared(mouse));
++    hub.add_observer(mt::fake_shared(mock_observer));
++    observer_loop.trigger_server_actions();
++
++    EXPECT_CALL(mock_observer, device_changed(WithName("mouse"))).Times(0);
++    EXPECT_CALL(mock_observer, changes_complete()).Times(0);
++
++    try {dev_ptr->apply_touchpad_configuration(tpd_conf); } catch (...) {}
++    observer_loop.trigger_server_actions();
++    ::testing::Mock::VerifyAndClearExpectations(&mock_observer);
++}