← Back to branch summary

~andreas-pokorny/mir/add-key-repeat-utility

~andreas-pokorny/mir/add-key-repeat-utility

Viewing all changes in revision 3421.

Committer: Andreas Pokorny
Date: 2016-03-31 18:13:25 UTC
mfrom: (3414.1.6 add-dispatchable-alarm-factory)
Revision ID: andreas.pokorny@canonical.com-20160331181325-00i5i89t636el7wf

merge prereq to resolve conflict

files added:
src/common/events

src/common/events/CMakeLists.txt

src/common/events/event_private.cpp

tests/test-clients

tests/test-clients/CMakeLists.txt

tests/test-clients/impolite-shutdown

tests/test-clients/impolite-shutdown/CMakeLists.txt

tests/test-clients/impolite-shutdown/scroll.cpp

files removed:
src/client/events/make_empty_event.cpp

src/client/events/make_empty_event.h

files renamed:
debian/libmirserver38.install => debian/libmirserver39.install

tests/mir-stress/ => tests/test-clients/mir-stress/

tools/valgrind_suppressions_glibc_2.21 => tools/valgrind_suppressions_glibc_2.23

files modified:
CMakeLists.txt

cmake/MirCommon.cmake

debian/changelog

debian/control

debian/mir-test-tools.install

examples/CMakeLists.txt

examples/scroll.cpp

examples/server_example_test_client.cpp

examples/target.c

include/client/mir_toolkit/client_types.h

include/client/mir_toolkit/events/event.h

include/client/mir_toolkit/mir_screencast.h

include/common/mir/dispatch/alarm_factory.h

include/common/mir/optional_value.h

include/common/mir_toolkit/common.h

include/platform/mir/graphics/display_buffer.h

include/server/mir/input/input_manager.h

include/test/mir/test/doubles/null_display_buffer.h

playground/demo-shell/demo_compositor.cpp

src/client/buffer.cpp

src/client/buffer.h

src/client/event.cpp

src/client/events/CMakeLists.txt

src/client/events/event_builders.cpp

src/client/events/serialization.cpp

src/client/input/android/event_conversion_helpers.cpp

src/client/input/input_event.cpp

src/client/input/xkb_mapper.cpp

src/client/mir_screencast.cpp

src/client/mir_screencast.h

src/client/mir_screencast_api.cpp

src/client/presentation_chain.cpp

src/client/rpc/mir_protobuf_rpc_channel.cpp

src/client/symbols.map

src/common/CMakeLists.txt

src/common/dispatch/alarm_factory.cpp

src/common/symbols.map

src/cookie/authority.cpp

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

src/include/server/mir/compositor/renderer.h

src/platform/symbols.map

src/platforms/android/server/display_buffer.cpp

src/platforms/android/server/display_buffer.h

src/platforms/mesa/server/kms/display_buffer.cpp

src/platforms/mesa/server/kms/display_buffer.h

src/platforms/mesa/server/x11/graphics/display_buffer.cpp

src/platforms/mesa/server/x11/graphics/display_buffer.h

src/renderers/gl/renderer.cpp

src/renderers/gl/renderer.h

src/server/CMakeLists.txt

src/server/compositor/default_display_buffer_compositor.cpp

src/server/compositor/screencast_display_buffer.cpp

src/server/compositor/screencast_display_buffer.h

src/server/graphics/nested/display_buffer.cpp

src/server/graphics/nested/display_buffer.h

src/server/graphics/offscreen/display_buffer.cpp

src/server/graphics/offscreen/display_buffer.h

src/server/input/android/input_sender.cpp

src/server/input/default_event_builder.cpp

src/server/input/default_input_manager.cpp

src/server/input/default_input_manager.h

src/server/input/key_repeat_dispatcher.cpp

src/server/input/null_input_manager.h

src/server/input/surface_input_dispatcher.cpp

src/server/input/validator.cpp

src/server/server.cpp

src/server/symbols.map

tests/CMakeLists.txt

tests/acceptance-tests/test_client_logging.cpp

tests/acceptance-tests/test_client_screencast.cpp

tests/acceptance-tests/test_latency.cpp

tests/acceptance-tests/test_server_startup.cpp

tests/acceptance-tests/throwback/test_client_library_errors.cpp

tests/include/mir/test/doubles/mock_display_buffer.h

tests/include/mir/test/doubles/mock_input_manager.h

tests/include/mir/test/doubles/mock_renderer.h

tests/include/mir/test/doubles/stub_renderer.h

tests/integration-tests/test_client_screencast.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/client/test_mir_buffer.cpp

tests/unit-tests/client/test_mir_screencast.cpp

tests/unit-tests/compositor/test_default_display_buffer_compositor.cpp

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

tests/unit-tests/input/test_input_event.cpp

