← Back to branch summary

~vanvugt/mir/snappymir-ppa

~vanvugt/mir/snappymir-ppa

Viewing all changes in revision 2464.3.10.

Committer: Alan Griffiths
Date: 2015-04-10 08:21:28 UTC
mfrom: (2473 development-branch)
mto: (2464.4.8 mir4)
mto: This revision was merged to the branch mainline in revision 2476.
Revision ID: alan@octopull.co.uk-20150410082128-hfom7p6rutvu506x

merge lp:mir

files added:
src/include/common/mir/events

files renamed:
include/client/mir_toolkit/events/event_deprecated.h => src/include/common/mir/events/event_private.h

files modified:
CMakeLists.txt

examples/server_example_canonical_window_manager.cpp

examples/server_example_canonical_window_manager.h

include/client/mir/events/event_builders.h

include/client/mir_toolkit/events/event.h

playground/demo-shell/window_manager.cpp

src/client/event.cpp

src/client/events/event_builders.cpp

src/client/input/android/android_input_lexicon.cpp

src/client/input/android/android_input_receiver.cpp

src/client/input/input_event.cpp

src/client/input/xkb_mapper.cpp

src/client/mir_connection.cpp

src/client/rpc/mir_protobuf_rpc_channel.cpp

src/include/common/mir/input/xkb_mapper.h

src/platforms/android/server/buffer.cpp

src/server/display_server.cpp

src/server/frontend/event_sender.cpp

src/server/graphics/nested/display_buffer.cpp

src/server/input/android/android_input_dispatcher.cpp

src/server/input/android/android_input_manager.cpp

src/server/input/android/event_filter_dispatcher_policy.cpp

src/server/input/android/event_filter_dispatcher_policy.h

src/server/input/android/input_sender.cpp

src/server/input/android/input_translator.cpp

src/server/input/default_configuration.cpp

src/server/input/default_input_device_hub.cpp

src/server/input/null_input_dispatcher.cpp

src/server/input/vt_filter.cpp

src/server/report/lttng/message_processor_report.cpp

src/server/scene/application_session.cpp

src/utils/screencast.cpp

tests/acceptance-tests/test_client_surface_events.cpp

tests/acceptance-tests/throwback/test_client_input.cpp

tests/acceptance-tests/throwback/test_custom_input_dispatcher.cpp

tests/include/mir_test_doubles/mock_event_filter.h

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/test_display_server_main_loop_events.cpp

tests/mir_test_doubles/test_protobuf_client.cpp

tests/mir_test_framework/stubbed_server_configuration.cpp

tests/unit-tests/client/input/test_android_input_receiver.cpp

tests/unit-tests/client/input/test_xkb_mapper.cpp

tests/unit-tests/client/test_event_distributor.cpp

tests/unit-tests/compositor/test_multi_threaded_compositor.cpp

tests/unit-tests/frontend/test_published_socket_connector.cpp

tests/unit-tests/graphics/android/test_buffer.cpp

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

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

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

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

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

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

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

tests/unit-tests/input/test_default_input_device_hub.cpp

tests/unit-tests/input/test_event_builders.cpp

tests/unit-tests/input/test_event_filter_chain.cpp

tests/unit-tests/input/test_input_event.cpp

tests/unit-tests/scene/test_application_session.cpp

tests/unit-tests/scene/test_basic_surface.cpp

tests/unit-tests/scene/test_surface.cpp

tests/unit-tests/scene/test_surface_impl.cpp

Show diffs side-by-side

added added

removed removed

examples/server_example_canonical_window_manager.cpp

examples/server_example_canonical_window_manager.h

include/client/mir/events/event_builders.h

include/client/mir_toolkit/events/event.h

playground/demo-shell/window_manager.cpp

src/client/event.cpp

src/client/events/event_builders.cpp

src/client/input/android/android_input_lexicon.cpp

src/client/input/android/android_input_receiver.cpp

src/client/input/input_event.cpp

src/client/input/xkb_mapper.cpp

src/client/mir_connection.cpp

src/client/rpc/mir_protobuf_rpc_channel.cpp

src/include/common/mir/events/

src/include/common/mir/events/event_private.h

src/include/common/mir/input/xkb_mapper.h

src/platforms/android/server/buffer.cpp

src/server/display_server.cpp

src/server/frontend/event_sender.cpp

src/server/graphics/nested/display_buffer.cpp

src/server/input/android/android_input_dispatcher.cpp

src/server/input/android/android_input_manager.cpp

src/server/input/android/event_filter_dispatcher_policy.cpp

src/server/input/android/event_filter_dispatcher_policy.h

src/server/input/android/input_sender.cpp

src/server/input/android/input_translator.cpp

src/server/input/default_configuration.cpp

src/server/input/default_input_device_hub.cpp

src/server/input/null_input_dispatcher.cpp

src/server/input/vt_filter.cpp

src/server/report/lttng/message_processor_report.cpp

src/server/scene/application_session.cpp

src/utils/screencast.cpp

tests/acceptance-tests/test_client_surface_events.cpp

tests/acceptance-tests/throwback/test_client_input.cpp

tests/acceptance-tests/throwback/test_custom_input_dispatcher.cpp

tests/include/mir_test_doubles/mock_event_filter.h

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/test_display_server_main_loop_events.cpp

tests/mir_test_doubles/test_protobuf_client.cpp

tests/mir_test_framework/stubbed_server_configuration.cpp

tests/unit-tests/client/input/test_android_input_receiver.cpp

tests/unit-tests/client/input/test_xkb_mapper.cpp

tests/unit-tests/client/test_event_distributor.cpp

tests/unit-tests/compositor/test_multi_threaded_compositor.cpp

tests/unit-tests/frontend/test_published_socket_connector.cpp

tests/unit-tests/graphics/android/test_buffer.cpp

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

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

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

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

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

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

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

tests/unit-tests/input/test_default_input_device_hub.cpp

tests/unit-tests/input/test_event_builders.cpp

tests/unit-tests/input/test_event_filter_chain.cpp

tests/unit-tests/input/test_input_event.cpp

tests/unit-tests/scene/test_application_session.cpp

tests/unit-tests/scene/test_basic_surface.cpp

tests/unit-tests/scene/test_surface.cpp

tests/unit-tests/scene/test_surface_impl.cpp

Older »