Mir

include/client/mir_toolkit/mir_input_device.h (+39/-0)
include/platform/mir/input/input_device.h (+8/-0)
include/platform/mir/input/pointer_settings.h (+58/-0)
src/platforms/evdev/input_modifier_utils.cpp (+7/-3)
src/platforms/evdev/input_modifier_utils.h (+2/-1)
src/platforms/evdev/libinput_device.cpp (+36/-3)
src/platforms/evdev/libinput_device.h (+4/-0)
src/platforms/mesa/server/x11/input/input_device.cpp (+18/-1)
src/platforms/mesa/server/x11/input/input_device.h (+4/-0)
tests/include/mir/test/gmock_fixes.h (+23/-0)
tests/mir_test_framework/fake_input_device_impl.cpp (+30/-4)
tests/mir_test_framework/fake_input_device_impl.h (+5/-0)
tests/unit-tests/input/evdev/test_libinput_device.cpp (+115/-4)
tests/unit-tests/input/test_default_input_device_hub.cpp (+3/-0)

To merge this branch:

bzr merge lp:~andreas-pokorny/mir/libinput-platform-pointer-settings

Wishlist

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2015-10-19
Chris Halse Rogers			Approve on 2015-10-19
Alan Griffiths			Approve on 2015-10-14
Alexandros Frantzis (community)		2015-09-25	Abstain on 2015-10-14
Daniel van Vugt			Abstain on 2015-10-13
Andreas Pokorny (community)			Abstain on 2015-09-29
Review via email: mp+272501@code.launchpad.net

Commit message

Pointer settings in libinput

Allows configuring cursor acceleration, scroll speed and left-hand/right-hand button ordering for all pointing devices.

Description of the change

Add pointer settings to libinput platform.

Pointer settings allow configuring pointer and scroll speed and right-hand / left-hand button ordering. These settings apply to all pointing devices..

Still to come:
- touchpad settings
- keyboard settings
- Exposing settings through mir::input::Device
- supporting settings in x platform
- supporting settings in stub input platforme

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-09-26:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5034/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-09-26:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5039/rebuild

review: Approve (continuous-integration)

Revision history for this message

Alexandros Frantzis (afrantzis) wrote on 2015-09-28:

+ virtual UniqueModulePtr<PointerSettings> get_pointer_settings() const = 0;

Why do we want PointerSettings to keep the module alive?
I would expect just:

PointerSettings get_pointer_settings() const = 0

review: Needs Information

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2015-09-28:

Looks like some duplication with lp:~andreas-pokorny/mir/let-module-ptr-allow-being-created-in-executable

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2015-09-28:

> + virtual UniqueModulePtr<PointerSettings> get_pointer_settings() const = 0;
>
> Why do we want PointerSettings to keep the module alive?

review: Needs Information

Revision history for this message

Andreas Pokorny (andreas-pokorny) wrote on 2015-09-28:

duplication is because I can only have one prereq branch..

Now looking at that again.. I used the additional nullptr state to indicate that the group of options is not applicable for the device. Initially I thought about not allowing callers to construct their own settings objects. And about turning it into a base class .. but I abandoned those two ideas..

I might also go with optioal<PointerSettings> instead.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-09-28:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5045/rebuild

review: Approve (continuous-integration)

Revision history for this message

Andreas Pokorny (andreas-pokorny) wrote on 2015-09-29:

... or I might use unique_ptr instead, and then do not have to bump the input platform abi when adding properties to the structure. And there we are again: Now I have to make sure that the library outlives the lifetime of the structure since it is the only one that knows how to delete the added values.

So in the end using UniqueModulePtr was a partial solution to ABI changes (it only ensures old mirserver works with new input library not the other way around)...

Revision history for this message

Andreas Pokorny (andreas-pokorny) wrote on 2015-09-29:

yeah.. this needs fixing

review: Needs Fixing

Revision history for this message

Andreas Pokorny (andreas-pokorny) wrote on 2015-09-29:

ok fine now..

[side note:
I had to improve the interface of optional_value (but still not quite happy with its behavior and implementation)]

review: Abstain

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-09-30:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5060/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2015-09-30:

+ constexpr explicit operator bool() const { return is_set_; }
+ constexpr const T* operator->() const { return &value_; }
+ T* operator->() { return &value_; }
+ constexpr const T& operator*() const { return value_; }
+ T& operator*() { return value_; }

This seems to add a bunch of operators to give different syntax and surprisingly different semantics to the existing interface. Why?

E.g. why do we need operator->()? And why isn't it a synonym for &value()?

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-09-30:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5065/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Andreas Pokorny (andreas-pokorny) wrote on 2015-09-30:

> + constexpr explicit operator bool() const { return is_set_; }
> + constexpr const T* operator->() const { return &value_; }
> + T* operator->() { return &value_; }
> + constexpr const T& operator*() const { return value_; }
> + T& operator*() { return value_; }
>
> This seems to add a bunch of operators to give different syntax and
> surprisingly different semantics to the existing interface. Why?
>
> E.g. why do we need operator->()? And why isn't it a synonym for &value()?

