← Back to branch summary

~andreas-pokorny/mir/unregitser-fd-handler

« back to all changes in this revision

Viewing changes to include/server/mir/input/android/default_android_input_configuration.h

Removing InputDispatcherConfiguration and the by-pass of the InputTranslator using a dynamic cast that was only necessary until lp~andreas-pokorny:extended-input-dispatcher lands

The contents of the former InputDispatcherConfiguration have been moved to DefaultServerConfiguration. En passent the nested input relay was dropped too. The mir::input::InputDispatcher interface is now used directly. Note: Event filtering still works like before.

Approved by PS Jenkins bot, Alexandros Frantzis, Alan Griffiths, Chris Halse Rogers.

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/server/mir/input/android/default_android_input_configuration.h
41
41
class InputRegion;
42
42
class CursorListener;
43
43
class InputReport;
44
 
class InputDispatcherConfiguration;
 
44
class InputDispatcher;
45
45
 
46
46
namespace android
47
47
{
50
50
class DefaultInputConfiguration : public mir::input::InputConfiguration
51
51
{
52
52
public:
53
 
    DefaultInputConfiguration(std::shared_ptr<input::InputDispatcherConfiguration> const& input_dispatcher_configuration,
 
53
    DefaultInputConfiguration(std::shared_ptr<input::InputDispatcher> const& dispatcher,
54
54
                              std::shared_ptr<input::InputRegion> const& input_region,
55
55
                              std::shared_ptr<CursorListener> const& cursor_listener,
56
56
                              std::shared_ptr<input::InputReport> const& input_report);
76
76
    CachedPtr<droidinput::InputReaderPolicyInterface> reader_policy;
77
77
    CachedPtr<droidinput::InputReaderInterface> reader;
78
78
 
79
 
    std::shared_ptr<input::InputDispatcherConfiguration> const input_dispatcher_config;
 
79
    std::shared_ptr<input::InputDispatcher> const input_dispatcher;
80
80
    std::shared_ptr<input::InputRegion> const input_region;
81
81
    std::shared_ptr<CursorListener> const cursor_listener;
82
82
    std::shared_ptr<input::InputReport> const input_report;