1
=== modified file 'benchmarks/frame-uniformity/touch_producing_server.cpp'
2
--- benchmarks/frame-uniformity/touch_producing_server.cpp	2015-10-05 02:18:18 +0000
3
+++ benchmarks/frame-uniformity/touch_producing_server.cpp	2015-11-20 15:25:54 +0000
4
@@ -26,7 +26,6 @@
5
26
#include <functional>
26
#include <functional>
6
27
27
7
28
namespace mi = mir::input;
28
namespace mi = mir::input;
8
29
namespace mia = mi::android;
9
30
namespace mg = mir::graphics;
29
namespace mg = mir::graphics;
10
31
namespace mis = mi::synthesis;
30
namespace mis = mi::synthesis;
11
32
namespace geom = mir::geometry;
31
namespace geom = mir::geometry;
12
33
32
13
=== modified file 'include/platform/mir/input/platform.h'
14
--- include/platform/mir/input/platform.h	2015-10-12 08:08:58 +0000
15
+++ include/platform/mir/input/platform.h	2015-11-20 15:25:54 +0000
16
@@ -91,7 +91,7 @@
17
91
};
91
};
18
92
92
19
93
typedef mir::UniqueModulePtr<Platform>(*CreatePlatform)(
93
typedef mir::UniqueModulePtr<Platform>(*CreatePlatform)(
21
94
    std::shared_ptr<options::Option> const& options,
94
    options::Option const& options,
22
95
    std::shared_ptr<EmergencyCleanupRegistry> const& emergency_cleanup_registry,
95
    std::shared_ptr<EmergencyCleanupRegistry> const& emergency_cleanup_registry,
23
96
    std::shared_ptr<InputDeviceRegistry> const& input_device_registry,
96
    std::shared_ptr<InputDeviceRegistry> const& input_device_registry,
24
97
    std::shared_ptr<InputReport> const& report);
97
    std::shared_ptr<InputReport> const& report);
25
@@ -123,7 +123,7 @@
26
123
 * \ingroup platform_enablement
123
 * \ingroup platform_enablement
27
124
 */
124
 */
28
125
mir::UniqueModulePtr<mir::input::Platform> create_input_platform(
125
mir::UniqueModulePtr<mir::input::Platform> create_input_platform(
30
126
    std::shared_ptr<mir::options::Option> const& options,
126
    mir::options::Option const& options,
31
127
    std::shared_ptr<mir::EmergencyCleanupRegistry> const& emergency_cleanup_registry,
127
    std::shared_ptr<mir::EmergencyCleanupRegistry> const& emergency_cleanup_registry,
32
128
    std::shared_ptr<mir::input::InputDeviceRegistry> const& input_device_registry,
128
    std::shared_ptr<mir::input::InputDeviceRegistry> const& input_device_registry,
33
129
    std::shared_ptr<mir::input::InputReport> const& report);
129
    std::shared_ptr<mir::input::InputReport> const& report);
34
130
130
35
=== modified file 'include/test/mir_test_framework/executable_path.h'
36
--- include/test/mir_test_framework/executable_path.h	2015-10-20 12:46:15 +0000
37
+++ include/test/mir_test_framework/executable_path.h	2015-11-20 15:25:54 +0000
38
@@ -26,6 +26,7 @@
39
26
std::string executable_path();
26
std::string executable_path();
40
27
27
41
28
std::string library_path();
28
std::string library_path();
42
29
std::string server_platform_path();
43
29
std::string udev_recordings_path();
30
std::string udev_recordings_path();
44
30
std::string server_platform(std::string const& name);
31
std::string server_platform(std::string const& name);
45
31
std::string server_input_platform(std::string const& name);
32
std::string server_input_platform(std::string const& name);
46
32
33
47
=== modified file 'src/include/server/mir/default_server_configuration.h'
48
--- src/include/server/mir/default_server_configuration.h	2015-11-19 04:54:42 +0000
49
+++ src/include/server/mir/default_server_configuration.h	2015-11-20 15:25:54 +0000
50
@@ -132,7 +132,6 @@
51
132
class Scene;
132
class Scene;
52
133
class InputManager;
133
class InputManager;
53
134
class SurfaceInputDispatcher;
134
class SurfaceInputDispatcher;
54
135
class Platform;
55
136
class InputDeviceRegistry;
135
class InputDeviceRegistry;
56
137
class InputDeviceHub;
136
class InputDeviceHub;
57
138
class DefaultInputDeviceHub;
137
class DefaultInputDeviceHub;
58
@@ -144,15 +143,8 @@
59
144
class InputRegion;
143
class InputRegion;
60
145
class InputSender;
144
class InputSender;
61
146
class InputSendObserver;
145
class InputSendObserver;
62
147
class NestedInputRelay;
63
148
class EventHandler;
64
149
class CursorImages;
146
class CursorImages;
65
150
class LegacyInputDispatchable;
147
class LegacyInputDispatchable;
66
151
namespace android
67
152
{
68
153
class InputRegistrar;
69
154
class InputThread;
70
155
}
71
156
}
148
}
72
157
149
73
158
namespace logging
150
namespace logging
74
@@ -331,7 +323,6 @@
75
331
    virtual std::shared_ptr<droidinput::InputListenerInterface> the_input_translator();
323
    virtual std::shared_ptr<droidinput::InputListenerInterface> the_input_translator();
76
332
324
77
333
    // new input reading related parts:
325
    // new input reading related parts:
78
334
    virtual std::shared_ptr<input::Platform> the_input_platform();
79
335
    virtual std::shared_ptr<dispatch::MultiplexingDispatchable> the_input_reading_multiplexer();
326
    virtual std::shared_ptr<dispatch::MultiplexingDispatchable> the_input_reading_multiplexer();
80
336
    virtual std::shared_ptr<input::InputDeviceRegistry> the_input_device_registry();
327
    virtual std::shared_ptr<input::InputDeviceRegistry> the_input_device_registry();
81
337
    virtual std::shared_ptr<input::InputDeviceHub> the_input_device_hub();
