← Back to branch summary

~vanvugt/mir/handoff

« back to all changes in this revision

Viewing changes to src/platforms/mesa/server/x11/input/input.cpp

  • Committer: Daniel van Vugt
  • Date: 2015-08-12 09:52:57 UTC
  • mfrom: (2798.1.41 trunk)
  • Revision ID: daniel.van.vugt@canonical.com-20150812095257-58wduov90c2mpiqs
Merge latest trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/platforms/mesa/server/x11/input/input.cpp
17
17
 */
18
18
 
19
19
#include "input_platform.h"
 
20
#include "../lazy_connection.h"
20
21
#include "mir/module_properties.h"
21
 
#include "mir/input/platform.h"
22
22
 
23
23
namespace mo = mir::options;
24
24
namespace mi = mir::input;
 
25
namespace mx = mir::X;
25
26
namespace mix = mi::X;
26
27
 
27
 
extern "C" mir::UniqueModulePtr<mi::Platform> create_input_platform(
 
28
extern mx::LazyConnection x11_connection;
 
29
 
 
30
mir::UniqueModulePtr<mi::Platform> create_input_platform(
28
31
    std::shared_ptr<mo::Option> const& /*options*/,
29
32
    std::shared_ptr<mir::EmergencyCleanupRegistry> const& /*emergency_cleanup_registry*/,
30
33
    std::shared_ptr<mi::InputDeviceRegistry> const& input_device_registry,
31
34
    std::shared_ptr<mi::InputReport> const& /*report*/)
32
35
{
33
 
    return mir::make_module_ptr<mix::XInputPlatform>(input_device_registry);
 
36
    return mir::make_module_ptr<mix::XInputPlatform>(input_device_registry, x11_connection.get());
34
37
}
35
38
 
36
 
extern "C" void add_input_platform_options(
 
39
void add_input_platform_options(
37
40
    boost::program_options::options_description& /*config*/)
38
41
{
39
42
}
40
43
 
41
 
extern "C" mi::PlatformPriority probe_input_platform(
 
44
mi::PlatformPriority probe_input_platform(
42
45
    mo::Option const& /*options*/)
43
46
{
44
47
    return mi::PlatformPriority::best;
54
57
};
55
58
}
56
59
 
57
 
extern "C" mir::ModuleProperties const* describe_input_module()
 
60
mir::ModuleProperties const* describe_input_module()
58
61
{
59
62
    return &description;
60
63
}