To be closer to std::(experimental::)optional. Looking at how we implemented it, I should change the above to be more in line with what mir::optional_value<...>::value() does. Fixing that.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-09-30:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5072/rebuild

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-09-30:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5081/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2015-10-01:

> To be closer to std::(experimental::)optional. Looking at how we implemented

mir optional_value is a different design to std::(experimental::)optional - making them look more alike is probably a bad idea.

Revision history for this message

Andreas Pokorny (andreas-pokorny) wrote on 2015-10-06:

> > To be closer to std::(experimental::)optional. Looking at how we implemented
>
> mir optional_value is a different design to std::(experimental::)optional -
> making them look more alike is probably a bad idea.

Ok the difference between value() and -> in this proposal is odd. I will revert it to the original and update the usage for now.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-06:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5161/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2015-10-06:

/mir/include/common/mir/optional_value.h:31:45: error: no viable conversion from 'const mir::input::PointerSettings' to 'MirPointerButton'
optional_value(T const& value) : value_{value}, is_set_{true} {}

+ PointerSettings() {}

"Otherwise clang does not allow construction with {}"

I'm confused. We're in the optional_value<PointerSettings> converting constructor, are trying to construct a MirPointerButton(!) and this is solved by giving PointerSettings() a user-defined default constructor?
...
Oh! clang is trying to use aggregate initialization and that is defeated by adding any user-defined constructor.

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-06:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5165/rebuild

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-07:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5188/rebuild

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-09:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5223/rebuild

review: Approve (continuous-integration)

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2015-10-12:

(1) It sounds like we're mixing up the terms "speed" (magnitude of velocity) and "acceleration". Acceleration is the rate of change of velocity. However it appears actual acceleration might be always zero, and 'acceleration' here refers to the velocity? Have we confused our physics terminology? If so, that should be cleared up...

(2) So how long before we can declare bug 124440 fixed? :)

review: Needs Information

Revision history for this message

Andreas Pokorny (andreas-pokorny) wrote on 2015-10-13:

> (1) It sounds like we're mixing up the terms "speed" (magnitude of velocity)
> and "acceleration". Acceleration is the rate of change of velocity. However it
> appears actual acceleration might be always zero, and 'acceleration' here
> refers to the velocity? Have we confused our physics terminology? If so, that
> should be cleared up...

Yes kind of .. this is an physical inaccuracy that leaks into the software from the domain model. Naming it acceleration would be incorrect to. Since the cursor speed is actually a scaling of the acceleration curve - which is a curve providing the actual speed scale based on the amount of recent movement. Where recent movement is the relative steps we were able to observe from the device.

I could offer a similar confusing comment to clarify things.

>
> (2) So how long before we can declare bug 124440 fixed? :)

Oh I didn’t realize.. Soon this is one of the values that is planed to be configurable by the initial pocket desktop ui.

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2015-10-13:

Kay.... try to use "velocity" or "speed" if you're referring to the first derivative of position :)

review: Abstain

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2015-10-13:

> > (1) It sounds like we're mixing up the terms "speed" (magnitude of velocity)
> > and "acceleration". Acceleration is the rate of change of velocity. However
> it
> > appears actual acceleration might be always zero, and 'acceleration' here
> > refers to the velocity? Have we confused our physics terminology? If so,
> that
> > should be cleared up...
>
> Yes kind of .. this is an physical inaccuracy that leaks into the software
> from the domain model. Naming it acceleration would be incorrect to. Since the
> cursor speed is actually a scaling of the acceleration curve - which is a
> curve providing the actual speed scale based on the amount of recent movement.
> Where recent movement is the relative steps we were able to observe from the
> device.
>
> I could offer a similar confusing comment to clarify things.

This sounds like a number, not a speed or acceleration. Let's try for clearer terminology.

review: Needs Information

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2015-10-13:

Paraphrasing in the hope of confirming (or refuting) my understanding:

"cursor accelaration" is scaling of the first derivative of cursor position (and neither a speed nor an acceleration).

The "acceleration curve" is a function providing this scaling.

PointerSettings::cursor_speed is an adjustment[1] to this scaling function (and not a speed nor an acceleration).

Would it be better to use a term like "speed coefficient" than mixing "acceleration" and "speed"?

[1] Looking at the fake code it is just added to 1 to get the scale factor? If that isn't just an example, wouldn't [0.2] be more intuitive than [-1,1]?

Revision history for this message

Andreas Pokorny (andreas-pokorny) wrote on 2015-10-13:

> Paraphrasing in the hope of confirming (or refuting) my understanding:
>
> "cursor accelaration" is scaling of the first derivative of cursor position
> (and neither a speed nor an acceleration).
>
> The "acceleration curve" is a function providing this scaling.
>
> PointerSettings::cursor_speed is an adjustment[1] to this scaling function
> (and not a speed nor an acceleration).
>
> Would it be better to use a term like "speed coefficient" than mixing
> "acceleration" and "speed"?

coefficient also implies a linear relation.. What about just calling it 'acceleration curve'?
The default set of curves looks like this:
http://wayland.freedesktop.org/libinput/doc/latest/ptraccel-linear.svg

Afaik other pointing devices get different curve sets...