328
    virtual std::shared_ptr<input::InputDeviceHub> the_input_device_hub();
82
@@ -390,8 +381,7 @@
83
390
    CachedPtr<input::CompositeEventFilter> composite_event_filter;
381
    CachedPtr<input::CompositeEventFilter> composite_event_filter;
84
391
    CachedPtr<input::InputManager>    input_manager;
382
    CachedPtr<input::InputManager>    input_manager;
85
392
    CachedPtr<input::SurfaceInputDispatcher>    surface_input_dispatcher;
383
    CachedPtr<input::SurfaceInputDispatcher>    surface_input_dispatcher;
88
393
    CachedPtr<input::DefaultInputDeviceHub>    default_input_device_hub; // currently not used by default
384
    CachedPtr<input::DefaultInputDeviceHub>    default_input_device_hub;
87
394
    CachedPtr<input::Platform>    input_platform; // currently not used by default
89
395
    CachedPtr<dispatch::MultiplexingDispatchable> input_reading_multiplexer;
385
    CachedPtr<dispatch::MultiplexingDispatchable> input_reading_multiplexer;
90
396
    CachedPtr<input::InputDispatcher> input_dispatcher;
386
    CachedPtr<input::InputDispatcher> input_dispatcher;
91
397
    CachedPtr<input::InputSender>     input_sender;
387
    CachedPtr<input::InputSender>     input_sender;
92
398
388
93
=== added file 'src/include/server/mir/input/input_probe.h'
94
--- src/include/server/mir/input/input_probe.h	1970-01-01 00:00:00 +0000
95
+++ src/include/server/mir/input/input_probe.h	2015-11-20 15:25:54 +0000
96
@@ -0,0 +1,48 @@
97
1
/*
98
2
 * Copyright © 2015 Canonical Ltd.
99
3
 *
100
4
 * This program is free software: you can redistribute it and/or modify it
101
5
 * under the terms of the GNU General Public License version 3,
102
6
 * as published by the Free Software Foundation.
103
7
 *
104
8
 * This program is distributed in the hope that it will be useful,
105
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
106
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
107
11
 * GNU General Public License for more details.
108
12
 *
109
13
 * You should have received a copy of the GNU General Public License
110
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
111
15
 *
112
16
 * Authored by: Andreas Pokorny <andreas.pokorny@canonical.com>
113
17
 */
114
18
115
19
#ifndef MIR_INPUT_PROBE_H_
116
20
#define MIR_INPUT_PROBE_H_
117
21
118
22
#include <vector>
119
23
#include "mir/module_deleter.h"
120
24
121
25
namespace mir
122
26
{
123
27
namespace options
124
28
{
125
29
class Option;
126
30
}
127
31
class EmergencyCleanupRegistry;
128
32
class SharedLibraryProberReport;
129
33
130
34
namespace input
131
35
{
132
36
class InputReport;
133
37
class Platform;
134
38
class InputDeviceRegistry;
135
39
136
40
std::vector<mir::UniqueModulePtr<Platform>> probe_input_platforms(
137
41
    options::Option const& options, std::shared_ptr<EmergencyCleanupRegistry> const& emergency_cleanup,
138
42
    std::shared_ptr<InputDeviceRegistry> const& device_registry, std::shared_ptr<InputReport> const& input_report,
139
43
    SharedLibraryProberReport & prober_report);
140
44
141
45
}
142
46
}
143
47
144
48
#endif
145
0
49
146
=== modified file 'src/platform/graphics/platform_probe.cpp'
147
--- src/platform/graphics/platform_probe.cpp	2015-10-12 08:08:58 +0000
148
+++ src/platform/graphics/platform_probe.cpp	2015-11-20 15:25:54 +0000
149
@@ -46,7 +46,11 @@
150
46
                "describe_graphics_module",
46
                "describe_graphics_module",
151
47
                MIR_SERVER_GRAPHICS_PLATFORM_VERSION);
47
                MIR_SERVER_GRAPHICS_PLATFORM_VERSION);
152
48
            auto desc = describe();
48
            auto desc = describe();
154
49
            mir::log_info("Found graphics driver: %s", desc->name);
49
            mir::log_info("Found graphics driver: %s, (version: %d.%d.%d)",
155
50
                          desc->name,
156
51
                          desc->major_version,
157
52
                          desc->minor_version,
158
53
                          desc->micro_version);
159
50
        }
54
        }
160
51
        catch (std::runtime_error const&)
55
        catch (std::runtime_error const&)
161
52
        {
56
        {
162
53
57
163
=== modified file 'src/platforms/evdev/platform_factory.cpp'
164
--- src/platforms/evdev/platform_factory.cpp	2015-10-20 12:46:15 +0000
165
+++ src/platforms/evdev/platform_factory.cpp	2015-11-20 15:25:54 +0000
166
@@ -67,7 +67,7 @@
167
67
}
67
}
168
68
68
169
69
mir::UniqueModulePtr<mi::Platform> create_input_platform(
69
mir::UniqueModulePtr<mi::Platform> create_input_platform(
171
70
    std::shared_ptr<mo::Option> const& /*options*/,
70
    mo::Option const& /*options*/,
172
71
    std::shared_ptr<mir::EmergencyCleanupRegistry> const& /*emergency_cleanup_registry*/,
71
    std::shared_ptr<mir::EmergencyCleanupRegistry> const& /*emergency_cleanup_registry*/,
173
72
    std::shared_ptr<mi::InputDeviceRegistry> const& input_device_registry,
72
    std::shared_ptr<mi::InputDeviceRegistry> const& input_device_registry,
174
73
    std::shared_ptr<mi::InputReport> const& report)
73
    std::shared_ptr<mi::InputReport> const& report)
