← Back to branch summary

~vanvugt/mir/frame

~vanvugt/mir/frame

Viewing all changes in revision 1583.

Committer: Tarmac
Author(s): Andreas Pokorny
Date: 2014-04-29 11:58:26 UTC
mfrom: (1542.1.7 input-rework-2)
Revision ID: tarmac-20140429115826-b1nc1ipvl1tx58a4

Make InputDispatcher replaceable

This change introduces a InputDispatcher interface that receives MirEvents.
The existing android-input based InputDispatcher is still the default dispatcher.
The configuration happens through the InputDispatcherConfiguration, which supplies
some additional related interfaces.
.

Approved by PS Jenkins bot, Chris Halse Rogers, Robert Carr, Daniel d'Andrada.

files added:
include/server/mir/input/android/cached_android_ptr.h

include/server/mir/input/input_configuration.h

include/server/mir/input/input_dispatcher.h

include/test/mir_test_doubles/mock_input_dispatcher.h

src/server/input/android/android_input_dispatcher.cpp

src/server/input/android/android_input_dispatcher.h

src/server/input/android/input_channel_factory.cpp

src/server/input/android/input_channel_factory.h

src/server/input/android/input_translator.cpp

src/server/input/android/input_translator.h

src/server/input/nested_input_manager.cpp

src/server/input/nested_input_manager.h

tests/acceptance-tests/clients.cpp

tests/acceptance-tests/clients.h

tests/acceptance-tests/test_custom_input_dispatcher.cpp

tests/unit-tests/input/android/test_android_input_dispatcher.cpp

files removed:
src/server/input/android/input_dispatcher_manager.cpp

src/server/input/android/input_dispatcher_manager.h

files renamed:
include/server/mir/input/input_configuration.h => include/server/mir/input/input_dispatcher_configuration.h

include/test/mir_test_doubles/mock_input_dispatcher.h => include/test/mir_test_doubles/mock_android_input_dispatcher.h

src/server/input/android/dispatcher_input_configuration.cpp => src/server/input/android/input_dispatcher_configuration.cpp

include/server/mir/input/android/dispatcher_input_configuration.h => src/server/input/android/input_dispatcher_configuration.h

files modified:
include/server/mir/default_server_configuration.h

include/server/mir/input/android/default_android_input_configuration.h

include/server/mir/input/input_manager.h

include/test/mir_test/client_event_matchers.h

include/test/mir_test/fake_event_hub_input_configuration.h

include/test/mir_test_doubles/mock_input_manager.h

include/test/mir_test_framework/input_testing_server_configuration.h

src/platform/graphics/mesa/real_kms_output.cpp

src/server/default_server_configuration.cpp

src/server/input/CMakeLists.txt

src/server/input/android/CMakeLists.txt

src/server/input/android/android_input_manager.cpp

src/server/input/android/android_input_manager.h

src/server/input/android/default_android_input_configuration.cpp

src/server/input/default_configuration.cpp

src/server/input/nested_input_configuration.cpp

src/server/input/nested_input_configuration.h

src/server/input/nested_input_relay.cpp

src/server/input/nested_input_relay.h

src/server/input/null_input_configuration.cpp

src/server/input/null_input_configuration.h

src/server/scene/default_configuration.cpp

tests/acceptance-tests/CMakeLists.txt

tests/acceptance-tests/test_focus_selection.cpp

tests/integration-tests/input/android/test_android_cursor_listener.cpp

tests/integration-tests/input/android/test_android_input_manager.cpp

tests/integration-tests/input/test_nested_input.cpp

tests/integration-tests/session_management.cpp

tests/mir_test_doubles/fake_event_hub_input_configuration.cpp

tests/mir_test_framework/input_testing_server_options.cpp

tests/unit-tests/input/android/CMakeLists.txt

tests/unit-tests/input/android/test_android_input_manager.cpp

tests/unit-tests/input/android/test_android_input_registrar.cpp

tests/unit-tests/input/android/test_android_input_targeter.cpp

Show diffs side-by-side

added added

removed removed

include/server/mir/default_server_configuration.h

include/server/mir/input/android/cached_android_ptr.h

include/server/mir/input/android/default_android_input_configuration.h

include/server/mir/input/input_configuration.h

include/server/mir/input/input_dispatcher.h

include/server/mir/input/input_dispatcher_configuration.h

include/server/mir/input/input_manager.h

include/test/mir_test/client_event_matchers.h

include/test/mir_test/fake_event_hub_input_configuration.h

include/test/mir_test_doubles/mock_android_input_dispatcher.h

include/test/mir_test_doubles/mock_input_dispatcher.h

include/test/mir_test_doubles/mock_input_manager.h

include/test/mir_test_framework/input_testing_server_configuration.h

src/platform/graphics/mesa/real_kms_output.cpp

src/server/default_server_configuration.cpp

src/server/input/CMakeLists.txt

src/server/input/android/CMakeLists.txt

src/server/input/android/android_input_dispatcher.cpp

src/server/input/android/android_input_dispatcher.h

src/server/input/android/android_input_manager.cpp

src/server/input/android/android_input_manager.h

src/server/input/android/default_android_input_configuration.cpp

src/server/input/android/input_channel_factory.cpp

src/server/input/android/input_channel_factory.h

src/server/input/android/input_dispatcher_configuration.cpp

src/server/input/android/input_dispatcher_configuration.h

src/server/input/android/input_dispatcher_manager.cpp

src/server/input/android/input_dispatcher_manager.h

src/server/input/android/input_translator.cpp

src/server/input/android/input_translator.h

src/server/input/default_configuration.cpp

src/server/input/nested_input_configuration.cpp

src/server/input/nested_input_configuration.h

src/server/input/nested_input_manager.cpp

src/server/input/nested_input_manager.h

src/server/input/nested_input_relay.cpp

src/server/input/nested_input_relay.h

src/server/input/null_input_configuration.cpp

src/server/input/null_input_configuration.h

src/server/scene/default_configuration.cpp

tests/acceptance-tests/CMakeLists.txt

tests/acceptance-tests/clients.cpp

tests/acceptance-tests/clients.h

tests/acceptance-tests/test_custom_input_dispatcher.cpp

tests/acceptance-tests/test_focus_selection.cpp

tests/integration-tests/input/android/test_android_cursor_listener.cpp

tests/integration-tests/input/android/test_android_input_manager.cpp

tests/integration-tests/input/test_nested_input.cpp

tests/integration-tests/session_management.cpp

tests/mir_test_doubles/fake_event_hub_input_configuration.cpp

tests/mir_test_framework/input_testing_server_options.cpp

tests/unit-tests/input/android/CMakeLists.txt

tests/unit-tests/input/android/test_android_input_dispatcher.cpp

tests/unit-tests/input/android/test_android_input_manager.cpp

tests/unit-tests/input/android/test_android_input_registrar.cpp

tests/unit-tests/input/android/test_android_input_targeter.cpp

Older »