> [1] Looking at the fake code it is just added to 1 to get the scale factor? If
> that isn't just an example, wouldn't [0.2] be more intuitive than [-1,1]?

Since I wanted to use the acceleration offered by libinput, and since it only provides a weakly defined setting called 'acceleration speed', I decided for this MP that I use the value to affect the positioning of fake pointers, but in a simpler way - not depending on previous events. Also the range is what libinput uses. We could also just have [0,1], and scale it as needed in libinput..

Revision history for this message

Alexandros Frantzis (afrantzis) wrote on 2015-10-14:

Unfortunately the historical terms used to describe how mouse movement translates to cursor movement are confusing.

What is called "speed" is actually just distance scaling (e.g. 1 cm of mouse movement => N pixels of cursors movement), and what is called "acceleration" is just changing the scaling dynamically depending on (real) mouse speed.

Not sure what the best term would be, but perhaps it would be better to stick to the historical terms for reasons of familiarity.

+ [-1, 0[

Usually written as [-1, 0)

review: Abstain

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2015-10-14:

+ /**
+ * Scale cursor accelaration.
+ * - 0: default acceleration
+ * - [-1, 0[: reduced acceleration
+ * - ]0, 1]: increased acceleration
+ */
+ double cursor_speed{0.0};
+ double horizontal_scroll_speed{1.0};
+ double vertical_scroll_speed{1.0};

/1/ I don't think this actually follows the terminology explained in the comments.
/2/ "accelaration" => "acceleration"
/3/ Is the doc comment intended to apply to all three fields? (It only applies to the first.)

So, as I understand the explanation...

    /**
     * Bias cursor acceleration:
     * - [-1, 0): reduced acceleration
     * - 0: default acceleration
     * - (0, 1]: increased acceleration
     */
    double bias_cursor_acceleration{0.0};

review: Needs Fixing

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2015-10-14:

It would be more consistent with "horizontal_scroll_scale" to have "cursor_acceleration_bias", but these names do fit better with the explanation of "terms of art".

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-14:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5251/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Andreas Pokorny (andreas-pokorny) wrote on 2015-10-14:

[1444835234.581027] mirserver: Stopping
/bin/bash: line 1: 6450 Segmentation fault mir_demo_server --test-client /usr/bin/mir_demo_client_basic

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-14:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5256/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-14:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5257/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Andreas Pokorny (andreas-pokorny) wrote on 2015-10-14:

Resolving s-jenkins.ubuntu-ci (s-jenkins.ubuntu-ci)... 10.100.0.4
Connecting to s-jenkins.ubuntu-ci (s-jenkins.ubuntu-ci)|10.100.0.4|:8080... connected.
HTTP request sent, awaiting response... 500 Internal Server Error
2015-10-14 18:13:32 ERROR 500: Internal Server Error.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-15:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5273/rebuild

review: Approve (continuous-integration)

Revision history for this message

Chris Halse Rogers (raof) wrote on 2015-10-19:

+ /**
+ * Configure left and right handed mode by selecting a primary button
+ * - mir_pointer_button_primary -> right handed
+ * - mir_pointer_button_secondary -> left handed
+ */
+ MirPointerButton primary_button{mir_pointer_button_primary};

Non-blocking: I think this would be better as an explicit mir_pointer_left_handed/mir_pointer_right_handed - in the case of those truly monstrous 112-button mice we might reasonably want to be able to switch more than just left-mouse-button and right-mouse-button.

Feel free to fix that, or not.

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-19:

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-19:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5328/rebuild

review: Approve (continuous-integration)

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

 === added file 'include/client/mir_toolkit/mir_input_device.h'
 --- include/client/mir_toolkit/mir_input_device.h	1970-01-01 00:00:00 +0000
 +++ include/client/mir_toolkit/mir_input_device.h	2015-10-19 10:46:25 +0000
@@ -0,0 +1,39 @@
++/*
++ * Copyright © 2015 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU Lesser General Public License version 3,
++ * as published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ */
++
++#ifndef MIR_TOOLKIT_MIR_INPUT_DEVICE_H_
++#define MIR_TOOLKIT_MIR_INPUT_DEVICE_H_
++
++/**
++ * \addtogroup mir_toolkit
++ * @{
++ */
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++typedef enum MirPointerHandedness
++{
++    mir_pointer_handedness_right = 0,
++    mir_pointer_handedness_left = 1
++} MirPointerHandedness;
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif
 === modified file 'include/platform/mir/input/input_device.h'
 --- include/platform/mir/input/input_device.h	2015-09-01 07:41:29 +0000
 +++ include/platform/mir/input/input_device.h	2015-10-19 10:46:25 +0000
@@ -20,6 +20,9 @@
  #ifndef MIR_INPUT_INPUT_DEVICE_H_
  #define MIR_INPUT_INPUT_DEVICE_H_
++#include "mir/module_deleter.h"
++#include "mir/optional_value.h"
++
  #include <memory>
  namespace mir
@@ -34,6 +37,8 @@
  class InputDeviceInfo;
  class EventBuilder;
++class PointerSettings;
++
  /**
   * Represents an input device.
   */
@@ -54,6 +59,9 @@
      virtual InputDeviceInfo get_device_info() = 0;
++    virtual mir::optional_value<PointerSettings> get_pointer_settings() const = 0;
++    virtual void apply_settings(PointerSettings const&) = 0;
++
  protected:
      InputDevice(InputDevice const&) = delete;
      InputDevice& operator=(InputDevice const&) = delete;
 === added file 'include/platform/mir/input/pointer_settings.h'
 --- include/platform/mir/input/pointer_settings.h	1970-01-01 00:00:00 +0000
 +++ include/platform/mir/input/pointer_settings.h	2015-10-19 10:46:25 +0000
@@ -0,0 +1,58 @@
++/*
++ * Copyright © 2015 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU Lesser General Public License version 3,
++ * as published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authored by:
++ *   Andreas Pokorny <andreas.pokorny@canonical.com>
++ */
++
++#ifndef MIR_INPUT_POINTER_SETTINGS_H_
++#define MIR_INPUT_POINTER_SETTINGS_H_
++
++#include "mir_toolkit/client_types.h"
++#include "mir_toolkit/mir_input_device.h"
++
++namespace mir
++{
++namespace input
++{
++
++struct PointerSettings
++{
++    PointerSettings() {}
++    /**
++     * Configure left and right handed mode by selecting a primary button
++     */
++    MirPointerHandedness handedness{mir_pointer_handedness_right};
++    /**
++     * Bias cursor acceleration.
++     *   - [-1, 0): reduced acceleration
++     *   - 0: default acceleration
++     *   - (0, 1]: increased acceleration
++     */
++    double cursor_acceleration_bias{0.0};
++    /**
++     * Scale horizontal scrolling linearly
++     */
++    double horizontal_scroll_scale{1.0};
++    /**
++     * Scale vertical scrolling linearly
++     */
++    double vertical_scroll_scale{1.0};
++};
++
++}
++}
++
++#endif
 === modified file 'src/platforms/evdev/input_modifier_utils.cpp'
 --- src/platforms/evdev/input_modifier_utils.cpp	2015-09-17 06:40:14 +0000
 +++ src/platforms/evdev/input_modifier_utils.cpp	2015-10-19 10:46:25 +0000
@@ -27,12 +27,16 @@
  namespace mie = mir::input::evdev;
--MirPointerButton mie::to_pointer_button(int button)
++MirPointerButton mie::to_pointer_button(int button, MirPointerHandedness handedness)
+ {
      switch(button)
+     {
--    case BTN_LEFT: return mir_pointer_button_primary;
--    case BTN_RIGHT: return mir_pointer_button_secondary;
++    case BTN_LEFT: return (handedness == mir_pointer_handedness_right)
++            ? mir_pointer_button_primary
++            : mir_pointer_button_secondary;
++    case BTN_RIGHT: return (handedness == mir_pointer_handedness_right)
++            ? mir_pointer_button_secondary
++            : mir_pointer_button_primary;
      case BTN_MIDDLE: return mir_pointer_button_tertiary;
      case BTN_BACK: return mir_pointer_button_back;
      case BTN_FORWARD: return mir_pointer_button_forward;
 === modified file 'src/platforms/evdev/input_modifier_utils.h'
 --- src/platforms/evdev/input_modifier_utils.h	2015-09-17 06:40:14 +0000
 +++ src/platforms/evdev/input_modifier_utils.h	2015-10-19 10:46:25 +0000
@@ -20,6 +20,7 @@
  #define MIR_INPUT_EVDEV_INPUT_MODIFIER_UTILS_H_
  #include "mir_toolkit/event.h"
++#include "mir_toolkit/mir_input_device.h"
  namespace mir
+ {
@@ -27,7 +28,7 @@
+ {
  namespace evdev
+ {
--MirPointerButton to_pointer_button(int button);
++MirPointerButton to_pointer_button(int button, MirPointerHandedness handedness);
  MirInputEventModifiers to_modifiers(int32_t scan_code);
  MirInputEventModifiers expand_modifiers(MirInputEventModifiers modifiers);
+ }
 === modified file 'src/platforms/evdev/libinput_device.cpp'
 --- src/platforms/evdev/libinput_device.cpp	2015-10-07 15:32:10 +0000
 +++ src/platforms/evdev/libinput_device.cpp	2015-10-19 10:46:25 +0000
@@ -25,6 +25,7 @@
  #include "mir/input/input_sink.h"
  #include "mir/input/input_report.h"
  #include "mir/input/device_capability.h"
++#include "mir/input/pointer_settings.h"
  #include "mir/input/input_device_info.h"
  #include "mir/events/event_builders.h"
  #include "mir/geometry/displacement.h"
@@ -159,7 +160,8 @@
      auto const action = (libinput_event_pointer_get_button_state(pointer) == LIBINPUT_BUTTON_STATE_PRESSED)?
          mir_pointer_action_button_down : mir_pointer_action_button_up;
--    auto const pointer_button = mie::to_pointer_button(button);
++    auto const do_not_swap_buttons = mir_pointer_handedness_right;
++    auto const pointer_button = mie::to_pointer_button(button, do_not_swap_buttons);
      auto const relative_x_value = 0.0f;
      auto const relative_y_value = 0.0f;
      auto const hscroll_value = 0.0f;
@@ -232,10 +234,12 @@
      auto const relative_x_value = 0.0f;
      auto const relative_y_value = 0.0f;
      auto const hscroll_value = libinput_event_pointer_has_axis(pointer, LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL)
--        ? libinput_event_pointer_get_axis_value(pointer, LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL)
++        ? horizontal_scroll_scale * libinput_event_pointer_get_axis_value(pointer,
++                                                                          LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL)
          : 0.0f;
      auto const vscroll_value = libinput_event_pointer_has_axis(pointer, LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL)
--        ? libinput_event_pointer_get_axis_value(pointer, LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL)
++        ? vertical_scroll_scale * libinput_event_pointer_get_axis_value(pointer,
++                                                                        LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL)
          : 0.0f;
      report->received_event_from_kernel(time.count(), EV_REL, 0, 0);
@@ -360,3 +364,32 @@
+ {
      return devices.front().get();
+ }
++
++mir::optional_value<mi::PointerSettings> mie::LibInputDevice::get_pointer_settings() const
++{
++    if (!contains(info.capabilities, mi::DeviceCapability::pointer))
++        return {};
++
++    auto dev = device();
++    auto accel_bias = libinput_device_config_accel_get_speed(dev);
++    auto left_handed = (libinput_device_config_left_handed_get(dev) == 1);
++
++    mi::PointerSettings settings;
++    settings.cursor_acceleration_bias = accel_bias;
++    settings.vertical_scroll_scale = vertical_scroll_scale;
++    settings.horizontal_scroll_scale = horizontal_scroll_scale;
++    settings.handedness = left_handed? mir_pointer_handedness_left : mir_pointer_handedness_right;
++    return settings;
++}
++
++void mie::LibInputDevice::apply_settings(mir::input::PointerSettings const& settings)
++{
++    if (!contains(info.capabilities, mi::DeviceCapability::pointer))
++        return;
++
++    auto dev = device();
++    libinput_device_config_accel_set_speed(dev, settings.cursor_acceleration_bias);
++    libinput_device_config_left_handed_set(dev, mir_pointer_handedness_left == settings.handedness);
++    vertical_scroll_scale = settings.vertical_scroll_scale;
++    horizontal_scroll_scale = settings.horizontal_scroll_scale;
++}
 === modified file 'src/platforms/evdev/libinput_device.h'
 --- src/platforms/evdev/libinput_device.h	2015-10-07 15:32:10 +0000
 +++ src/platforms/evdev/libinput_device.h	2015-10-19 10:46:25 +0000
@@ -54,6 +54,8 @@
      void start(InputSink* sink, EventBuilder* builder) override;
      void stop() override;
      InputDeviceInfo get_device_info() override;
++    mir::optional_value<PointerSettings> get_pointer_settings() const override;
++    void apply_settings(PointerSettings const&) override;
      void process_event(libinput_event* event);
      ::libinput_device* device() const;
@@ -86,6 +88,8 @@
      mir::geometry::Point pointer_pos;
      MirInputEventModifiers modifier_state;
      MirPointerButtons button_state;
++    double vertical_scroll_scale{1.0};
++    double horizontal_scroll_scale{1.0};
      struct ContactData
+     {
 === modified file 'src/platforms/mesa/server/x11/input/input_device.cpp'
 --- src/platforms/mesa/server/x11/input/input_device.cpp	2015-09-01 07:41:29 +0000
 +++ src/platforms/mesa/server/x11/input/input_device.cpp	2015-10-19 10:46:25 +0000
@@ -16,8 +16,11 @@
   * Authored by: Cemil Azizoglu <cemil.azizoglu@canonical.com>
   */
++#include "input_device.h"
++
++#include "mir/input/pointer_settings.h"
  #include "mir/input/input_device_info.h"
--#include "input_device.h"
++#include "mir/input/device_capability.h"
  namespace mi = mir::input;
  namespace mix = mi::X;
@@ -43,3 +46,17 @@
+ {
      return info;
+ }
++
++mir::optional_value<mi::PointerSettings> mix::XInputDevice::get_pointer_settings() const
++{
++    mir::optional_value<PointerSettings> ret;
++    if (contains(info.capabilities, DeviceCapability::pointer))
++        ret = PointerSettings();
++
++    return ret;
++}
++
++void mix::XInputDevice::apply_settings(PointerSettings const&)
++{
++    // TODO Make use if X11-XInput2
++}
 === modified file 'src/platforms/mesa/server/x11/input/input_device.h'
 --- src/platforms/mesa/server/x11/input/input_device.h	2015-09-01 07:41:29 +0000
 +++ src/platforms/mesa/server/x11/input/input_device.h	2015-10-19 10:46:25 +0000
@@ -21,6 +21,7 @@
  #include "mir/input/input_device.h"
  #include "mir/input/input_device_info.h"
++#include "mir/optional_value.h"
  namespace mir
+ {
@@ -40,6 +41,9 @@
      void stop() override;
      InputDeviceInfo get_device_info() override;
++    mir::optional_value<PointerSettings> get_pointer_settings() const override;
++    void apply_settings(PointerSettings const& settings) override;
++
      InputSink* sink{nullptr};
      EventBuilder* builder{nullptr};
  private:
 === modified file 'tests/include/mir/test/gmock_fixes.h'
 --- tests/include/mir/test/gmock_fixes.h	2015-08-27 05:59:27 +0000
 +++ tests/include/mir/test/gmock_fixes.h	2015-10-19 10:46:25 +0000
@@ -142,6 +142,29 @@
+   }
  };
++template<typename T, typename D>
++class DefaultValue<std::unique_ptr<T, D>> {
++ public:
++  // Unsets the default value for type T.
++  static void Clear() {}
++
++  // Returns true if the user has set the default value for type T.
++  static bool IsSet() { return false; }
++
++  // Returns true if T has a default return value set by the user or there
++  // exists a built-in default value.
++  static bool Exists() {
++    return true;
++  }
++
++  // Returns the default value for type T if the user has set one;
++  // otherwise returns the built-in default value if there is one;
++  // otherwise aborts the process.
++  static std::unique_ptr<T, D> Get() {
++    return std::unique_ptr<T, D>();
++  }
++};
++
+ }
 === modified file 'tests/mir_test_framework/fake_input_device_impl.cpp'
 --- tests/mir_test_framework/fake_input_device_impl.cpp	2015-10-12 08:08:58 +0000
 +++ tests/mir_test_framework/fake_input_device_impl.cpp	2015-10-19 10:46:25 +0000
@@ -22,9 +22,11 @@
  #include "mir/input/input_device.h"
  #include "mir/input/input_device_info.h"
  #include "mir/input/input_sink.h"
++#include "mir/input/pointer_settings.h"
  #include "mir/input/event_builder.h"
  #include "mir/dispatch/action_queue.h"
  #include "mir/geometry/displacement.h"
++#include "mir/module_deleter.h"
  #include "src/platforms/evdev/input_modifier_utils.h"
  #include "boost/throw_exception.hpp"
@@ -117,7 +119,7 @@
+ {
      auto event_time = std::chrono::duration_cast<std::chrono::nanoseconds>(
          std::chrono::system_clock::now().time_since_epoch());
--    auto action = update_buttons(button.action, mie::to_pointer_button(button.button));
++    auto action = update_buttons(button.action, mie::to_pointer_button(button.button, settings.handedness));
      auto event_modifiers = mie::expand_modifiers(modifiers);
      auto button_event = builder->pointer_event(event_time,
                                                 event_modifiers,
@@ -157,7 +159,14 @@
      auto event_time = std::chrono::duration_cast<std::chrono::nanoseconds>(
          std::chrono::system_clock::now().time_since_epoch());
      auto event_modifiers = mie::expand_modifiers(modifiers);
--    update_position(pointer.rel_x, pointer.rel_y);
++    // constant scaling is used here to simplify checking for the
++    // expected results. Default settings of the device lead to no
++    // scaling at all.
++    auto acceleration = (settings.cursor_acceleration_bias + 1.0);
++    auto rel_x = pointer.rel_x * acceleration;
++    auto rel_y = pointer.rel_y * acceleration;
++
++    update_position(rel_x, rel_y);
      auto pointer_event = builder->pointer_event(event_time,
                                                  event_modifiers,
                                                  mir_pointer_action_motion,
@@ -166,8 +175,8 @@
                                                  pos.y.as_float(),
                                                  scroll.x.as_float(),
                                                  scroll.y.as_float(),
--                                                pointer.rel_x,
--                                                pointer.rel_y);
++                                                rel_x,
++                                                rel_y);
      sink->handle_input(*pointer_event);
+ }
@@ -220,6 +229,23 @@
      sink->handle_input(*touch_event);
+ }
++mir::optional_value<mi::PointerSettings> mtf::FakeInputDeviceImpl::InputDevice::get_pointer_settings() const
++{
++    mir::optional_value<mi::PointerSettings> ret;
++    if (!contains(info.capabilities, mi::DeviceCapability::pointer))
++        return ret;
++
++    ret = mi::PointerSettings();
++    return ret;
++}
++
++void mtf::FakeInputDeviceImpl::InputDevice::apply_settings(mi::PointerSettings const& settings)
++{
++    if (!contains(info.capabilities, mi::DeviceCapability::pointer))
++        return;
++    this->settings = settings;
++}
++
  void mtf::FakeInputDeviceImpl::InputDevice::map_touch_coordinates(float& x, float& y)
+ {
      // TODO take orientation of input sink into account?
 === modified file 'tests/mir_test_framework/fake_input_device_impl.h'
 --- tests/mir_test_framework/fake_input_device_impl.h	2015-09-01 07:41:29 +0000
 +++ tests/mir_test_framework/fake_input_device_impl.h	2015-10-19 10:46:25 +0000
@@ -22,6 +22,7 @@
  #include "mir_test_framework/fake_input_device.h"
  #include "mir/input/input_device.h"
++#include "mir/input/pointer_settings.h"
  #include "mir/input/input_device_info.h"
  #include "mir/geometry/point.h"
@@ -64,6 +65,9 @@
              return info;
+         }
++        mir::optional_value<mir::input::PointerSettings> get_pointer_settings() const override;
++        void apply_settings(mir::input::PointerSettings const& settings) override;
++
      private:
          MirPointerAction update_buttons(synthesis::EventAction action, MirPointerButton button);
          void update_position(int rel_x, int rel_y);
@@ -76,6 +80,7 @@
          uint32_t modifiers{0};
          mir::geometry::Point pos, scroll;
          MirPointerButtons buttons;
++        mir::input::PointerSettings settings;
      };
      std::shared_ptr<mir::dispatch::ActionQueue> queue;
      std::shared_ptr<InputDevice> device;
 === modified file 'tests/unit-tests/input/evdev/test_libinput_device.cpp'
 --- tests/unit-tests/input/evdev/test_libinput_device.cpp	2015-10-07 16:41:50 +0000
 +++ tests/unit-tests/input/evdev/test_libinput_device.cpp	2015-10-19 10:46:25 +0000
@@ -22,6 +22,7 @@
  #include "mir/input/input_device_registry.h"
  #include "mir/input/input_sink.h"
++#include "mir/input/pointer_settings.h"
  #include "mir/geometry/point.h"
  #include "mir/geometry/rectangle.h"
  #include "mir/test/event_matchers.h"
@@ -159,12 +160,12 @@
          mock_libinput.setup_device(fake_input, dev, device_path, umock_name, vendor_id, product_id);
+     }
--    void setup_pointer_configuration(libinput_device* dev, double accel_speed, MirPointerButton primary)
++    void setup_pointer_configuration(libinput_device* dev, double accel_speed, MirPointerHandedness handedness)
+     {
          EXPECT_CALL(mock_libinput, libinput_device_config_accel_get_speed(dev))
              .WillRepeatedly(Return(accel_speed));
          EXPECT_CALL(mock_libinput, libinput_device_config_left_handed_get(dev))
--            .WillRepeatedly(Return(primary == mir_pointer_button_secondary));
++            .WillRepeatedly(Return(handedness == mir_pointer_handedness_left));
+     }
      void setup_key_event(libinput_event* event, uint64_t event_time, uint32_t key, libinput_key_state state)
@@ -318,7 +319,7 @@
      std::shared_ptr<libinput> lib = mie::make_libinput();
      char const* second_dev = "/dev/input/event13";
      char const* second_umock_dev_name = "bluetooth-magic-trackpad";
--
++
      setup_device(second_fake_device, second_dev, second_umock_dev_name, 9663, 1234);
      InSequence seq;
@@ -341,7 +342,7 @@
      std::shared_ptr<libinput> lib = mie::make_libinput();
      char const* second_dev = "/dev/input/event13";
      char const* second_umock_dev_name = "bluetooth-magic-trackpad";
--
++
      setup_device(second_fake_device, second_dev, second_umock_dev_name, 9663, 1234);
      mie::LibInputDevice dev(mir::report::null_input_report(),
@@ -595,3 +596,113 @@
      dev.process_event(fake_event_3);
      dev.process_event(fake_event_4);
+ }
++
++TEST_F(LibInputDevice, provides_no_pointer_settings_for_non_pointing_devices)
++{
++    char const keyboard_name[] = "usb-keyboard";
++    char const keyboard_device_path[] = "/dev/input/event14";
++    setup_device(second_fake_device, keyboard_device_path, keyboard_name, 1231, 4124);
++
++    std::shared_ptr<libinput> lib = mie::make_libinput();
++    mie::LibInputDevice dev(mir::report::null_input_report(), keyboard_device_path, mie::make_libinput_device(lib.get(), keyboard_device_path));
++
++    auto ptr = dev.get_pointer_settings();
++    EXPECT_THAT(ptr.is_set(), Eq(false));
++}
++
++TEST_F(LibInputDevice, reads_pointer_settings_from_libinput)
++{
++    char const mouse_device_path[] = "/dev/input/event13";
++    char const mouse_name[] = "usb-mouse";
++    setup_device(second_fake_device, mouse_device_path, mouse_name, 1231, 4124);
++
++    std::shared_ptr<libinput> lib = mie::make_libinput();
++    mie::LibInputDevice dev(mir::report::null_input_report(), mouse_device_path, mie::make_libinput_device(lib.get(), mouse_device_path));
++
++    setup_pointer_configuration(dev.device(), 1, mir_pointer_handedness_right);
++    auto optional_settings = dev.get_pointer_settings();
++
++    EXPECT_THAT(optional_settings.is_set(), Eq(true));
++
++    auto ptr_settings = optional_settings.value();
++    EXPECT_THAT(ptr_settings.handedness, Eq(mir_pointer_handedness_right));
++    EXPECT_THAT(ptr_settings.cursor_acceleration_bias, Eq(1.0));
++    EXPECT_THAT(ptr_settings.horizontal_scroll_scale, Eq(1.0));
++    EXPECT_THAT(ptr_settings.vertical_scroll_scale, Eq(1.0));
++
++    setup_pointer_configuration(dev.device(), 0.0, mir_pointer_handedness_left);
++    optional_settings = dev.get_pointer_settings();
++
++    EXPECT_THAT(optional_settings.is_set(), Eq(true));
++
++    ptr_settings = optional_settings.value();
++    EXPECT_THAT(ptr_settings.handedness, Eq(mir_pointer_handedness_left));
++    EXPECT_THAT(ptr_settings.cursor_acceleration_bias, Eq(0.0));
++    EXPECT_THAT(ptr_settings.horizontal_scroll_scale, Eq(1.0));
++    EXPECT_THAT(ptr_settings.vertical_scroll_scale, Eq(1.0));
++}
++
++TEST_F(LibInputDevice, applies_pointer_settings)
++{
++    char const mouse_device_path[] = "/dev/input/event13";
++    char const mouse_name[] = "usb-mouse";
++    setup_device(second_fake_device, mouse_device_path, mouse_name, 1231, 4124);
++
++    std::shared_ptr<libinput> lib = mie::make_libinput();
++    mie::LibInputDevice dev(mir::report::null_input_report(), mouse_device_path, mie::make_libinput_device(lib.get(), path));
++
++    setup_pointer_configuration(dev.device(), 1, mir_pointer_handedness_right);
++    mi::PointerSettings settings(dev.get_pointer_settings().value());
++    settings.cursor_acceleration_bias = 1.1;
++    settings.handedness = mir_pointer_handedness_left;
++
++    EXPECT_CALL(mock_libinput,libinput_device_config_accel_set_speed(dev.device(), 1.1)).Times(1);
++    EXPECT_CALL(mock_libinput,libinput_device_config_left_handed_set(dev.device(), true)).Times(1);
++
++    dev.apply_settings(settings);
++}
++
++TEST_F(LibInputDevice, denies_pointer_settings_on_keyboards)
++{
++    char const mouse_device_path[] = "/dev/input/event13";
++    char const mouse_name[] = "usb-mouse";
++    setup_device(second_fake_device, mouse_device_path, mouse_name, 1231, 4124);
++
++    std::shared_ptr<libinput> lib = mie::make_libinput();
++    mie::LibInputDevice keyboard_dev(mir::report::null_input_report(), path, mie::make_libinput_device(lib.get(), path));
++    mie::LibInputDevice mouse_dev(mir::report::null_input_report(), mouse_device_path, mie::make_libinput_device(lib.get(), path));
++
++    auto settings_from_mouse = mouse_dev.get_pointer_settings();
++
++    EXPECT_CALL(mock_libinput,libinput_device_config_accel_set_speed(_, _)).Times(0);
++    EXPECT_CALL(mock_libinput,libinput_device_config_left_handed_set(_, _)).Times(0);
++
++    keyboard_dev.apply_settings(settings_from_mouse.value());
++}
++
++TEST_F(LibInputDevice, scroll_speed_scales_scroll_events)
++{
++    char const mouse_device_path[] = "/dev/input/event13";
++    char const mouse_name[] = "usb-mouse";
++    setup_device(second_fake_device, mouse_device_path, mouse_name, 1231, 4124);
++
++    std::shared_ptr<libinput> lib = mie::make_libinput();
++    mie::LibInputDevice dev(mir::report::null_input_report(), mouse_device_path, mie::make_libinput_device(lib.get(), mouse_device_path));
++
++    setup_axis_event(fake_event_1, event_time_1, 0.0, 3.0);
++    setup_axis_event(fake_event_2, event_time_2, -2.0, 0.0);
++
++    // expect two scroll events..
++    EXPECT_CALL(mock_sink, handle_input(mt::PointerAxisChange(mir_pointer_axis_vscroll, -3.0f)));
++    EXPECT_CALL(mock_sink, handle_input(mt::PointerAxisChange(mir_pointer_axis_hscroll, -10.0f)));
++
++    setup_pointer_configuration(dev.device(), 1, mir_pointer_handedness_right);
++    mi::PointerSettings settings(dev.get_pointer_settings().value());
++    settings.vertical_scroll_scale = -1.0;
++    settings.horizontal_scroll_scale = 5.0;
++    dev.apply_settings(settings);
++
++    dev.start(&mock_sink, &mock_builder);
++    dev.process_event(fake_event_1);
++    dev.process_event(fake_event_2);
++}
 === modified file 'tests/unit-tests/input/test_default_input_device_hub.cpp'
 --- tests/unit-tests/input/test_default_input_device_hub.cpp	2015-10-07 16:41:50 +0000
 +++ tests/unit-tests/input/test_default_input_device_hub.cpp	2015-10-19 10:46:25 +0000
@@ -25,6 +25,7 @@
  #include "mir/test/event_matchers.h"
  #include "mir/input/input_device.h"
++#include "mir/input/pointer_settings.h"
  #include "mir/input/device.h"
  #include "mir/input/touch_visualizer.h"
  #include "mir/input/input_device_observer.h"
@@ -85,6 +86,8 @@
      MOCK_METHOD2(start, void(mi::InputSink* destination, mi::EventBuilder* builder));
      MOCK_METHOD0(stop, void());
      MOCK_METHOD0(get_device_info, mi::InputDeviceInfo());
++    MOCK_CONST_METHOD0(get_pointer_settings, mir::optional_value<mi::PointerSettings>());
++    MOCK_METHOD1(apply_settings, void(mi::PointerSettings const&));
  };
  template<typename Type>