175
74
74
176
=== modified file 'src/platforms/mesa/server/x11/input/input.cpp'
177
--- src/platforms/mesa/server/x11/input/input.cpp	2015-10-12 08:08:58 +0000
178
+++ src/platforms/mesa/server/x11/input/input.cpp	2015-11-20 15:25:54 +0000
179
@@ -28,7 +28,7 @@
180
28
extern mx::X11Resources x11_resources;
28
extern mx::X11Resources x11_resources;
181
29
29
182
30
mir::UniqueModulePtr<mi::Platform> create_input_platform(
30
mir::UniqueModulePtr<mi::Platform> create_input_platform(
184
31
    std::shared_ptr<mo::Option> const& /*options*/,
31
    mo::Option const& /*options*/,
185
32
    std::shared_ptr<mir::EmergencyCleanupRegistry> const& /*emergency_cleanup_registry*/,
32
    std::shared_ptr<mir::EmergencyCleanupRegistry> const& /*emergency_cleanup_registry*/,
186
33
    std::shared_ptr<mi::InputDeviceRegistry> const& input_device_registry,
33
    std::shared_ptr<mi::InputDeviceRegistry> const& input_device_registry,
187
34
    std::shared_ptr<mi::InputReport> const& /*report*/)
34
    std::shared_ptr<mi::InputReport> const& /*report*/)
188
35
35
189
=== modified file 'src/server/input/CMakeLists.txt'
190
--- src/server/input/CMakeLists.txt	2015-11-04 16:30:42 +0000
191
+++ src/server/input/CMakeLists.txt	2015-11-20 15:25:54 +0000
192
@@ -14,6 +14,7 @@
193
14
  display_input_region.cpp
14
  display_input_region.cpp
194
15
  event_filter_chain_dispatcher.cpp
15
  event_filter_chain_dispatcher.cpp
195
16
  input_modifier_utils.cpp
16
  input_modifier_utils.cpp
196
17
  input_probe.cpp
197
17
  key_repeat_dispatcher.cpp
18
  key_repeat_dispatcher.cpp
198
18
  null_input_channel_factory.cpp
19
  null_input_channel_factory.cpp
199
19
  null_input_dispatcher.cpp
20
  null_input_dispatcher.cpp
200
20
21
201
=== modified file 'src/server/input/default_configuration.cpp'
202
--- src/server/input/default_configuration.cpp	2015-10-13 17:42:07 +0000
203
+++ src/server/input/default_configuration.cpp	2015-11-20 15:25:54 +0000
204
@@ -39,16 +39,16 @@
205
39
#include "surface_input_dispatcher.h"
39
#include "surface_input_dispatcher.h"
206
40
40
207
41
#include "mir/input/touch_visualizer.h"
41
#include "mir/input/touch_visualizer.h"
208
42
#include "mir/input/input_probe.h"
209
42
#include "mir/input/platform.h"
43
#include "mir/input/platform.h"
210
43
#include "mir/options/configuration.h"
44
#include "mir/options/configuration.h"
211
44
#include "mir/options/option.h"
45
#include "mir/options/option.h"
212
45
#include "mir/dispatch/multiplexing_dispatchable.h"
46
#include "mir/dispatch/multiplexing_dispatchable.h"
213
46
#include "mir/compositor/scene.h"
47
#include "mir/compositor/scene.h"
214
47
#include "mir/emergency_cleanup.h"
48
#include "mir/emergency_cleanup.h"
215
48
#include "mir/report/legacy_input_report.h"
216
49
#include "mir/main_loop.h"
49
#include "mir/main_loop.h"
217
50
#include "mir/shared_library.h"
218
51
#include "mir/glib_main_loop.h"
50
#include "mir/glib_main_loop.h"
219
51
#include "mir/log.h"
220
52
#include "mir/dispatch/action_queue.h"
52
#include "mir/dispatch/action_queue.h"
221
53
53
222
54
#include "mir_toolkit/cursors.h"
54
#include "mir_toolkit/cursors.h"
223
@@ -290,26 +290,6 @@
224
290
        });
290
        });
225
291
}
291
}
226
292
292
227
293
std::shared_ptr<mi::Platform>
228
294
mir::DefaultServerConfiguration::the_input_platform()
229
295
{
230
296
    return input_platform(
231
297
        [this]() -> std::shared_ptr<mi::Platform>
232
298
        {
233
299
            auto options = the_options();
234
300
235
301
            if (!options->is_set(options::platform_input_lib))
236
302
                return nullptr;
237
303
238
304
            auto lib = std::make_shared<mir::SharedLibrary>(
239
305
                options->get<std::string>(options::platform_input_lib));
240
306
            auto create = lib->load_function<mi::CreatePlatform>(
241
307
                "create_input_platform",
242
308
                MIR_SERVER_INPUT_PLATFORM_VERSION);
243
309
            return create(the_options(), the_emergency_cleanup(), the_input_device_registry(), the_input_report());
244
310
        });
245
311
}
246
312
247
313
namespace
293
namespace
248
314
{
294
{
249
315
class NullLegacyInputDispatchable : public mi::LegacyInputDispatchable
295
class NullLegacyInputDispatchable : public mi::LegacyInputDispatchable
250
@@ -341,23 +321,20 @@
251
341
            }
321
            }
252
342
            else
322
            else
253
343
            {
323
            {
271
344
                if (options->get<std::string>(options::legacy_input_report_opt) == options::log_opt_value)
324
                auto platforms = probe_input_platforms(*options, the_emergency_cleanup(), the_input_device_registry(),
272
345
                    mr::legacy_input::initialize(the_logger());
325
                                                       the_input_report(), *the_shared_library_prober_report());
273
346
326
274
347
                if (auto platform = the_input_platform())
327
                if (platforms.empty())
275
348
                {
328
                    BOOST_THROW_EXCEPTION(std::runtime_error("No input platforms found"));
276
349
                    auto const ret = std::make_shared<mi::DefaultInputManager>(
329
277
350
                        the_input_reading_multiplexer(),
330
                auto const ret = std::make_shared<mi::DefaultInputManager>(
278
351
                        std::make_shared<NullLegacyInputDispatchable>());
331
                    the_input_reading_multiplexer(),
279
352
332
                    std::make_shared<NullLegacyInputDispatchable>());
280
353
                    ret->add_platform(platform);
333
281
354
                    return ret;
334
                for (auto & platform : platforms)
282
355
                }
335
                    ret->add_platform(std::move(platform));
283
356
                else
336
284
357
                {
337
                return ret;
268
358
                    return std::make_shared<mi::DefaultInputManager>(
269
359
                        the_input_reading_multiplexer(), the_legacy_input_dispatchable());
270
360
                }
285
361
            }
338
            }