tests/unit-tests/input/test_surface_input_dispatcher.cpp

tests/unit-tests/input/test_validator.cpp

tests/unit-tests/scene/test_application_session.cpp

tests/unit-tests/scene/test_surface.cpp

tests/unit-tests/scene/test_surface_impl.cpp

tests/unit-tests/test_mir_cookie.cpp

Show diffs side-by-side

added added

removed removed

cmake/MirCommon.cmake

debian/changelog

debian/libmirserver39.install

debian/mir-test-tools.install

examples/CMakeLists.txt

examples/scroll.cpp

examples/server_example_test_client.cpp

examples/target.c

include/client/mir_toolkit/client_types.h

include/client/mir_toolkit/events/event.h

include/client/mir_toolkit/mir_screencast.h

include/common/mir/dispatch/alarm_factory.h

include/common/mir/optional_value.h

include/common/mir_toolkit/common.h

include/platform/mir/graphics/display_buffer.h

include/server/mir/input/input_manager.h

include/test/mir/test/doubles/null_display_buffer.h

playground/demo-shell/demo_compositor.cpp

src/client/buffer.cpp

src/client/buffer.h

src/client/event.cpp

src/client/events/CMakeLists.txt

src/client/events/event_builders.cpp

src/client/events/make_empty_event.cpp

src/client/events/make_empty_event.h

src/client/events/serialization.cpp

src/client/input/android/event_conversion_helpers.cpp

src/client/input/input_event.cpp

src/client/input/xkb_mapper.cpp

src/client/mir_screencast.cpp

src/client/mir_screencast.h

src/client/mir_screencast_api.cpp

src/client/presentation_chain.cpp

src/client/rpc/mir_protobuf_rpc_channel.cpp

src/client/symbols.map

src/common/CMakeLists.txt

src/common/dispatch/alarm_factory.cpp

src/common/events/

src/common/events/CMakeLists.txt

src/common/events/event_private.cpp

src/common/symbols.map

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

src/include/server/mir/compositor/renderer.h

src/platform/symbols.map

src/platforms/android/server/display_buffer.cpp

src/platforms/android/server/display_buffer.h

src/platforms/mesa/server/kms/display_buffer.cpp

src/platforms/mesa/server/kms/display_buffer.h

src/platforms/mesa/server/x11/graphics/display_buffer.cpp

src/platforms/mesa/server/x11/graphics/display_buffer.h

src/renderers/gl/renderer.cpp

src/renderers/gl/renderer.h

src/server/CMakeLists.txt

src/server/compositor/default_display_buffer_compositor.cpp

src/server/compositor/screencast_display_buffer.cpp

src/server/compositor/screencast_display_buffer.h

src/server/graphics/nested/display_buffer.cpp

src/server/graphics/nested/display_buffer.h

src/server/graphics/offscreen/display_buffer.cpp

src/server/graphics/offscreen/display_buffer.h

src/server/input/android/input_sender.cpp

src/server/input/default_event_builder.cpp

src/server/input/default_input_manager.cpp

src/server/input/default_input_manager.h

src/server/input/key_repeat_dispatcher.cpp

src/server/input/null_input_manager.h

src/server/input/surface_input_dispatcher.cpp

src/server/input/validator.cpp

src/server/server.cpp

src/server/symbols.map

tests/CMakeLists.txt

tests/acceptance-tests/test_client_logging.cpp

tests/acceptance-tests/test_client_screencast.cpp

tests/acceptance-tests/test_latency.cpp

tests/acceptance-tests/test_server_startup.cpp

tests/acceptance-tests/throwback/test_client_library_errors.cpp

tests/include/mir/test/doubles/mock_display_buffer.h

tests/include/mir/test/doubles/mock_input_manager.h

tests/include/mir/test/doubles/mock_renderer.h

tests/include/mir/test/doubles/stub_renderer.h

tests/integration-tests/test_client_screencast.cpp

tests/test-clients/

tests/test-clients/CMakeLists.txt

tests/test-clients/impolite-shutdown/

tests/test-clients/impolite-shutdown/CMakeLists.txt

tests/test-clients/impolite-shutdown/scroll.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/client/test_mir_buffer.cpp

tests/unit-tests/client/test_mir_screencast.cpp

tests/unit-tests/compositor/test_default_display_buffer_compositor.cpp

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

tests/unit-tests/input/test_input_event.cpp

tests/unit-tests/input/test_surface_input_dispatcher.cpp

tests/unit-tests/input/test_validator.cpp

tests/unit-tests/scene/test_application_session.cpp

tests/unit-tests/scene/test_surface.cpp

tests/unit-tests/scene/test_surface_impl.cpp

tests/unit-tests/test_mir_cookie.cpp

tools/valgrind_suppressions_glibc_2.23

Older »