1
=== modified file 'examples/server_example_input_device_config.cpp'
2
--- examples/server_example_input_device_config.cpp	2015-12-06 23:57:03 +0000
3
+++ examples/server_example_input_device_config.cpp	2016-01-19 22:31:46 +0000
4
@@ -31,21 +31,26 @@
5
31
31
6
32
///\example server_example_input_device_config.cpp
32
///\example server_example_input_device_config.cpp
7
33
/// Demonstrate input device configuration
33
/// Demonstrate input device configuration
15
34
34
namespace
16
35
char const* const me::disable_while_typing_opt = "disable-while-typing";
35
{
17
36
char const* const me::mouse_cursor_acceleration_bias_opt = "mouse-cursor-acceleration-bias";
36
char const* const disable_while_typing_opt = "disable-while-typing";
18
37
char const* const me::mouse_scroll_speed_scale_opt = "mouse-scroll-speed-scale";
37
char const* const mouse_acceleration_opt = "mouse-acceleration";
19
38
char const* const me::touchpad_cursor_acceleration_bias_opt = "touchpad-cursor-acceleration-bias";
38
char const* const acceleration_none = "none";
20
39
char const* const me::touchpad_scroll_speed_scale_opt = "touchpad-scroll-speed-scale";
39
char const* const acceleration_adaptive = "adaptive";
21
40
char const* const me::touchpad_scroll_mode_opt = "touchpad-scroll-mode";
40
char const* const mouse_cursor_acceleration_bias_opt = "mouse-cursor-acceleration-bias";
22
41
char const* const mouse_scroll_speed_scale_opt = "mouse-scroll-speed-scale";
23
42
char const* const touchpad_cursor_acceleration_bias_opt = "touchpad-cursor-acceleration-bias";
24
43
char const* const touchpad_scroll_speed_scale_opt = "touchpad-scroll-speed-scale";
25
44
char const* const touchpad_scroll_mode_opt = "touchpad-scroll-mode";
26
41
45
27
42
char const* const touchpad_scroll_mode_two_finger = "two-finger";
46
char const* const touchpad_scroll_mode_two_finger = "two-finger";
28
43
char const* const touchpad_scroll_mode_edge = "edge";
47
char const* const touchpad_scroll_mode_edge = "edge";
29
44
48
31
45
char const* const me::touchpad_click_mode_opt= "touchpad-click-mode";
49
char const* const touchpad_click_mode_opt= "touchpad-click-mode";
32
46
50
33
47
char const* const touchpad_click_mode_area = "area";
51
char const* const touchpad_click_mode_area = "area";
34
48
char const* const touchpad_click_mode_finger_count = "finger-count";
52
char const* const touchpad_click_mode_finger_count = "finger-count";
35
53
}
36
49
54
37
50
void me::add_input_device_configuration_options_to(mir::Server& server)
55
void me::add_input_device_configuration_options_to(mir::Server& server)
38
51
{
56
{
39
@@ -53,14 +58,17 @@
40
53
    server.add_configuration_option(disable_while_typing_opt,
58
    server.add_configuration_option(disable_while_typing_opt,
41
54
                                    "Disable touchpad while typing on keyboard configuration [true, false]",
59
                                    "Disable touchpad while typing on keyboard configuration [true, false]",
42
55
                                    false);
60
                                    false);
43
61
    server.add_configuration_option(mouse_acceleration_opt,
44
62
                                    "Select acceleration profile for mice and trackballs [none, adaptive]",
45
63
                                    acceleration_adaptive);
46
56
    server.add_configuration_option(mouse_cursor_acceleration_bias_opt,
64
    server.add_configuration_option(mouse_cursor_acceleration_bias_opt,
48
57
                                    "Bias to the acceleration curve within the range [-1.0, 1.0] for mice",
65
                                    "Constant factor (+1) to velocity or bias to the acceleration curve within the range [-1.0, 1.0] for mice",
49
58
                                    0.0);
66
                                    0.0);
50
59
    server.add_configuration_option(mouse_scroll_speed_scale_opt,
67
    server.add_configuration_option(mouse_scroll_speed_scale_opt,
51
60
                                    "Scales mice scroll events, use negative values for natural scrolling",
68
                                    "Scales mice scroll events, use negative values for natural scrolling",
52
61
                                    1.0);
69
                                    1.0);
53
62
    server.add_configuration_option(touchpad_cursor_acceleration_bias_opt,
70
    server.add_configuration_option(touchpad_cursor_acceleration_bias_opt,
55
63
                                    "Bias to the acceleration curve within the range [-1.0, 1.0] for touchpads",
71
                                    "Constant factor (+1) to velocity or bias to the acceleration curve within the range [-1.0, 1.0] for touchpads",
56
64
                                    0.0);
72
                                    0.0);
57
65
    server.add_configuration_option(touchpad_scroll_speed_scale_opt,
73
    server.add_configuration_option(touchpad_scroll_speed_scale_opt,
58
66
                                    "Scales touchpad scroll events, use negative values for natural scrolling",
74
                                    "Scales touchpad scroll events, use negative values for natural scrolling",
59
@@ -93,6 +101,13 @@
60
93
        return mir_touchpad_scroll_mode_none;
101
        return mir_touchpad_scroll_mode_none;
61
94
    };
102
    };
62
95
103
63
104
    auto to_profile = [](std::string const& val)
64
105
    {
65
106
        if (val == acceleration_none)
66
107
            return mir_pointer_acceleration_none;
67
108
        return mir_pointer_acceleration_adaptive;
68
109
    };
69
110
70
96
    auto convert_to_click_mode = [](std::string const& val)
111
    auto convert_to_click_mode = [](std::string const& val)
71
97
    {
112
    {
72
98
        if (val == touchpad_click_mode_finger_count)
113
        if (val == touchpad_click_mode_finger_count)
73
@@ -107,6 +122,7 @@
74
107
            auto const options = server.get_options();
122
            auto const options = server.get_options();
75
108
            auto const input_config = std::make_shared<me::InputDeviceConfig>(
123
            auto const input_config = std::make_shared<me::InputDeviceConfig>(
76
109
                options->get<bool>(disable_while_typing_opt),
124
                options->get<bool>(disable_while_typing_opt),
77
125
                to_profile(options->get<std::string>(mouse_acceleration_opt)),
78
110
                clamp_to_range(options->get<double>(mouse_cursor_acceleration_bias_opt)),
126
                clamp_to_range(options->get<double>(mouse_cursor_acceleration_bias_opt)),
79
111
                options->get<double>(mouse_scroll_speed_scale_opt),
127
                options->get<double>(mouse_scroll_speed_scale_opt),
80
112
                clamp_to_range(options->get<double>(touchpad_cursor_acceleration_bias_opt)),
128
                clamp_to_range(options->get<double>(touchpad_cursor_acceleration_bias_opt)),
81
@@ -122,13 +138,15 @@
82
122
/// Demonstrate how to implement an InputDeviceObserver that identifies and configures input devices.
138
/// Demonstrate how to implement an InputDeviceObserver that identifies and configures input devices.
83
123
139
84
124
me::InputDeviceConfig::InputDeviceConfig(bool disable_while_typing,
140
me::InputDeviceConfig::InputDeviceConfig(bool disable_while_typing,
85
141
                                         MirPointerAcceleration mouse_profile,
86
125
                                         double mouse_cursor_acceleration_bias,
142
                                         double mouse_cursor_acceleration_bias,
87
126
                                         double mouse_scroll_speed_scale,
143
                                         double mouse_scroll_speed_scale,
88
127
                                         double touchpad_cursor_acceleration_bias,
144
                                         double touchpad_cursor_acceleration_bias,
89
128
                                         double touchpad_scroll_speed_scale,
145
                                         double touchpad_scroll_speed_scale,
90
129
                                         MirTouchpadClickModes click_mode,
146
                                         MirTouchpadClickModes click_mode,
91
130
                                         MirTouchpadClickModes scroll_mode)
147
                                         MirTouchpadClickModes scroll_mode)
93
131
    : disable_while_typing(disable_while_typing), mouse_cursor_acceleration_bias(mouse_cursor_acceleration_bias),
148
    : disable_while_typing(disable_while_typing), mouse_profile{mouse_profile},
94
149
      mouse_cursor_acceleration_bias(mouse_cursor_acceleration_bias),
95
132
      mouse_scroll_speed_scale(mouse_scroll_speed_scale),
150
      mouse_scroll_speed_scale(mouse_scroll_speed_scale),
96
133
      touchpad_cursor_acceleration_bias(touchpad_cursor_acceleration_bias),
151
      touchpad_cursor_acceleration_bias(touchpad_cursor_acceleration_bias),
97
134
      touchpad_scroll_speed_scale(touchpad_scroll_speed_scale), click_mode(click_mode), scroll_mode(scroll_mode)
152
      touchpad_scroll_speed_scale(touchpad_scroll_speed_scale), click_mode(click_mode), scroll_mode(scroll_mode)
98
@@ -154,6 +172,7 @@
99
154
    else if (contains(device->capabilities(), mi::DeviceCapability::pointer))
172
    else if (contains(device->capabilities(), mi::DeviceCapability::pointer))
100
155
    {
173
    {
101
156
        mi::PointerConfiguration pointer_config( device->pointer_configuration().value() );
174
        mi::PointerConfiguration pointer_config( device->pointer_configuration().value() );
102
175
        pointer_config.acceleration = mouse_profile;
103
157
        pointer_config.cursor_acceleration_bias = mouse_cursor_acceleration_bias;
176
        pointer_config.cursor_acceleration_bias = mouse_cursor_acceleration_bias;
104
158
        pointer_config.vertical_scroll_scale  = mouse_scroll_speed_scale;
177
        pointer_config.vertical_scroll_scale  = mouse_scroll_speed_scale;
105
159
        pointer_config.horizontal_scroll_scale = mouse_scroll_speed_scale;
178
        pointer_config.horizontal_scroll_scale = mouse_scroll_speed_scale;
106
160
179
107
=== modified file 'examples/server_example_input_device_config.h'
108
--- examples/server_example_input_device_config.h	2015-12-06 23:57:03 +0000
109
+++ examples/server_example_input_device_config.h	2016-01-19 22:31:46 +0000
110
@@ -33,20 +33,13 @@
111
33
33
112
34
namespace examples
34
namespace examples
113
35
{
35
{
114
36
extern char const* const disable_while_typing_opt;
115
37
extern char const* const mouse_cursor_acceleration_bias_opt;
116
38
extern char const* const mouse_scroll_speed_scale_opt;
117
39
extern char const* const touchpad_cursor_acceleration_bias_opt;
118
40
extern char const* const touchpad_scroll_speed_scale_opt;
119
41
extern char const* const touchpad_click_mode_opt;
120
42
extern char const* const touchpad_scroll_mode_opt;
121
43
122
44
void add_input_device_configuration_options_to(Server& server);
36
void add_input_device_configuration_options_to(Server& server);
123
45
37
124
46
class InputDeviceConfig : public mir::input::InputDeviceObserver
38
class InputDeviceConfig : public mir::input::InputDeviceObserver
125
47
{
39
{
126
48
public:
40
public:
127
49
    InputDeviceConfig(bool disable_while_typing,
41
    InputDeviceConfig(bool disable_while_typing,
128
42
                      MirPointerAcceleration mouse_profile,
129
50
                      double mouse_cursor_acceleration_bias,
43
                      double mouse_cursor_acceleration_bias,
130
51
                      double mouse_scroll_speed_scale,
44
                      double mouse_scroll_speed_scale,
131
52
                      double touchpad_cursor_acceleration_bias,
45
                      double touchpad_cursor_acceleration_bias,
132
@@ -59,6 +52,7 @@
133
59
    void changes_complete() override {}
52
    void changes_complete() override {}
134
60
private:
53
private:
135
61
    bool disable_while_typing;
54
    bool disable_while_typing;
136
55
    MirPointerAcceleration mouse_profile;
137
62
    double mouse_cursor_acceleration_bias;
56
    double mouse_cursor_acceleration_bias;
138
63
    double mouse_scroll_speed_scale;
57
    double mouse_scroll_speed_scale;
139
64
    double touchpad_cursor_acceleration_bias;
58
    double touchpad_cursor_acceleration_bias;
140
65
59
141
=== modified file 'include/client/mir_toolkit/mir_input_device.h'
142
--- include/client/mir_toolkit/mir_input_device.h	2015-10-26 03:33:22 +0000
143
+++ include/client/mir_toolkit/mir_input_device.h	2016-01-19 22:31:46 +0000
144
@@ -32,6 +32,21 @@
145
32
    mir_pointer_handedness_left = 1
32
    mir_pointer_handedness_left = 1
146
33
} MirPointerHandedness;
33
} MirPointerHandedness;
147
34
34
148
35
/**
149
36
 * MirPointerAcceleration describes the way pointer movement is filtered:
150
37
 * - mir_pointer_acceleration_none: (acceleration bias + 1.0) is applied as
151
38
 *   a factor to the current velocity of the pointer. So a bias of 0 to results
152
39
 *   to no change of velocity.
153
40
 * - mir_pointer_acceleration_adaptive: acceleration bias selects an
154
41
 *   acceleration function based on the current velocity that usually consists
155
42
 *   of two linear inclines separated by a plateau.
156
43
 */
157
44
typedef enum MirPointerAcceleration
158
45
{
159
46
    mir_pointer_acceleration_none = 1,
160
47
    mir_pointer_acceleration_adaptive = 2
161
48
} MirPointerAcceleration;
162
49
163
35
typedef enum MirTouchpadClickMode
50
typedef enum MirTouchpadClickMode
164
36
{
51
{
165
37
    mir_touchpad_click_mode_none          = 0,
52
    mir_touchpad_click_mode_none          = 0,
166
38
53
167
=== modified file 'include/platform/mir/input/pointer_settings.h'
168
--- include/platform/mir/input/pointer_settings.h	2015-10-26 03:33:22 +0000
169
+++ include/platform/mir/input/pointer_settings.h	2016-01-19 22:31:46 +0000
170
@@ -43,6 +43,10 @@
171
43
     */
43
     */
172
44
    double cursor_acceleration_bias{0.0};
44
    double cursor_acceleration_bias{0.0};
173
45
    /**
45
    /**
174
46
     * Acceleration profile
175
47
     */
176
48
    MirPointerAcceleration acceleration{mir_pointer_acceleration_adaptive};
177
49
    /**
178
46
     * Scale horizontal scrolling linearly
50
     * Scale horizontal scrolling linearly
179
47
     */
51
     */
180
48
    double horizontal_scroll_scale{1.0};
52
    double horizontal_scroll_scale{1.0};
181
49
53
182
=== modified file 'include/server/mir/input/pointer_configuration.h'
183
--- include/server/mir/input/pointer_configuration.h	2015-11-04 16:30:42 +0000
184
+++ include/server/mir/input/pointer_configuration.h	2016-01-19 22:31:46 +0000
185
@@ -33,10 +33,11 @@
186
33
{
33
{
187
34
    PointerConfiguration() {}
34
    PointerConfiguration() {}
188
35
35
193
36
    PointerConfiguration(MirPointerHandedness handedness, double acceleration_bias, double horizontal_scroll_scale,
36
    PointerConfiguration(MirPointerHandedness handedness, MirPointerAcceleration acceleration, double acceleration_bias,
194
37
                         double vertical_scroll_scale)
37
                         double horizontal_scroll_scale, double vertical_scroll_scale)
195
38
        : handedness{handedness}, cursor_acceleration_bias{acceleration_bias},
38
        : handedness{handedness}, acceleration{acceleration},
196
39
          horizontal_scroll_scale{horizontal_scroll_scale}, vertical_scroll_scale{vertical_scroll_scale}
39
          cursor_acceleration_bias{acceleration_bias}, horizontal_scroll_scale{horizontal_scroll_scale},
197
40
          vertical_scroll_scale{vertical_scroll_scale}
198
40
    {
41
    {
199
41
    }
42
    }
200
42
43
201
@@ -47,6 +48,11 @@
202
47
    MirPointerHandedness handedness{mir_pointer_handedness_right};
48
    MirPointerHandedness handedness{mir_pointer_handedness_right};
203
48
49
204
49
    /*!
50
    /*!
205
51
     * Configure cursor acceleration profile
206
52
     */
207
53
    MirPointerAcceleration acceleration{mir_pointer_acceleration_adaptive};
208
54
209
55
    /*!
210
50
     * Configures the intensity of the cursor acceleration. Values within the range of [-1, 1] are allowed.
56
     * Configures the intensity of the cursor acceleration. Values within the range of [-1, 1] are allowed.
211
51
     *   - 0: default acceleration
57
     *   - 0: default acceleration
212
52
     *   - [-1, 0): reduced acceleration
58
     *   - [-1, 0): reduced acceleration
213
53
59
214
=== modified file 'src/platforms/evdev/libinput_device.cpp'
215
--- src/platforms/evdev/libinput_device.cpp	2016-01-07 11:55:03 +0000
216
+++ src/platforms/evdev/libinput_device.cpp	2016-01-19 22:31:46 +0000
217
@@ -167,9 +167,8 @@
218
167
167
219
168
    report->received_event_from_kernel(time.count(), EV_REL, 0, 0);
168
    report->received_event_from_kernel(time.count(), EV_REL, 0, 0);
220
169
169
224
170
    mir::geometry::Displacement const movement{
170
    mir::geometry::Displacement const movement{libinput_event_pointer_get_dx(pointer),
225
171
        libinput_event_pointer_get_dx(pointer),
171
                                               libinput_event_pointer_get_dy(pointer)};
223
172
        libinput_event_pointer_get_dy(pointer)};
226
173
172
227
174
    return builder->pointer_event(time, action, button_state, hscroll_value, vscroll_value, movement.dx.as_float(),
173
    return builder->pointer_event(time, action, button_state, hscroll_value, vscroll_value, movement.dx.as_float(),
228
175
                                  movement.dy.as_float());
174
                                  movement.dy.as_float());
229
@@ -336,15 +335,18 @@
230
336
    if (!contains(info.capabilities, mi::DeviceCapability::pointer))
335
    if (!contains(info.capabilities, mi::DeviceCapability::pointer))
231
337
        return {};
336
        return {};
232
338
337
233
339
    auto dev = device();
234
340
    auto accel_bias = libinput_device_config_accel_get_speed(dev);
235
341
    auto left_handed = (libinput_device_config_left_handed_get(dev) == 1);
236
342
237
343
    mi::PointerSettings settings;
338
    mi::PointerSettings settings;
239
344
    settings.cursor_acceleration_bias = accel_bias;
339
    auto dev = device();
240
340
    auto const left_handed = (libinput_device_config_left_handed_get(dev) == 1);
241
341
    settings.handedness = left_handed? mir_pointer_handedness_left : mir_pointer_handedness_right;
242
342
    if (libinput_device_config_accel_get_profile(dev) == LIBINPUT_CONFIG_ACCEL_PROFILE_FLAT)
243
343
        settings.acceleration = mir_pointer_acceleration_none;
244
344
    else
245
345
        settings.acceleration = mir_pointer_acceleration_adaptive;
246
346
247
347
    settings.cursor_acceleration_bias = libinput_device_config_accel_get_speed(dev);
248
345
    settings.vertical_scroll_scale = vertical_scroll_scale;
348
    settings.vertical_scroll_scale = vertical_scroll_scale;
249
346
    settings.horizontal_scroll_scale = horizontal_scroll_scale;
349
    settings.horizontal_scroll_scale = horizontal_scroll_scale;
250
347
    settings.handedness = left_handed? mir_pointer_handedness_left : mir_pointer_handedness_right;
251
348
    return settings;
350
    return settings;
252
349
}
351
}
253
350
352
254
@@ -354,10 +356,15 @@
255
354
        return;
356
        return;
256
355
357
257
356
    auto dev = device();
358
    auto dev = device();
258
359
259
360
    auto accel_profile = settings.acceleration == mir_pointer_acceleration_adaptive ?
260
361
        LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE :
261
362
        LIBINPUT_CONFIG_ACCEL_PROFILE_FLAT;
262
357
    libinput_device_config_accel_set_speed(dev, settings.cursor_acceleration_bias);
363
    libinput_device_config_accel_set_speed(dev, settings.cursor_acceleration_bias);
263
358
    libinput_device_config_left_handed_set(dev, mir_pointer_handedness_left == settings.handedness);
364
    libinput_device_config_left_handed_set(dev, mir_pointer_handedness_left == settings.handedness);
264
359
    vertical_scroll_scale = settings.vertical_scroll_scale;
365
    vertical_scroll_scale = settings.vertical_scroll_scale;
265
360
    horizontal_scroll_scale = settings.horizontal_scroll_scale;
366
    horizontal_scroll_scale = settings.horizontal_scroll_scale;
266
367
    libinput_device_config_accel_set_profile(dev, accel_profile);
267
361
}
368
}
268
362
369
269
363
mir::optional_value<mi::TouchpadSettings> mie::LibInputDevice::get_touchpad_settings() const
370
mir::optional_value<mi::TouchpadSettings> mie::LibInputDevice::get_touchpad_settings() const
270
364
371
271
=== modified file 'src/server/input/default_device.cpp'
272
--- src/server/input/default_device.cpp	2015-11-04 19:47:19 +0000
273
+++ src/server/input/default_device.cpp	2016-01-19 22:31:46 +0000
274
@@ -62,8 +62,9 @@
275
62
62
276
63
    auto const& settings = pointer.value();
63
    auto const& settings = pointer.value();
277
64
64
280
65
    return PointerConfiguration(settings.handedness, settings.cursor_acceleration_bias,
65
    return PointerConfiguration(settings.handedness, settings.acceleration,
281
66
                                settings.horizontal_scroll_scale, settings.vertical_scroll_scale);
66
                                settings.cursor_acceleration_bias, settings.horizontal_scroll_scale,
282
67
                                settings.vertical_scroll_scale);
283
67
}
68
}
284
68
69
285
69
mir::optional_value<mi::TouchpadConfiguration> mi::DefaultDevice::touchpad_configuration() const
70
mir::optional_value<mi::TouchpadConfiguration> mi::DefaultDevice::touchpad_configuration() const
286
@@ -88,6 +89,7 @@
287
88
89
288
89
    PointerSettings settings;
90
    PointerSettings settings;
289
90
    settings.handedness = conf.handedness;
91
    settings.handedness = conf.handedness;
290
92
    settings.acceleration = conf.acceleration;
291
91
    settings.cursor_acceleration_bias = conf.cursor_acceleration_bias;
93
    settings.cursor_acceleration_bias = conf.cursor_acceleration_bias;
292
92
    settings.vertical_scroll_scale = conf.vertical_scroll_scale;
94
    settings.vertical_scroll_scale = conf.vertical_scroll_scale;
293
93
    settings.horizontal_scroll_scale = conf.horizontal_scroll_scale;
95
    settings.horizontal_scroll_scale = conf.horizontal_scroll_scale;
294
94
96
295
=== modified file 'tests/include/mir/test/doubles/mock_libinput.h'
296
--- tests/include/mir/test/doubles/mock_libinput.h	2016-01-07 11:55:03 +0000
297
+++ tests/include/mir/test/doubles/mock_libinput.h	2016-01-19 22:31:46 +0000
298
@@ -121,6 +121,8 @@
299
121
    MOCK_METHOD2(libinput_device_config_accel_set_speed, libinput_config_status(libinput_device*, double speed));
121
    MOCK_METHOD2(libinput_device_config_accel_set_speed, libinput_config_status(libinput_device*, double speed));
300
122
    MOCK_METHOD1(libinput_device_config_accel_get_speed, double(libinput_device*));
122
    MOCK_METHOD1(libinput_device_config_accel_get_speed, double(libinput_device*));
301
123
    MOCK_METHOD1(libinput_device_config_accel_get_default_speed, double(libinput_device*));
123
    MOCK_METHOD1(libinput_device_config_accel_get_default_speed, double(libinput_device*));
302
124
    MOCK_METHOD2(libinput_device_config_accel_set_profile, libinput_config_status(libinput_device*, libinput_config_accel_profile));
303
125
    MOCK_METHOD1(libinput_device_config_accel_get_profile, libinput_config_accel_profile(libinput_device*));
304
124
    MOCK_METHOD1(libinput_device_config_scroll_has_natural_scroll, int(libinput_device*));
126
    MOCK_METHOD1(libinput_device_config_scroll_has_natural_scroll, int(libinput_device*));
305
125
    MOCK_METHOD2(libinput_device_config_scroll_set_natural_scroll_enabled, libinput_config_status(libinput_device*, int enable));
127
    MOCK_METHOD2(libinput_device_config_scroll_set_natural_scroll_enabled, libinput_config_status(libinput_device*, int enable));
306
126
    MOCK_METHOD1(libinput_device_config_scroll_get_natural_scroll_enabled, int(libinput_device*));
128
    MOCK_METHOD1(libinput_device_config_scroll_get_natural_scroll_enabled, int(libinput_device*));
307
127
129
308
=== modified file 'tests/mir_test_doubles/mock_libinput.cpp'
309
--- tests/mir_test_doubles/mock_libinput.cpp	2016-01-07 11:55:03 +0000
310
+++ tests/mir_test_doubles/mock_libinput.cpp	2016-01-19 22:31:46 +0000
311
@@ -51,6 +51,8 @@
312
51
        .WillByDefault(Return(LIBINPUT_CONFIG_STATUS_SUCCESS));
51
        .WillByDefault(Return(LIBINPUT_CONFIG_STATUS_SUCCESS));
313
52
    ON_CALL(*this, libinput_device_config_middle_emulation_set_enabled(_, _))
52
    ON_CALL(*this, libinput_device_config_middle_emulation_set_enabled(_, _))
314
53
        .WillByDefault(Return(LIBINPUT_CONFIG_STATUS_SUCCESS));
53
        .WillByDefault(Return(LIBINPUT_CONFIG_STATUS_SUCCESS));
315
54
    ON_CALL(*this, libinput_device_config_accel_set_profile(_, _))
316
55
        .WillByDefault(Return(LIBINPUT_CONFIG_STATUS_SUCCESS));
317
54
}
56
}
318
55
57
319
56
void mtd::MockLibInput::wake()
58
void mtd::MockLibInput::wake()
320
@@ -458,6 +460,16 @@
321
458
    return global_libinput->libinput_device_config_accel_get_default_speed(device);
460
    return global_libinput->libinput_device_config_accel_get_default_speed(device);
322
459
}
461
}
323
460
462
324
463
libinput_config_status libinput_device_config_accel_set_profile(libinput_device* dev, libinput_config_accel_profile profile)
325
464
{
326
465
    return global_libinput->libinput_device_config_accel_set_profile(dev, profile);
327
466
}
328
467
329
468
libinput_config_accel_profile libinput_device_config_accel_get_profile(libinput_device* dev)
330
469
{
331
470
    return global_libinput->libinput_device_config_accel_get_profile(dev);
332
471
}
333
472
334
461
int libinput_device_config_scroll_has_natural_scroll(libinput_device *device)
473
int libinput_device_config_scroll_has_natural_scroll(libinput_device *device)
335
462
{
474
{
336
463
    return global_libinput->libinput_device_config_scroll_has_natural_scroll(device);
475
    return global_libinput->libinput_device_config_scroll_has_natural_scroll(device);
337
464
476
338
=== modified file 'tests/mir_test_framework/fake_input_device_impl.cpp'
339
--- tests/mir_test_framework/fake_input_device_impl.cpp	2015-11-25 20:26:59 +0000
340
+++ tests/mir_test_framework/fake_input_device_impl.cpp	2016-01-19 22:31:46 +0000
341
@@ -90,6 +90,9 @@
342
90
                                                   std::shared_ptr<mir::dispatch::Dispatchable> const& dispatchable)
90
                                                   std::shared_ptr<mir::dispatch::Dispatchable> const& dispatchable)
343
91
    : info(info), queue{dispatchable}, buttons{0}
91
    : info(info), queue{dispatchable}, buttons{0}
344
92
{
92
{
345
93
    // the default setup results in a direct mapping of input velocity to output velocity.
346
94
    settings.acceleration = mir_pointer_acceleration_none;
347
95
    settings.cursor_acceleration_bias = 0.0;
348
93
}
96
}
349
94
97
350
95
void mtf::FakeInputDeviceImpl::InputDevice::synthesize_events(synthesis::KeyParameters const& key_params)
98
void mtf::FakeInputDeviceImpl::InputDevice::synthesize_events(synthesis::KeyParameters const& key_params)
351
@@ -151,9 +154,9 @@
352
151
    // constant scaling is used here to simplify checking for the
154
    // constant scaling is used here to simplify checking for the
353
152
    // expected results. Default settings of the device lead to no
155
    // expected results. Default settings of the device lead to no
354
153
    // scaling at all.
156
    // scaling at all.
358
154
    auto acceleration = (settings.cursor_acceleration_bias + 1.0);
157
    auto const acceleration = settings.cursor_acceleration_bias + 1.0;
359
155
    auto rel_x = pointer.rel_x * acceleration;
158
    auto const rel_x = pointer.rel_x * acceleration;
360
156
    auto rel_y = pointer.rel_y * acceleration;
159
    auto const rel_y = pointer.rel_y * acceleration;
361
157
160
362
158
    auto pointer_event = builder->pointer_event(event_time,
161
    auto pointer_event = builder->pointer_event(event_time,
363
159
                                                mir_pointer_action_motion,
162
                                                mir_pointer_action_motion,
364
@@ -213,7 +216,7 @@
365
213
    if (!contains(info.capabilities, mi::DeviceCapability::pointer))
216
    if (!contains(info.capabilities, mi::DeviceCapability::pointer))
366
214
        return ret;
217
        return ret;
367
215
218
369
216
    ret = mi::PointerSettings();
219
    ret = settings;
370
217
    return ret;
220
    return ret;
371
218
}
221
}
372
219
222
373
220
223
374
=== modified file 'tests/unit-tests/input/evdev/test_libinput_device.cpp'
375
--- tests/unit-tests/input/evdev/test_libinput_device.cpp	2016-01-07 11:55:03 +0000
376
+++ tests/unit-tests/input/evdev/test_libinput_device.cpp	2016-01-19 22:31:46 +0000
377
@@ -208,12 +208,16 @@
378
208
        return device_path;
208
        return device_path;
379
209
    }
209
    }
380
210
210
382
211
    void setup_pointer_configuration(libinput_device* dev, double accel_speed, MirPointerHandedness handedness)
211
    void setup_pointer_configuration(libinput_device* dev, double accel_speed, MirPointerHandedness handedness, MirPointerAcceleration profile)
383
212
    {
212
    {
384
213
        ON_CALL(mock_libinput, libinput_device_config_accel_get_speed(dev))
213
        ON_CALL(mock_libinput, libinput_device_config_accel_get_speed(dev))
385
214
            .WillByDefault(Return(accel_speed));
214
            .WillByDefault(Return(accel_speed));
386
215
        ON_CALL(mock_libinput, libinput_device_config_left_handed_get(dev))
215
        ON_CALL(mock_libinput, libinput_device_config_left_handed_get(dev))
387
216
            .WillByDefault(Return(handedness == mir_pointer_handedness_left));
216
            .WillByDefault(Return(handedness == mir_pointer_handedness_left));
388
217
        ON_CALL(mock_libinput, libinput_device_config_accel_get_profile(dev))
389
218
            .WillByDefault(Return((profile == mir_pointer_acceleration_none) ?
390
219
                                      LIBINPUT_CONFIG_ACCEL_PROFILE_FLAT :
391
220
                                      LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE));
392
217
    }
221
    }
393
218
222
394
219
    void setup_touchpad_configuration(libinput_device* dev,
223
    void setup_touchpad_configuration(libinput_device* dev,
395
@@ -779,7 +783,7 @@
396
779
783
397
780
TEST_F(LibInputDeviceOnMouse, reads_pointer_settings_from_libinput)
784
TEST_F(LibInputDeviceOnMouse, reads_pointer_settings_from_libinput)
398
781
{
785
{
400
782
    setup_pointer_configuration(mouse.device(), 1, mir_pointer_handedness_right);
786
    setup_pointer_configuration(mouse.device(), 1, mir_pointer_handedness_right, mir_pointer_acceleration_none);
401
783
    auto optional_settings = mouse.get_pointer_settings();
787
    auto optional_settings = mouse.get_pointer_settings();
402
784
788
403
785
    EXPECT_THAT(optional_settings.is_set(), Eq(true));
789
    EXPECT_THAT(optional_settings.is_set(), Eq(true));
404
@@ -789,8 +793,9 @@
405
789
    EXPECT_THAT(ptr_settings.cursor_acceleration_bias, Eq(1.0));
793
    EXPECT_THAT(ptr_settings.cursor_acceleration_bias, Eq(1.0));
406
790
    EXPECT_THAT(ptr_settings.horizontal_scroll_scale, Eq(1.0));
794
    EXPECT_THAT(ptr_settings.horizontal_scroll_scale, Eq(1.0));
407
791
    EXPECT_THAT(ptr_settings.vertical_scroll_scale, Eq(1.0));
795
    EXPECT_THAT(ptr_settings.vertical_scroll_scale, Eq(1.0));
408
796
    EXPECT_THAT(ptr_settings.acceleration, Eq(mir_pointer_acceleration_none));
409
792
797
411
793
    setup_pointer_configuration(mouse.device(), 0.0, mir_pointer_handedness_left);
798
    setup_pointer_configuration(mouse.device(), 0.0, mir_pointer_handedness_left, mir_pointer_acceleration_adaptive);
412
794
    optional_settings = mouse.get_pointer_settings();
799
    optional_settings = mouse.get_pointer_settings();
413
795
800
414
796
    EXPECT_THAT(optional_settings.is_set(), Eq(true));
801
    EXPECT_THAT(optional_settings.is_set(), Eq(true));
415
@@ -800,23 +805,27 @@
416
800
    EXPECT_THAT(ptr_settings.cursor_acceleration_bias, Eq(0.0));
805
    EXPECT_THAT(ptr_settings.cursor_acceleration_bias, Eq(0.0));
417
801
    EXPECT_THAT(ptr_settings.horizontal_scroll_scale, Eq(1.0));
806
    EXPECT_THAT(ptr_settings.horizontal_scroll_scale, Eq(1.0));
418
802
    EXPECT_THAT(ptr_settings.vertical_scroll_scale, Eq(1.0));
807
    EXPECT_THAT(ptr_settings.vertical_scroll_scale, Eq(1.0));
419
808
    EXPECT_THAT(ptr_settings.acceleration, Eq(mir_pointer_acceleration_adaptive));
420
803
}
809
}
421
804
810
422
805
TEST_F(LibInputDeviceOnMouse, applies_pointer_settings)
811
TEST_F(LibInputDeviceOnMouse, applies_pointer_settings)
423
806
{
812
{
425
807
    setup_pointer_configuration(mouse.device(), 1, mir_pointer_handedness_right);
813
    setup_pointer_configuration(mouse.device(), 1, mir_pointer_handedness_right, mir_pointer_acceleration_adaptive);
426
808
    mi::PointerSettings settings(mouse.get_pointer_settings().value());
814
    mi::PointerSettings settings(mouse.get_pointer_settings().value());
427
809
    settings.cursor_acceleration_bias = 1.1;
815
    settings.cursor_acceleration_bias = 1.1;
428
810
    settings.handedness = mir_pointer_handedness_left;
816
    settings.handedness = mir_pointer_handedness_left;
429
817
    settings.acceleration = mir_pointer_acceleration_none;
430
811
818
433
812
    EXPECT_CALL(mock_libinput,libinput_device_config_accel_set_speed(mouse.device(), 1.1)).Times(1);
819
    EXPECT_CALL(mock_libinput, libinput_device_config_accel_set_speed(mouse.device(), 1.1)).Times(1);
434
813
    EXPECT_CALL(mock_libinput,libinput_device_config_left_handed_set(mouse.device(), true)).Times(1);
820
    EXPECT_CALL(mock_libinput, libinput_device_config_accel_set_profile(mouse.device(), LIBINPUT_CONFIG_ACCEL_PROFILE_FLAT)).Times(1);
435
821
    EXPECT_CALL(mock_libinput, libinput_device_config_left_handed_set(mouse.device(), true)).Times(1);
436
814
822
437
815
    mouse.apply_settings(settings);
823
    mouse.apply_settings(settings);
438
816
}
824
}
439
817
825
440
818
TEST_F(LibInputDeviceOnLaptopKeyboardAndMouse, denies_pointer_settings_on_keyboards)
826
TEST_F(LibInputDeviceOnLaptopKeyboardAndMouse, denies_pointer_settings_on_keyboards)
441
819
{
827
{
442
828
    setup_pointer_configuration(mouse.device(), 1, mir_pointer_handedness_right, mir_pointer_acceleration_adaptive);
443
820
    auto settings_from_mouse = mouse.get_pointer_settings();
829
    auto settings_from_mouse = mouse.get_pointer_settings();
444
821
830
445
822
    EXPECT_CALL(mock_libinput,libinput_device_config_accel_set_speed(_, _)).Times(0);
831
    EXPECT_CALL(mock_libinput,libinput_device_config_accel_set_speed(_, _)).Times(0);
446
@@ -834,7 +843,7 @@
447
834
    EXPECT_CALL(mock_sink, handle_input(mt::PointerAxisChange(mir_pointer_axis_vscroll, 3.0f)));
843
    EXPECT_CALL(mock_sink, handle_input(mt::PointerAxisChange(mir_pointer_axis_vscroll, 3.0f)));
448
835
    EXPECT_CALL(mock_sink, handle_input(mt::PointerAxisChange(mir_pointer_axis_hscroll, -10.0f)));
844
    EXPECT_CALL(mock_sink, handle_input(mt::PointerAxisChange(mir_pointer_axis_hscroll, -10.0f)));
449
836
845
451
837
    setup_pointer_configuration(mouse.device(), 1, mir_pointer_handedness_right);
846
    setup_pointer_configuration(mouse.device(), 1, mir_pointer_handedness_right, mir_pointer_acceleration_none);
452
838
    mi::PointerSettings settings(mouse.get_pointer_settings().value());
847
    mi::PointerSettings settings(mouse.get_pointer_settings().value());
453
839
    settings.vertical_scroll_scale = -1.0;
848
    settings.vertical_scroll_scale = -1.0;
454
840
    settings.horizontal_scroll_scale = 5.0;
849
    settings.horizontal_scroll_scale = 5.0;
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration	2015-12-15	Approve on 2016-01-21
Daniel van Vugt		2015-12-15	Approve on 2016-01-20
Mir CI Bot	continuous-integration		Approve on 2016-01-19
Kevin DuBois (community)			Approve on 2016-01-13
Review via email: mp+280593@code.launchpad.net