286
362
        }
339
        }
287
363
    );
340
    );
288
364
341
289
=== added file 'src/server/input/input_probe.cpp'
290
--- src/server/input/input_probe.cpp	1970-01-01 00:00:00 +0000
291
+++ src/server/input/input_probe.cpp	2015-11-20 15:25:54 +0000
292
@@ -0,0 +1,104 @@
293
1
/*
294
2
 * Copyright © 2015 Canonical Ltd.
295
3
 *
296
4
 * This program is free software: you can redistribute it and/or modify it
297
5
 * under the terms of the GNU General Public License version 3,
298
6
 * as published by the Free Software Foundation.
299
7
 *
300
8
 * This program is distributed in the hope that it will be useful,
301
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
302
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
303
11
 * GNU General Public License for more details.
304
12
 *
305
13
 * You should have received a copy of the GNU General Public License
306
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
307
15
 *
308
16
 * Authored by: Andreas Pokorny <andreas.pokorny@canonical.com>
309
17
 */
310
18
311
19
#include "mir/input/input_probe.h"
312
20
#include "mir/input/platform.h"
313
21
314
22
#include "mir/options/configuration.h"
315
23
#include "mir/options/option.h"
316
24
317
25
#include "mir/shared_library_prober.h"
318
26
#include "mir/shared_library.h"
319
27
#include "mir/log.h"
320
28
#include "mir/module_deleter.h"
321
29
322
30
#include <stdexcept>
323
31
324
32
namespace mi = mir::input;
325
33
namespace mo = mir::options;
326
34
327
35
namespace
328
36
{
329
37
auto probe_input_platform(mir::SharedLibrary const& lib, mir::options::Option const& options)
330
38
{
331
39
    auto probe = lib.load_function<mi::ProbePlatform>("probe_input_platform", MIR_SERVER_INPUT_PLATFORM_VERSION);
332
40
333
41
    return probe(options);
334
42
}
335
43
336
44
void describe_input_platform(mir::SharedLibrary const& lib)
337
45
{
338
46
    auto describe =
339
47
        lib.load_function<mi::DescribeModule>("describe_input_module", MIR_SERVER_INPUT_PLATFORM_VERSION);
340
48
    auto desc = describe();
341
49
    mir::log_info("Selected input driver: %s (version: %d.%d.%d)", desc->name, desc->major_version, desc->minor_version,
342
50
                  desc->micro_version);
343
51
}
344
52
345
53
mir::UniqueModulePtr<mi::Platform> create_input_platform(
346
54
    mir::SharedLibrary const& lib, mir::options::Option const& options,
347
55
    std::shared_ptr<mir::EmergencyCleanupRegistry> const& cleanup_registry,
348
56
    std::shared_ptr<mi::InputDeviceRegistry> const& registry, std::shared_ptr<mi::InputReport> const& report)
349
57
{
350
58
351
59
    auto create = lib.load_function<mi::CreatePlatform>("create_input_platform", MIR_SERVER_INPUT_PLATFORM_VERSION);
352
60
353
61
    return create(options, cleanup_registry, registry, report);
354
62
}
355
63
}
356
64
357
65
std::vector<mir::UniqueModulePtr<mi::Platform>> mi::probe_input_platforms(
358
66
    mo::Option const& options, std::shared_ptr<EmergencyCleanupRegistry> const& emergency_cleanup,
359
67
    std::shared_ptr<mi::InputDeviceRegistry> const& device_registry, std::shared_ptr<mi::InputReport> const& input_report,
360
68
    mir::SharedLibraryProberReport& prober_report)
361
69
{
362
70
    std::vector<UniqueModulePtr<Platform>> platforms;
363
71
364
72
    if (options.is_set(mo::platform_input_lib))
365
73
    {
366
74
        mir::SharedLibrary lib(options.get<std::string>(mo::platform_input_lib));
367
75
368
76
        platforms.emplace_back(create_input_platform(lib, options, emergency_cleanup, device_registry, input_report));
369
77
370
78
        describe_input_platform(lib);
371
79
    }
372
80
    else
373
81
    {
374
82
        auto const& path = options.get<std::string>(mo::platform_path);
375
83
        auto platforms_libs = mir::libraries_for_path(path, prober_report);
376
84
377
85
        for (auto const& platform_lib : platforms_libs)
378
86
        {
379
87
            try
380
88
            {
381
89
                if (probe_input_platform(*platform_lib, options) > mi::PlatformPriority::dummy)
382
90
                {
383
91
                    platforms.emplace_back(
384
92
                        create_input_platform(*platform_lib, options, emergency_cleanup, device_registry, input_report));
385
93
386
94
                    describe_input_platform(*platform_lib);
387
95
                }
388
96
            }
389
97
            catch (std::runtime_error const&)
390
98
            {
391
99
            }
392
100
        }
393
101
    }
394
102
395
103
    return platforms;
396
104
}
397
0
105
398
=== modified file 'src/server/symbols.map'
399
--- src/server/symbols.map	2015-11-19 06:43:10 +0000
400
+++ src/server/symbols.map	2015-11-20 15:25:54 +0000
401
@@ -83,6 +83,7 @@
402
83
    mir::input::TouchVisualizer::operator*;
83
    mir::input::TouchVisualizer::operator*;
403
84
    mir::input::TouchVisualizer::?TouchVisualizer*;
84
    mir::input::TouchVisualizer::?TouchVisualizer*;
404
85
    mir::input::TouchVisualizer::TouchVisualizer*;
85
    mir::input::TouchVisualizer::TouchVisualizer*;
405
86
    mir::input::probe_input_platforms*;
406
86
    mir::LockableCallback::?LockableCallback*;
87
    mir::LockableCallback::?LockableCallback*;
407
87
    mir::LockableCallback::LockableCallback*;
88
    mir::LockableCallback::LockableCallback*;
408
88
    mir::LockableCallback::operator*;
89
    mir::LockableCallback::operator*;
409
@@ -687,7 +688,6 @@
410
687
    mir::DefaultServerConfiguration::the_input_dispatcher*;
688
    mir::DefaultServerConfiguration::the_input_dispatcher*;
411
688
    mir::DefaultServerConfiguration::the_new_input_dispatcher*;
689
    mir::DefaultServerConfiguration::the_new_input_dispatcher*;
412
689
    mir::DefaultServerConfiguration::the_input_manager*;
690
    mir::DefaultServerConfiguration::the_input_manager*;
413
690
    mir::DefaultServerConfiguration::the_input_platform*;
414
691
    mir::DefaultServerConfiguration::the_input_reader*;
691
    mir::DefaultServerConfiguration::the_input_reader*;
415
692
    mir::DefaultServerConfiguration::the_input_reader_policy*;
692
    mir::DefaultServerConfiguration::the_input_reader_policy*;
416
693
    mir::DefaultServerConfiguration::the_input_reading_multiplexer*;
693
    mir::DefaultServerConfiguration::the_input_reading_multiplexer*;
417
694
694
418
=== renamed file 'tests/mir_test_framework/stub_input_platform.h' => 'tests/include/mir_test_framework/stub_input_platform.h'
419
=== modified file 'tests/mir_test_framework/CMakeLists.txt'
420
--- tests/mir_test_framework/CMakeLists.txt	2015-11-04 15:42:43 +0000
421
+++ tests/mir_test_framework/CMakeLists.txt	2015-11-20 15:25:54 +0000
422
@@ -38,6 +38,7 @@
423
38
  process.cpp
38
  process.cpp
424
39
  server_runner.cpp
39
  server_runner.cpp
425
40
  socket_detect_server.cpp
40
  socket_detect_server.cpp
426
41
  stub_input_platform.cpp
427
41
  stub_client_platform_factory.cpp
42
  stub_client_platform_factory.cpp
428
42
  stub_server_platform_factory.cpp
43
  stub_server_platform_factory.cpp
429
43
  stub_session.cpp
44
  stub_session.cpp
430
44
45
431
=== modified file 'tests/mir_test_framework/executable_path.cpp'
432
--- tests/mir_test_framework/executable_path.cpp	2015-10-20 12:46:15 +0000
433
+++ tests/mir_test_framework/executable_path.cpp	2015-11-20 15:25:54 +0000
434
@@ -45,6 +45,16 @@
435
45
    return executable_path() + "/../lib";
45
    return executable_path() + "/../lib";
436
46
}
46
}
437
47
47
438
48
std::string mir_test_framework::server_platform_path()
439
49
{
440
50
    for (auto const& option : {library_path() + "/server-modules/",
441
51
                               library_path() + "/server-platform/",
442
52
                               std::string(MIR_SERVER_PLATFORM_PATH) + '/'})
443
53
        if (boost::filesystem::exists(option))
444
54
            return option;
445
55
    BOOST_THROW_EXCEPTION(std::runtime_error("Failed to find server platform in standard search locations"));
446
56
}
447
57
448
48
std::string mir_test_framework::udev_recordings_path()
58
std::string mir_test_framework::udev_recordings_path()
449
49
{
59
{
450
50
    std::string run_path     = executable_path() + "/udev_recordings";
60
    std::string run_path     = executable_path() + "/udev_recordings";
451
51
61
452
=== modified file 'tests/mir_test_framework/fake_input_device_impl.cpp'
453
--- tests/mir_test_framework/fake_input_device_impl.cpp	2015-11-19 04:54:42 +0000
454
+++ tests/mir_test_framework/fake_input_device_impl.cpp	2015-11-20 15:25:54 +0000
455
@@ -17,7 +17,7 @@
456
17
 */
17
 */
457
18
18
458
19
#include "fake_input_device_impl.h"
19
#include "fake_input_device_impl.h"
460
20
#include "stub_input_platform.h"
20
#include "mir_test_framework/stub_input_platform.h"
461
21
21
462
22
#include "mir/input/input_device.h"
22
#include "mir/input/input_device.h"
463
23
#include "mir/input/input_device_info.h"
23
#include "mir/input/input_device_info.h"
464
24
24
465
=== modified file 'tests/mir_test_framework/fake_input_server_configuration.cpp'
466
--- tests/mir_test_framework/fake_input_server_configuration.cpp	2015-08-26 08:44:24 +0000
467
+++ tests/mir_test_framework/fake_input_server_configuration.cpp	2015-11-20 15:25:54 +0000
468
@@ -23,7 +23,6 @@
469
23
namespace mi = mir::input;
23
namespace mi = mir::input;
470
24
namespace ms = mir::scene;
24
namespace ms = mir::scene;
471
25
namespace msh = mir::shell;
25
namespace msh = mir::shell;
472
26
namespace mia = mir::input::android;
473
27
26
474
28
mtf::FakeInputServerConfiguration::FakeInputServerConfiguration()
27
mtf::FakeInputServerConfiguration::FakeInputServerConfiguration()
475
29
{
28
{
476
30
29
477
=== modified file 'tests/mir_test_framework/input_testing_server_options.cpp'
478
--- tests/mir_test_framework/input_testing_server_options.cpp	2015-06-25 03:00:08 +0000
479
+++ tests/mir_test_framework/input_testing_server_options.cpp	2015-11-20 15:25:54 +0000
480
@@ -38,7 +38,6 @@
481
38
namespace mg = mir::graphics;
38
namespace mg = mir::graphics;
482
39
namespace mi = mir::input;
39
namespace mi = mir::input;
483
40
namespace ms = mir::shell;
40
namespace ms = mir::shell;
484
41
namespace mia = mi::android;
485
42
namespace geom = mir::geometry;
41
namespace geom = mir::geometry;
486
43
42
487
44
mtf::InputTestingServerConfiguration::InputTestingServerConfiguration()
43
mtf::InputTestingServerConfiguration::InputTestingServerConfiguration()
488
45
44
489
=== modified file 'tests/mir_test_framework/stub_input.cpp'
490
--- tests/mir_test_framework/stub_input.cpp	2015-10-12 08:08:58 +0000
491
+++ tests/mir_test_framework/stub_input.cpp	2015-11-20 15:25:54 +0000
492
@@ -16,7 +16,7 @@
493
16
 * Authored by: Andreas Pokorny <andreas.pokorny@canonical.com>
16
 * Authored by: Andreas Pokorny <andreas.pokorny@canonical.com>
494
17
 */
17
 */
495
18
18
497
19
#include "stub_input_platform.h"
19
#include "mir_test_framework/stub_input_platform.h"
498
20
#include "fake_input_device_impl.h"
20
#include "fake_input_device_impl.h"
499
21
#include "mir/module_properties.h"
21
#include "mir/module_properties.h"
500
22
22
501
@@ -25,7 +25,7 @@
502
25
namespace mi = mir::input;
25
namespace mi = mir::input;
503
26
26
504
27
mir::UniqueModulePtr<mi::Platform> create_input_platform(
27
mir::UniqueModulePtr<mi::Platform> create_input_platform(
506
28
    std::shared_ptr<mo::Option> const& /*options*/,
28
    mo::Option const& /*options*/,
507
29
    std::shared_ptr<mir::EmergencyCleanupRegistry> const& /*emergency_cleanup_registry*/,
29
    std::shared_ptr<mir::EmergencyCleanupRegistry> const& /*emergency_cleanup_registry*/,
508
30
    std::shared_ptr<mi::InputDeviceRegistry> const& input_device_registry,
30
    std::shared_ptr<mi::InputDeviceRegistry> const& input_device_registry,
509
31
    std::shared_ptr<mi::InputReport> const& /*report*/)
31
    std::shared_ptr<mi::InputReport> const& /*report*/)
510
32
32
511
=== modified file 'tests/mir_test_framework/stub_input_platform.cpp'
512
--- tests/mir_test_framework/stub_input_platform.cpp	2015-10-12 08:08:58 +0000
513
+++ tests/mir_test_framework/stub_input_platform.cpp	2015-11-20 15:25:54 +0000
514
@@ -16,7 +16,7 @@
515
16
 * Authored by: Andreas Pokorny <andreas.pokorny@canonical.com>
16
 * Authored by: Andreas Pokorny <andreas.pokorny@canonical.com>
516
17
 */
17
 */
517
18
18
519
19
#include "stub_input_platform.h"
19
#include "mir_test_framework/stub_input_platform.h"
520
20
20
521
21
#include "mir/input/input_device_registry.h"
21
#include "mir/input/input_device_registry.h"
522
22
#include "mir/dispatch/action_queue.h"
22
#include "mir/dispatch/action_queue.h"
523
23
23
524
=== modified file 'tests/umock-acceptance-tests/test_libinput.cpp'
525
--- tests/umock-acceptance-tests/test_libinput.cpp	2015-10-12 08:08:58 +0000
526
+++ tests/umock-acceptance-tests/test_libinput.cpp	2015-11-20 15:25:54 +0000
527
@@ -17,8 +17,8 @@
528
17
 */
17
 */
529
18
18
530
19
#include "mir/input/platform.h"
19
#include "mir/input/platform.h"
531
20
#include "mir/test/doubles/mock_option.h"
532
20
#include "mir/shared_library.h"
21
#include "mir/shared_library.h"
533
21
#include "mir/options/option.h"
534
22
22
535
23
#include "mir_test_framework/udev_environment.h"
23
#include "mir_test_framework/udev_environment.h"
536
24
#include "mir_test_framework/executable_path.h"
24
#include "mir_test_framework/executable_path.h"
537
@@ -27,20 +27,13 @@
538
27
#include <gtest/gtest.h>
27
#include <gtest/gtest.h>
539
28
28
540
29
namespace mtf = mir_test_framework;
29
namespace mtf = mir_test_framework;
541
30
namespace mtd = mir::test::doubles;
542
30
namespace mo = mir::options;
31
namespace mo = mir::options;
543
32
544
31
using namespace ::testing;
33
using namespace ::testing;
545
32
namespace
34
namespace
546
33
{
35
{
547
34
36
548
35
struct MockOption : mo::Option
549
36
{
550
37
    MOCK_CONST_METHOD1(is_set, bool(char const*));
551
38
    MOCK_CONST_METHOD2(get, bool(char const*, bool));
552
39
    MOCK_CONST_METHOD2(get, int(char const*, int));
553
40
    MOCK_CONST_METHOD2(get, std::string(char const* name, char const*));
554
41
    MOCK_CONST_METHOD1(get, boost::any const&(char const*));
555
42
};
556
43
557
44
auto get_libinput_platform()
37
auto get_libinput_platform()
558
45
{
38
{
559
46
    auto path = mtf::server_input_platform("input-evdev");
39
    auto path = mtf::server_input_platform("input-evdev");
560
@@ -54,7 +47,7 @@
561
54
47
562
55
TEST(LibInput, DISABLED_probes_as_unsupported_without_device_access)
48
TEST(LibInput, DISABLED_probes_as_unsupported_without_device_access)
563
56
{
49
{
565
57
    NiceMock<MockOption> options;
50
    NiceMock<mtd::MockOption> options;
566
58
51
567
59
    // dumb assumption - nobody runs this test cases as root..
52
    // dumb assumption - nobody runs this test cases as root..
568
60
    // or allows accessing evdev input devices from non privileged users.
53
    // or allows accessing evdev input devices from non privileged users.
569
@@ -67,7 +60,7 @@
570
67
{
60
{
571
68
    mtf::UdevEnvironment env;
61
    mtf::UdevEnvironment env;
572
69
    env.add_standard_device("laptop-keyboard");
62
    env.add_standard_device("laptop-keyboard");
574
70
    NiceMock<MockOption> options;
63
    NiceMock<mtd::MockOption> options;
575
71
64
576
72
    auto library = get_libinput_platform();
65
    auto library = get_libinput_platform();
577
73
    auto probe_fun = library->load_function<mir::input::ProbePlatform>(probe_input_platform_symbol);
66
    auto probe_fun = library->load_function<mir::input::ProbePlatform>(probe_input_platform_symbol);
578
@@ -78,7 +71,8 @@
579
78
{
71
{
580
79
    mtf::UdevEnvironment env;
72
    mtf::UdevEnvironment env;
581
80
    env.add_standard_device("laptop-keyboard");
73
    env.add_standard_device("laptop-keyboard");
583
81
    NiceMock<MockOption> options;
74
    NiceMock<mtd::MockOption> options;
584
75
585
82
    ON_CALL(options,is_set(StrEq(host_socket_opt)))
76
    ON_CALL(options,is_set(StrEq(host_socket_opt)))
586
83
        .WillByDefault(Return(true));
77
        .WillByDefault(Return(true));
587
84
    ON_CALL(options,get(StrEq(host_socket_opt), Matcher<char const*>(_)))
78
    ON_CALL(options,get(StrEq(host_socket_opt), Matcher<char const*>(_)))
588
@@ -92,7 +86,7 @@
589
92
TEST(LibInput, probes_as_supported_when_umock_dev_available_or_before_input_devices_are_available)
86
TEST(LibInput, probes_as_supported_when_umock_dev_available_or_before_input_devices_are_available)
590
93
{
87
{
591
94
    mtf::UdevEnvironment env;
88
    mtf::UdevEnvironment env;
593
95
    NiceMock<MockOption> options;
89
    NiceMock<mtd::MockOption> options;
594
96
90
595
97
    auto library = get_libinput_platform();
91
    auto library = get_libinput_platform();
596
98
    auto probe_fun = library->load_function<mir::input::ProbePlatform>(probe_input_platform_symbol);
92
    auto probe_fun = library->load_function<mir::input::ProbePlatform>(probe_input_platform_symbol);
597
99
93
598
=== modified file 'tests/unit-tests/input/CMakeLists.txt'
599
--- tests/unit-tests/input/CMakeLists.txt	2015-11-04 19:47:19 +0000
600
+++ tests/unit-tests/input/CMakeLists.txt	2015-11-20 15:25:54 +0000
601
@@ -8,6 +8,7 @@
602
8
  ${CMAKE_CURRENT_SOURCE_DIR}/test_xcursor_loader.cpp
8
  ${CMAKE_CURRENT_SOURCE_DIR}/test_xcursor_loader.cpp
603
9
  ${CMAKE_CURRENT_SOURCE_DIR}/test_touchspot_controller.cpp
9
  ${CMAKE_CURRENT_SOURCE_DIR}/test_touchspot_controller.cpp
604
10
  ${CMAKE_CURRENT_SOURCE_DIR}/test_input_event.cpp
10
  ${CMAKE_CURRENT_SOURCE_DIR}/test_input_event.cpp
605
11
  ${CMAKE_CURRENT_SOURCE_DIR}/test_input_platform_probing.cpp
606
11
  ${CMAKE_CURRENT_SOURCE_DIR}/test_event_builders.cpp
12
  ${CMAKE_CURRENT_SOURCE_DIR}/test_event_builders.cpp
607
12
  ${CMAKE_CURRENT_SOURCE_DIR}/test_default_device.cpp
13
  ${CMAKE_CURRENT_SOURCE_DIR}/test_default_device.cpp
608
13
  ${CMAKE_CURRENT_SOURCE_DIR}/test_default_input_device_hub.cpp
14
  ${CMAKE_CURRENT_SOURCE_DIR}/test_default_input_device_hub.cpp
609
14
15
610
=== added file 'tests/unit-tests/input/test_input_platform_probing.cpp'
611
--- tests/unit-tests/input/test_input_platform_probing.cpp	1970-01-01 00:00:00 +0000
612
+++ tests/unit-tests/input/test_input_platform_probing.cpp	2015-11-20 15:25:54 +0000
613
@@ -0,0 +1,161 @@
614
1
/*
615
2
 * Copyright © 2015 Canonical Ltd.
616
3
 *
617
4
 * This program is free software: you can redistribute it and/or modify
618
5
 * it under the terms of the GNU General Public License version 3 as
619
6
 * published by the Free Software Foundation.
620
7
 *
621
8
 * This program is distributed in the hope that it will be useful,
622
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
623
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
624
11
 * GNU General Public License for more details.
625
12
 *
626
13
 * You should have received a copy of the GNU General Public License
627
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
628
15
 *
629
16
 * Authored by: Andreas Pokorny <andreas.pokorny@canonical.com>
630
17
 */
631
18
632
19
#include <gtest/gtest.h>
633
20
634
21
#include "mir/input/input_probe.h"
635
22
636
23
#include "mir/input/platform.h"
637
24
#include "src/server/report/null_report_factory.h"
638
25
639
26
#include "mir/options/option.h"
640
27
#include "mir/emergency_cleanup_registry.h"
641
28
642
29
#include "mir_test_framework/udev_environment.h"
643
30
#include "mir_test_framework/executable_path.h"
644
31
#include "mir_test_framework/stub_input_platform.h"
645
32
#include "mir/test/doubles/mock_x11.h"
646
33
#include "mir/test/doubles/mock_libinput.h"
647
34
#include "mir/test/doubles/mock_option.h"
648
35
#include "mir/test/doubles/mock_input_device_registry.h"
649
36
#include "src/platforms/evdev/platform.h"
650
37
#include "src/platforms/mesa/server/x11/input/input_platform.h"
651
38
#include "mir/test/fake_shared.h"
652
39
653
40
namespace mt = mir::test;
654
41
namespace mtd = mt::doubles;
655
42
namespace mi = mir::input;
656
43
namespace mr = mir::report;
657
44
namespace mtf = mir_test_framework;
658
45
659
46
using namespace ::testing;
660
47
661
48
namespace
662
49
{
663
50
struct StubEmergencyCleanupRegistry : mir::EmergencyCleanupRegistry
664
51
{
665
52
    void add(mir::EmergencyCleanupHandler const&) override {}
666
53
    void add(mir::ModuleEmergencyCleanupHandler) override {}
667
54
};
668
55
char const platform_input_lib[] = "platform-input-lib";
669
56
char const platform_path[] = "platform-path";
670
57
671
58
struct InputPlatformProbe : ::testing::Test
672
59
{
673
60
    InputPlatformProbe()
674
61
    {
675
62
        ON_CALL(mock_options, is_set(StrEq(platform_input_lib))).WillByDefault(Return(false));
676
63
        ON_CALL(mock_options, is_set(StrEq(platform_path))).WillByDefault(Return(true));
677
64
        ON_CALL(mock_options, get(StrEq(platform_path),Matcher<char const*>(_)))
678
65
            .WillByDefault(Return(platform_path_value));
679
66
        ON_CALL(mock_options, get(StrEq(platform_path)))
680
67
            .WillByDefault(Invoke(
681
68
                    [this](char const*) -> boost::any const&
682
69
                    {
683
70
                        return platform_path_value_as_any;
684
71
                    }));
685
72
        ON_CALL(mock_options, get(StrEq(platform_input_lib)))
686
73
            .WillByDefault(Invoke(
687
74
                    [this](char const*) -> boost::any const&
688
75
                    {
689
76
                        return platform_input_lib_value_as_any;
690
77
                    }));
691
78
    }
692
79
693
80
    void disable_x11()
694
81
    {
695
82
#ifdef MIR_BUILD_PLATFORM_MESA_X11
696
83
        ON_CALL(mock_x11, XOpenDisplay(_)).WillByDefault(Return(nullptr));
697
84
#endif
698
85
    }
699
86
700
87
    // replace with with mocks for udev and evdev to simulate root or non-root
701
88
    // access on evdev devices, and enable the disabled test case(s) below.
702
89
    mtf::UdevEnvironment env;
703
90
704
91
#ifdef MIR_BUILD_PLATFORM_MESA_X11
705
92
    NiceMock<mtd::MockX11> mock_x11;
706
93
#endif
707
94
    NiceMock<mtd::MockLibInput> mock_libinput;
708
95
    NiceMock<mtd::MockOption> mock_options;
709
96
    mtd::MockInputDeviceRegistry mock_registry;
710
97
    StubEmergencyCleanupRegistry stub_emergency;
711
98
    std::shared_ptr<mir::SharedLibraryProberReport> stub_prober_report{mr::null_shared_library_prober_report()};
712
99
    std::string platform_path_value{mtf::server_platform_path()};
713
100
    boost::any platform_path_value_as_any{platform_path_value};
714
101
    std::string platform_input_lib_value;
715
102
    boost::any platform_input_lib_value_as_any;
716
103
};
717
104
718
105
template <typename Expected>
719
106
struct OfPtrTypeMatcher
720
107
{
721
108
    template <typename T>
722
109
    bool MatchAndExplain(T&& p, MatchResultListener* /* listener */) const
723
110
    {
724
111
        return dynamic_cast<Expected*>(&*p) != nullptr;
725
112
    }
726
113
    void DescribeTo(::std::ostream* os) const
727
114
    {
728
115
        *os << "is a or derived from a " << typeid(Expected).name();
729
116
    }
730
117
    void DescribeNegationTo(::std::ostream* os) const
731
118
    {
732
119
        *os << "is not or not derived from " << typeid(Expected).name();
733
120
    }
734
121
};
735
122
736
123
template<typename Dest>
737
124
inline auto OfPtrType()
738
125
{
739
126
    return MakePolymorphicMatcher(OfPtrTypeMatcher<Dest>());
740
127
}
741
128
}
742
129
743
130
744
131
TEST_F(InputPlatformProbe, stub_platform_not_picked_up_by_default)
745
132
{
746
133
    disable_x11();
747
134
    auto platforms =
748
135
        mi::probe_input_platforms(mock_options, mt::fake_shared(stub_emergency), mt::fake_shared(mock_registry),
749
136
                                  mr::null_input_report(), *stub_prober_report);
750
137
751
138
    EXPECT_THAT(platforms, ElementsAre(OfPtrType<mi::evdev::Platform>()));
752
139
}
753
140
754
141
#ifdef MIR_BUILD_PLATFORM_MESA_X11
755
142
TEST_F(InputPlatformProbe, x11_platform_found_and_used_when_display_connection_works)
756
143
{
757
144
    auto platforms =
758
145
        mi::probe_input_platforms(mock_options, mt::fake_shared(stub_emergency), mt::fake_shared(mock_registry),
759
146
                                  mr::null_input_report(), *stub_prober_report);
760
147
761
148
    EXPECT_THAT(platforms, UnorderedElementsAre(OfPtrType<mi::evdev::Platform>(), OfPtrType<mi::X::XInputPlatform>()));
762
149
}
763
150
#endif
764
151
765
152
TEST_F(InputPlatformProbe, allows_forcing_stub_input_platform)
766
153
{
767
154
    ON_CALL(mock_options, is_set(StrEq(platform_input_lib))).WillByDefault(Return(true));
768
155
    platform_input_lib_value = mtf::server_input_platform("input-stub.so");
769
156
    platform_input_lib_value_as_any = platform_input_lib_value;
770
157
    auto platforms =
771
158
        mi::probe_input_platforms(mock_options, mt::fake_shared(stub_emergency), mt::fake_shared(mock_registry),
772
159
                                  mr::null_input_report(), *stub_prober_report);
773
160
    EXPECT_THAT(platforms, ElementsAre(OfPtrType<mtf::StubInputPlatform>()));
774
161
}
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration	2015-10-14	Approve on 2015-11-25
Cemil Azizoglu (community)			Approve on 2015-11-20
Alan Griffiths		2015-10-14	Abstain on 2015-11-20
Daniel van Vugt		2015-10-14	Needs Fixing on 2015-10-28
Chris Halse Rogers		2015-10-14	Approve on 2015-10-19
Review via email: mp+274421@code.launchpad.net