Merge lp:~mir-team/mir/remove-eol-whitespace into lp:mir
- remove-eol-whitespace
- Merge into development-branch
| Status: | Rejected |
|---|---|
| Rejected by: | Daniel van Vugt |
| Proposed branch: | lp:~mir-team/mir/remove-eol-whitespace |
| Merge into: | lp:mir |
| Diff against target: |
10229 lines (+1141/-1142) 348 files modified
COPYING.GPL (+2/-2) HACKING.md (+2/-2) benchmarks/frame-uniformity/CMakeLists.txt (+1/-1) benchmarks/frame-uniformity/frame_uniformity_test.h (+4/-4) benchmarks/frame-uniformity/main.cpp (+10/-10) benchmarks/frame-uniformity/touch_measuring_client.cpp (+6/-6) benchmarks/frame-uniformity/touch_measuring_client.h (+4/-4) benchmarks/frame-uniformity/touch_producing_server.cpp (+3/-3) benchmarks/frame-uniformity/touch_producing_server.h (+7/-7) benchmarks/frame-uniformity/touch_samples.cpp (+1/-1) benchmarks/frame-uniformity/touch_samples.h (+2/-2) benchmarks/frame-uniformity/vsync_simulating_graphics_platform.cpp (+4/-4) benchmarks/frame-uniformity/vsync_simulating_graphics_platform.h (+3/-3) benchmarks/touch_event_latency.py (+1/-1) cmake/ABICheck.cmake (+4/-4) cmake/Debian.cmake (+2/-2) cmake/FindBoost.cmake (+1/-1) cmake/FindLcov.cmake (+1/-1) cmake/FindLibHardware.cmake (+1/-1) cmake/Findgcovr.cmake (+1/-1) cmake/MirCommon.cmake (+1/-1) cmake/ParseArguments.cmake (+8/-8) cross-compile-chroot.sh (+6/-6) debian/changelog (+60/-60) doc/android_new_device_bringup.md (+15/-15) doc/android_technical_details.md (+2/-2) doc/building_source_for_arm.md (+6/-6) doc/building_source_for_pc.md (+4/-4) doc/demo_server_controls.md (+1/-1) doc/dso_versioning_guide.md (+1/-1) doc/extra.css (+1/-1) doc/installing_prebuilt_on_android.md (+2/-2) doc/mainpage.md (+11/-11) doc/setup_kvm_for_mir.md (+3/-3) doc/setup_vmware_for_mir.md (+2/-2) doc/using_mir_on_android.md (+1/-1) doc/using_mir_on_pc.md (+9/-9) examples/animated_cursor_demo_client.c (+3/-3) examples/client_helpers.cpp (+2/-2) examples/client_helpers.h (+1/-1) examples/client_touch_validator.cpp (+6/-6) examples/cursors_demo_client.c (+2/-2) examples/demo_client_display_config.c (+2/-2) examples/eglapp.c (+4/-4) examples/eglsquare.cpp (+4/-4) examples/fingerpaint.c (+8/-8) examples/input_shapes.cpp (+4/-4) examples/multiwin.c (+4/-4) examples/progressbar.c (+4/-4) examples/server_example_adorning_compositor.cpp (+1/-1) examples/server_example_adorning_compositor.h (+1/-1) examples/server_example_canonical_window_manager.cpp (+1/-1) examples/server_example_window_management_info.cpp (+2/-2) examples/xcursor.c (+1/-1) examples/xcursor_loader.cpp (+5/-5) guides/cppguide.xml (+22/-22) guides/styleguide.xsl (+6/-6) include/client/mir/events/event_builders.h (+1/-1) include/client/mir_toolkit/events/event.h (+2/-2) include/client/mir_toolkit/events/input/input_event.h (+3/-3) include/client/mir_toolkit/events/input/keyboard_event.h (+1/-1) include/client/mir_toolkit/events/input/pointer_event.h (+2/-2) include/client/mir_toolkit/events/input/touch_event.h (+2/-2) include/client/mir_toolkit/events/input_configuration_event.h (+1/-1) include/client/mir_toolkit/events/resize_event.h (+2/-2) include/client/mir_toolkit/events/surface_placement.h (+1/-1) include/client/mir_toolkit/mir_buffer_stream.h (+12/-12) include/client/mir_toolkit/mir_cursor_configuration.h (+1/-1) include/client/mir_toolkit/mir_screencast.h (+2/-2) include/client/mir_toolkit/mir_surface.h (+4/-4) include/client/mir_toolkit/version.h (+1/-1) include/common/mir/fd.h (+1/-1) include/common/mir/uncaught.h (+1/-1) include/core/mir/geometry/rectangle.h (+1/-1) include/platform/mir/graphics/cursor_image.h (+2/-2) include/platform/mir/graphics/display.h (+1/-1) include/platform/mir/graphics/display_buffer.h (+2/-2) include/platform/mir/graphics/platform_ipc_operations.h (+4/-4) include/renderers/sw/mir/renderer/sw/pixel_source.h (+1/-1) include/server/mir/compositor/scene_element.h (+1/-1) include/server/mir/frontend/buffer_stream.h (+3/-3) include/server/mir/input/seat_report.h (+1/-1) include/server/mir/input/touch_visualizer.h (+3/-3) include/server/mir/scene/observer.h (+1/-1) include/server/mir/scene/surface.h (+2/-2) include/server/mir/server.h (+1/-1) include/server/mir/shell/surface_specification.h (+1/-1) include/test/mir/test/doubles/nested_mock_egl.h (+1/-1) include/test/mir/test/doubles/null_display.h (+1/-1) include/test/mir/test/event_factory.h (+1/-1) include/test/mir/test/event_matchers.h (+8/-8) include/test/mir_test_framework/declarative_placement_window_manage_policy.h (+1/-1) playground/demo-shell/demo_compositor.cpp (+4/-4) playground/demo-shell/demo_renderer.h (+1/-1) playground/demo-shell/window_manager.cpp (+7/-7) playground/demo-shell/window_manager.h (+2/-2) playground/mir_demo_client_chain_jumping_buffers.c (+1/-1) playground/mir_demo_client_prerendered_frames.c (+5/-5) src/client/buffer.cpp (+1/-1) src/client/buffer_factory.cpp (+1/-1) src/client/buffer_stream.cpp (+3/-3) src/client/buffer_vault.cpp (+4/-4) src/client/client_buffer_stream.h (+1/-1) src/client/connection_surface_map.cpp (+1/-1) src/client/cursor_configuration.h (+2/-2) src/client/event.cpp (+3/-3) src/client/event_printer.cpp (+1/-1) src/client/events/event_builders.cpp (+5/-5) src/client/input/android/event_conversion_helpers.cpp (+2/-2) src/client/input/input_event.cpp (+9/-9) src/client/lttng/CMakeLists.txt (+1/-1) src/client/lttng/input_receiver_report.cpp (+2/-2) src/client/lttng/input_receiver_report.h (+1/-1) src/client/mir_buffer_api.cpp (+3/-3) src/client/mir_connection.cpp (+5/-5) src/client/mir_connection.h (+0/-1) src/client/mir_cursor_api.cpp (+3/-3) src/client/mir_surface.cpp (+4/-4) src/client/mir_surface.h (+1/-1) src/client/mir_surface_api.cpp (+3/-3) src/client/rpc/CMakeLists.txt (+1/-1) src/client/rpc/mir_protobuf_rpc_channel.cpp (+4/-4) src/client/surface_map.h (+1/-1) src/client/symbols-debug.map (+1/-1) src/client/symbols.map (+6/-6) src/common/fd/fd.cpp (+1/-1) src/common/fd/fd_socket_transmission.cpp (+4/-4) src/common/sharedlibrary/CMakeLists.txt (+1/-1) src/common/sharedlibrary/module_deleter.cpp (+3/-3) src/common/symbols.map (+1/-1) src/cookie/authority.cpp (+1/-1) src/cookie/hmac_cookie.cpp (+1/-1) src/include/client/mir_toolkit/mir_buffer.h (+3/-3) src/include/client/mir_toolkit/mir_buffer_private.h (+1/-1) src/include/client/mir_toolkit/mir_presentation_chain.h (+4/-4) src/include/common/mir/events/event_private.h (+1/-1) src/include/common/mir/protobuf/protocol_version.h (+1/-1) src/include/server/mir/frontend/fd_sets.h (+1/-1) src/include/server/mir/input/scene.h (+1/-1) src/include/server/mir/scene/legacy_scene_change_notification.h (+3/-3) src/platform/symbols.map (+4/-4) src/platforms/CMakeLists.txt (+2/-2) src/platforms/android/client/buffer.cpp (+7/-7) src/platforms/android/client/buffer.h (+1/-1) src/platforms/android/client/egl_native_surface_interpreter.cpp (+2/-2) src/platforms/android/common/android_native_buffer.cpp (+1/-1) src/platforms/android/common/egl_sync_fence.cpp (+1/-1) src/platforms/android/common/native_window_report.cpp (+5/-5) src/platforms/android/include/android/native_window.h (+1/-1) src/platforms/android/include/command_stream_sync.h (+1/-1) src/platforms/android/server/buffer.cpp (+2/-2) src/platforms/android/server/device_quirks.h (+1/-1) src/platforms/android/server/display.cpp (+4/-4) src/platforms/android/server/display_device.h (+2/-2) src/platforms/android/server/fb_device.cpp (+1/-1) src/platforms/android/server/graphic_buffer_allocator.h (+1/-1) src/platforms/android/server/hwc_device.cpp (+2/-2) src/platforms/android/server/hwc_fallback_gl_renderer.cpp (+1/-1) src/platforms/android/server/hwc_fb_device.cpp (+1/-1) src/platforms/android/server/hwc_fb_device.h (+1/-1) src/platforms/android/server/hwc_layerlist.cpp (+3/-3) src/platforms/android/server/hwc_layers.cpp (+4/-4) src/platforms/android/server/hwc_layers.h (+3/-3) src/platforms/android/server/hwc_loggers.cpp (+5/-5) src/platforms/android/server/hwc_wrapper.h (+1/-1) src/platforms/android/server/real_hwc_wrapper.cpp (+1/-1) src/platforms/android/server/resource_factory.cpp (+1/-1) src/platforms/android/utils/test_android_hardware_sanity.cpp (+2/-2) src/platforms/common/server/kms-utils/kms_connector.cpp (+1/-1) src/platforms/eglstream-kms/client/client_platform.cpp (+1/-1) src/platforms/evdev/CMakeLists.txt (+1/-1) src/platforms/mesa/server/buffer_allocator.cpp (+2/-2) src/platforms/mesa/server/kms/cursor.cpp (+5/-5) src/platforms/mesa/server/kms/cursor.h (+1/-1) src/platforms/mesa/server/kms/display_buffer.cpp (+1/-1) src/platforms/mesa/server/kms/guest_platform.h (+1/-1) src/platforms/mesa/server/x11/graphics/display.cpp (+1/-1) src/platforms/mesa/server/x11/symbols.map.in (+2/-2) src/protobuf/mir_protobuf.proto (+8/-8) src/server/compositor/CMakeLists.txt (+1/-1) src/server/compositor/buffer_map.cpp (+1/-1) src/server/compositor/buffer_map.h (+1/-1) src/server/compositor/multi_monitor_arbiter.cpp (+2/-2) src/server/compositor/multi_monitor_arbiter.h (+1/-1) src/server/compositor/occlusion.cpp (+1/-1) src/server/compositor/stream.cpp (+7/-7) src/server/compositor/stream.h (+1/-1) src/server/display_server.cpp (+2/-2) src/server/frontend/protobuf_message_processor.cpp (+1/-1) src/server/frontend/session_mediator.cpp (+8/-8) src/server/graphics/nested/cursor.h (+1/-1) src/server/graphics/nested/host_connection.h (+1/-1) src/server/graphics/nested/input_platform.cpp (+1/-1) src/server/graphics/nested/ipc_operations.cpp (+1/-1) src/server/graphics/nested/mir_client_host_connection.cpp (+2/-2) src/server/graphics/nested/platform.cpp (+2/-2) src/server/graphics/nested/platform.h (+4/-4) src/server/input/cursor_controller.cpp (+2/-2) src/server/input/cursor_controller.h (+1/-1) src/server/input/default_configuration.cpp (+1/-1) src/server/input/event_filter_chain_dispatcher.cpp (+2/-2) src/server/input/event_filter_chain_dispatcher.h (+2/-2) src/server/input/surface_input_dispatcher.cpp (+7/-7) src/server/input/surface_input_dispatcher.h (+2/-2) src/server/input/touchspot_controller.cpp (+13/-13) src/server/input/touchspot_controller.h (+3/-3) src/server/input/touchspot_image.c (+1/-1) src/server/report/logging/display_configuration_report.cpp (+5/-5) src/server/report/lttng/CMakeLists.txt (+1/-1) src/server/scene/application_session.cpp (+4/-4) src/server/scene/basic_surface.cpp (+11/-11) src/server/scene/basic_surface.h (+2/-2) src/server/scene/legacy_scene_change_notification.cpp (+2/-2) src/server/scene/session_manager.cpp (+1/-1) src/server/scene/session_manager.h (+1/-1) src/server/scene/surface_stack.cpp (+4/-4) src/server/scene/surface_stack.h (+4/-4) src/server/shell/abstract_shell.cpp (+1/-1) src/server/shell/canonical_window_manager.cpp (+1/-1) src/server/shell/graphics_display_layout.cpp (+1/-1) src/server/shell/system_compositor_window_manager.cpp (+1/-1) src/server/symbols.map (+1/-1) src/server/version.h.in (+1/-1) src/utils/vanity.c (+1/-1) tests/acceptance-tests/test_client_header_version.cpp (+5/-5) tests/acceptance-tests/test_client_input.cpp (+5/-5) tests/acceptance-tests/test_client_library.cpp (+1/-1) tests/acceptance-tests/test_client_scaling.cpp (+1/-1) tests/acceptance-tests/test_client_surface_events.cpp (+2/-2) tests/acceptance-tests/test_client_surfaces.cpp (+3/-3) tests/acceptance-tests/test_latency.cpp (+1/-1) tests/acceptance-tests/test_nested_input.cpp (+4/-4) tests/acceptance-tests/test_render_override.cpp (+2/-2) tests/acceptance-tests/test_surface_modifications.cpp (+1/-1) tests/acceptance-tests/test_surface_raise.cpp (+4/-4) tests/acceptance-tests/test_surfaces_with_output_id.cpp (+1/-1) tests/acceptance-tests/test_unresponsive_client.cpp (+3/-3) tests/acceptance-tests/throwback/test_client_cursor_api.cpp (+5/-5) tests/acceptance-tests/throwback/test_presentation_chain.cpp (+3/-3) tests/include/mir/test/doubles/fd_matcher.h (+1/-1) tests/include/mir/test/doubles/mock_client_buffer_stream.h (+1/-1) tests/include/mir/test/doubles/mock_frontend_surface.h (+2/-2) tests/include/mir/test/doubles/mock_hwc_report.h (+1/-1) tests/include/mir/test/doubles/mock_mir_buffer.h (+1/-1) tests/include/mir/test/doubles/mock_protobuf_server.h (+1/-1) tests/include/mir/test/doubles/mock_scene_session.h (+1/-1) tests/include/mir/test/doubles/stub_display_builder.h (+3/-3) tests/include/mir/test/doubles/stub_driver_interpreter.h (+1/-1) tests/include/mir/test/doubles/stub_gbm_native_buffer.h (+1/-1) tests/include/mir/test/doubles/stub_host_connection.h (+2/-2) tests/include/mir/test/doubles/stub_input_scene.h (+1/-1) tests/include/mir/test/doubles/stub_input_surface.h (+1/-1) tests/include/mir/test/doubles/stub_renderable.h (+1/-1) tests/include/mir/test/doubles/stub_session.h (+1/-1) tests/include/mir_test_framework/command_line_server_configuration.h (+1/-1) tests/include/mir_test_framework/stub_platform_native_buffer.h (+1/-1) tests/integration-tests/compositor/test_swapping_swappers.cpp (+5/-5) tests/integration-tests/graphics/mesa/CMakeLists.txt (+2/-2) tests/integration-tests/test_buffer_scheduling.cpp (+20/-20) tests/integration-tests/test_submit_buffer.cpp (+8/-8) tests/integration-tests/test_surface_first_frame_sync.cpp (+2/-2) tests/integration-tests/test_surface_stack_with_compositor.cpp (+3/-3) tests/integration-tests/test_test_framework.cpp (+2/-2) tests/integration-tests/test_touchspot_visualization.cpp (+6/-6) tests/mir_test/spin_wait.cpp (+2/-2) tests/mir_test_doubles/mock_egl.cpp (+1/-1) tests/mir_test_doubles/mock_timer.cpp (+1/-1) tests/mir_test_framework/CMakeLists.txt (+2/-2) tests/mir_test_framework/any_surface.cpp (+2/-2) tests/mir_test_framework/declarative_placement_window_manage_policy.cpp (+2/-2) tests/mir_test_framework/headless_display_buffer_compositor_factory.cpp (+1/-1) tests/mir_test_framework/interprocess_client_server_test.cpp (+1/-1) tests/mir_test_framework/placement_applying_shell.cpp (+3/-3) tests/mir_test_framework/stub_client_platform_factory.cpp (+1/-1) tests/mir_test_framework/symbols-client.map (+1/-1) tests/mir_test_framework/udev_environment.cpp (+1/-1) tests/performance-tests/test_glmark2-es2-mir.cpp (+1/-1) tests/test-clients/impolite-shutdown/scroll.cpp (+2/-2) tests/test-clients/mir-stress/CMakeLists.txt (+1/-1) tests/unit-tests/client/test_aging_buffer.cpp (+1/-1) tests/unit-tests/client/test_buffer_vault.cpp (+4/-4) tests/unit-tests/client/test_client_buffer_stream.cpp (+8/-8) tests/unit-tests/client/test_client_mir_surface.cpp (+10/-10) tests/unit-tests/client/test_connection_resource_map.cpp (+1/-1) tests/unit-tests/client/test_mir_buffer.cpp (+4/-4) tests/unit-tests/client/test_mir_connection.cpp (+3/-3) tests/unit-tests/client/test_presentation_chain.cpp (+1/-1) tests/unit-tests/client/test_protobuf_rpc_channel.cpp (+3/-3) tests/unit-tests/client/test_screencast_stream.cpp (+4/-4) tests/unit-tests/compositor/test_dropping_schedule.cpp (+2/-2) tests/unit-tests/compositor/test_multi_monitor_arbiter.cpp (+8/-8) tests/unit-tests/compositor/test_multi_threaded_compositor.cpp (+3/-3) tests/unit-tests/compositor/test_occlusion.cpp (+2/-2) tests/unit-tests/compositor/test_stream.cpp (+3/-3) tests/unit-tests/dispatch/test_multiplexing_dispatchable.cpp (+1/-1) tests/unit-tests/frontend/test_event_sender.cpp (+1/-1) tests/unit-tests/frontend/test_resource_cache.cpp (+2/-2) tests/unit-tests/frontend/test_session_mediator.cpp (+4/-4) tests/unit-tests/graphics/test_software_cursor.cpp (+1/-1) tests/unit-tests/input/android/test_android_input_lexicon.cpp (+1/-1) tests/unit-tests/input/test_event_builders.cpp (+2/-2) tests/unit-tests/input/test_event_filter_chain_dispatcher.cpp (+2/-2) tests/unit-tests/input/test_input_event.cpp (+12/-12) tests/unit-tests/input/test_seat_input_device_tracker.cpp (+3/-3) tests/unit-tests/input/test_surface_input_dispatcher.cpp (+19/-19) tests/unit-tests/input/test_touchspot_controller.cpp (+10/-10) tests/unit-tests/input/test_validator.cpp (+4/-4) tests/unit-tests/platforms/android/client/test_buffer.cpp (+2/-2) tests/unit-tests/platforms/android/client/test_egl_native_surface_interpreter.cpp (+4/-4) tests/unit-tests/platforms/android/server/hwc_struct_helpers.h (+3/-3) tests/unit-tests/platforms/android/server/test_anw_logger.cpp (+1/-1) tests/unit-tests/platforms/android/server/test_buffer_tex_bind.cpp (+2/-2) tests/unit-tests/platforms/android/server/test_display.cpp (+10/-10) tests/unit-tests/platforms/android/server/test_display_buffer.cpp (+9/-9) tests/unit-tests/platforms/android/server/test_display_group.cpp (+1/-1) tests/unit-tests/platforms/android/server/test_display_hotplug.cpp (+2/-2) tests/unit-tests/platforms/android/server/test_egl_sync_fence.cpp (+7/-7) tests/unit-tests/platforms/android/server/test_fb_device.cpp (+1/-1) tests/unit-tests/platforms/android/server/test_hwc_configuration.cpp (+1/-1) tests/unit-tests/platforms/android/server/test_hwc_device.cpp (+7/-7) tests/unit-tests/platforms/android/server/test_hwc_fallback_gl_renderer.cpp (+8/-8) tests/unit-tests/platforms/android/server/test_hwc_layerlist.cpp (+1/-1) tests/unit-tests/platforms/android/server/test_hwc_logger.cpp (+37/-37) tests/unit-tests/platforms/android/server/test_hwc_wrapper.cpp (+6/-6) tests/unit-tests/platforms/android/server/test_ipc_operations.cpp (+1/-1) tests/unit-tests/platforms/android/server/test_output_builder.cpp (+5/-5) tests/unit-tests/platforms/android/server/test_platform.cpp (+1/-1) tests/unit-tests/platforms/android/server/test_server_interpreter.cpp (+1/-1) tests/unit-tests/platforms/mesa/client/test_client_buffer.cpp (+3/-3) tests/unit-tests/platforms/mesa/client/test_native_surface.cpp (+1/-1) tests/unit-tests/platforms/mesa/kms/test_buffer_allocator.cpp (+5/-5) tests/unit-tests/platforms/mesa/kms/test_cursor.cpp (+6/-6) tests/unit-tests/platforms/mesa/kms/test_display_buffer.cpp (+1/-1) tests/unit-tests/platforms/mesa/kms/test_drm_helper.cpp (+9/-9) tests/unit-tests/platforms/mesa/x11/test_display.cpp (+1/-1) tests/unit-tests/platforms/nested/test_nested_display_buffer.cpp (+16/-16) tests/unit-tests/renderers/gl/test_gl_renderer.cpp (+1/-1) tests/unit-tests/scene/test_application_session.cpp (+10/-10) tests/unit-tests/scene/test_basic_surface.cpp (+8/-8) tests/unit-tests/scene/test_legacy_scene_change_notification.cpp (+4/-4) tests/unit-tests/scene/test_surface.cpp (+3/-3) tests/unit-tests/scene/test_surface_impl.cpp (+2/-2) tests/unit-tests/scene/test_surface_stack.cpp (+6/-6) tests/unit-tests/scene/test_timeout_application_not_responding_detector.cpp (+6/-6) tools/detect_fd_leaks.bash (+1/-1) tools/process_doxygen_xml.py (+18/-18) tools/setup-partial-armhf-chroot.sh (+6/-6) tools/valgrind_suppressions_glibc_2.23 (+9/-9) |
| To merge this branch: | bzr merge lp:~mir-team/mir/remove-eol-whitespace |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Mir CI Bot | continuous-integration | Approve | |
| Kevin DuBois (community) | Abstain | ||
| Cemil Azizoglu (community) | Disapprove | ||
| Alan Griffiths | Abstain | ||
| Chris Halse Rogers | Disapprove | ||
|
Review via email:
|
|||
Commit message
Delete whitespace at ends of lines, everywhere except 3rd_party.
Description of the change
I didn't expect there to be this much, and wonder if the diff size will hurt us later in portability of patches/
On the other hand, the diff will only be this large once, in theory.
| Mir CI Bot (mir-ci-bot) wrote : | # |
- 3642. By Daniel van Vugt
-
Ping
| Chris Halse Rogers (raof) wrote : | # |
So, I guess the meta-review is: is this valuable enough to outweigh the cost (lots of in-flight branches will conflict, as you say, patch backporting becomes more difficult).
I'm of the opinion that it isn't sufficiently valuable - in an ideal world there wouldn't be trailing whitespace, but it's *whitespace* so the only harm is that it very slightly increases the size of our source tree.
What does everyone else think?
-----
Outside the meta-review, needs-fixing: please don't change debian/changelog entries for versions that are already in the archive.
| Mir CI Bot (mir-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:3642
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
| Daniel van Vugt (vanvugt) wrote : | # |
I understand and half of me agrees with what you said.
Although on the topic of changelog, we mess that up significantly on occasion and do have to fix it retrospectively anyway. :(
| Daniel van Vugt (vanvugt) wrote : | # |
On the topic of avoiding conflicts, I thought it would be a problem but on the other hand if you look closely most files touched only have one or two lines changed in each. So the potential for significant conflicts is low.
| Alan Griffiths (alan-griffiths) wrote : | # |
I think I proposed something similar in the past and it got rejected for the same reasons
| Cemil Azizoglu (cemil-azizoglu) wrote : | # |
Getting rid of whitespace is good, but without protection against it in the future, it'll happen again. E.g. some codereview tools show the trailing whitespace in red. Unfortunately not launchpad. Or we could have a script that would format each branch before merging. This way we could ensure it doesn't happen in the future. However, without these, we'll soon be back to where we are now.
| Daniel van Vugt (vanvugt) wrote : | # |
I can write an automated test for it, and it would never happen again. However the precondition to that would be for this to land.
The three main reasons to reject this branch are easy to argue/disprove, so it's worth going over them again:
1. It would create too many conflicts. Actually only 15% of files are touched here and most of those that are changed only have a couple of lines modified. So the risk and pain of resolving any conflicts in future is quite low.
2. changelog should not be modified. I can undo that one if necessary however we have a history of writing incorrect documentation and changelog entries that need fixing after the fact.
3. It would happen again. Actually it wouldn't -- I can write an automated test to prevent that very easily.
- 3643. By Daniel van Vugt
-
Merge latest trunk and fix conflicts
| Mir CI Bot (mir-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:3643
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
- 3644. By Daniel van Vugt
-
Again
| Mir CI Bot (mir-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:3644
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
| Daniel van Vugt (vanvugt) wrote : | # |
Failures are unrelated to this branch...
[ FAILED ] NestedServer.
[ FAILED ] NestedServer.
- 3645. By Daniel van Vugt
-
Merge latest trunk
| Mir CI Bot (mir-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:3645
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
- 3646. By Daniel van Vugt
-
Merge latest trunk
| Mir CI Bot (mir-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:3646
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
- 3647. By Daniel van Vugt
-
Merge latest trunk
- 3648. By Daniel van Vugt
-
Merge latest trunk
- 3649. By Daniel van Vugt
-
Remove a couple more new spaces
| Mir CI Bot (mir-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:3649
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
| Daniel van Vugt (vanvugt) wrote : | # |
^^^
Failures are bug 1523621 and bug 1563210
- 3650. By Daniel van Vugt
-
Merge latest trunk
| Mir CI Bot (mir-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:3650
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
- 3651. By Daniel van Vugt
-
Merge latest trunk
- 3652. By Daniel van Vugt
-
Fix some newly-introduced EOL whitespace
| Daniel van Vugt (vanvugt) wrote : | # |
^^^
Failure is bug 1523621
| Mir CI Bot (mir-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:3652
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
| Daniel van Vugt (vanvugt) wrote : | # |
^^^
Clang is missing on the CI machine? This is the second branch to hit this problem today...
05:01:00 The CMAKE_C_COMPILER:
05:01:00
05:01:00 /usr/bin/clang
05:01:00
05:01:00 is not a full path to an existing compiler tool.
- 3653. By Daniel van Vugt
-
Try again
| Mir CI Bot (mir-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:3653
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
| Daniel van Vugt (vanvugt) wrote : | # |
^^^
04:20:58 clang: error: invalid argument '/build/mir' to -fdebug-prefix-map ... What?
and
Configuration device-runtests-mir ? krillin is still in the queue: Waiting for next available executor on krillin-01
device-runtests-mir ? krillin completed with result ABORTED
Finished: ABORTED
- 3654. By Daniel van Vugt
-
Merge latest trunk
| Mir CI Bot (mir-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:3654
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
| Daniel van Vugt (vanvugt) wrote : | # |
^^^
Only krillin failing. That's a good improvement.
02:27:32 Triggering device-runtests-mir ? krillin
02:54:09 Configuration device-runtests-mir ? krillin is still in the queue: Waiting for next available executor on krillin-01
03:02:34 device-runtests-mir ? krillin completed with result ABORTED
03:02:34 Finished: ABORTED
- 3655. By Daniel van Vugt
-
Merge latest trunk and fix a conflict
- 3656. By Daniel van Vugt
-
Fix more EOL whitespace
| Mir CI Bot (mir-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:3656
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
| Daniel van Vugt (vanvugt) wrote : | # |
^^^
Bug 1570327
- 3657. By Daniel van Vugt
-
Try again
| Mir CI Bot (mir-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:3657
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
| Daniel van Vugt (vanvugt) wrote : | # |
^^^
Bug 1563210
- 3658. By Daniel van Vugt
-
Try again
| Mir CI Bot (mir-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:3658
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
- 3659. By Daniel van Vugt
-
Merge latest trunk
- 3660. By Daniel van Vugt
-
Fix more whitespace
| Mir CI Bot (mir-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:3660
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
- 3661. By Daniel van Vugt
-
Merge latest trunk
- 3662. By Daniel van Vugt
-
Remove more whitespace
| Mir CI Bot (mir-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:3662
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
- 3663. By Daniel van Vugt
-
Merge latest trunk
- 3664. By Daniel van Vugt
-
Remove one more whitespace chunk
| Mir CI Bot (mir-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:3664
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
| Daniel van Vugt (vanvugt) wrote : | # |
Bump. My comment on 12 August hasn't been answered.
- 3665. By Daniel van Vugt
-
Merge latest trunk
- 3666. By Daniel van Vugt
-
Merge latest trunk and fix conflict
- 3667. By Daniel van Vugt
-
Remove more whitespace
| Mir CI Bot (mir-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:3667
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
- 3668. By Daniel van Vugt
-
Merge latest trunk and fix conflicts
- 3669. By Daniel van Vugt
-
Fix new whitespace
| Mir CI Bot (mir-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:3669
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
| Kevin DuBois (kdub) wrote : | # |
I feel pretty neutrally about this. Whitespace is a small annoyance imho. OTOH, sweeping whitespace changes all accross the codebase can be annoying with merges and conflicts... Seems the middle way is to add a script, and gradually eliminate whitespace. I suppose abstain from me.
- 3670. By Daniel van Vugt
-
Merge latest trunk
- 3671. By Daniel van Vugt
-
Merge latest trunk
- 3672. By Daniel van Vugt
-
Merge latest trunk and fix a conflict
- 3673. By Daniel van Vugt
-
Remove more whitespace
| Daniel van Vugt (vanvugt) wrote : | # |
Well I've been updating this branch regularly for a month now and I'm only encountering minor conflicts every few days or so. The headaches appear to be minimal.
The diff is only large once, and it's simple to script an automated test after that.
| Mir CI Bot (mir-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:3673
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
| Cemil Azizoglu (cemil-azizoglu) wrote : | # |
I guess the worry is the script may come too late and the code gets unwanted whitespace again. I'd be more in favor if there were a script that Jenkaas runs on every MP.
| Daniel van Vugt (vanvugt) wrote : | # |
"Too late" I think would mean we have as big a diff as this again. That's not going to happen because that would take years to eventuate.
More likely the script would come with zero or a couple of additional whitespace fixes. In fact it's better if it does for the sake of testing the test.
- 3674. By Daniel van Vugt
-
Merge latest trunk
- 3675. By Daniel van Vugt
-
Merge latest trunk and fix conflicts
- 3676. By Daniel van Vugt
-
And fix another whitespace
| Mir CI Bot (mir-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:3676
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
- 3677. By Daniel van Vugt
-
Merge latest trunk and fix a conflict.
| Mir CI Bot (mir-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:3677
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
- 3678. By Daniel van Vugt
-
Merge latest trunk and fix conflicts
| Mir CI Bot (mir-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:3678
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
- 3679. By Daniel van Vugt
-
Merge latest trunk
- 3680. By Daniel van Vugt
-
Merge latest trunk
- 3681. By Daniel van Vugt
-
Merge latest trunk
- 3682. By Daniel van Vugt
-
Merge latest trunk
- 3683. By Daniel van Vugt
-
Remove more whitespace
| Mir CI Bot (mir-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:3683
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
- 3684. By Daniel van Vugt
-
Merge latest trunk and fix conflicts
| Mir CI Bot (mir-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:3684
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
| Daniel van Vugt (vanvugt) wrote : | # |
^^^
Bug 1523621 as usual
- 3685. By Daniel van Vugt
-
Merge latest trunk and fix a conflict
- 3686. By Daniel van Vugt
-
Remove more whitespace
| Mir CI Bot (mir-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:3686
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
- 3687. By Daniel van Vugt
-
Merge latest trunk and fix conflicts
- 3688. By Daniel van Vugt
-
Fix more whitespace
| Mir CI Bot (mir-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:3688
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
- 3689. By Daniel van Vugt
-
Merge latest trunk and fix conflicts.
- 3690. By Daniel van Vugt
-
Remove more EOL whitespace
| Mir CI Bot (mir-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:3690
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
- 3691. By Daniel van Vugt
-
Merge latest trunk
- 3692. By Daniel van Vugt
-
Merge latest trunk
- 3693. By Daniel van Vugt
-
Merge latest trunk and resolve conflicts (from kdub's massive
code removal)
| Mir CI Bot (mir-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:3693
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
- 3694. By Daniel van Vugt
-
Merge latest trunk
- 3695. By Daniel van Vugt
-
Merge latest trunk
- 3696. By Daniel van Vugt
-
Merge latest trunk and fix a conflict.
| Mir CI Bot (mir-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:3696
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
- 3697. By Daniel van Vugt
-
Merge latest trunk and fix conflicts.
- 3698. By Daniel van Vugt
-
Fix more EOL whitespace
| Mir CI Bot (mir-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:3698
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
- 3699. By Daniel van Vugt
-
Merge latest trunk and fix conflicts.
- 3700. By Daniel van Vugt
-
Remove more whitespace
| Mir CI Bot (mir-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:3700
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
- 3701. By Daniel van Vugt
-
Merge latest trunk
- 3702. By Daniel van Vugt
-
Fix more whitespace
| Mir CI Bot (mir-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:3702
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
| Daniel van Vugt (vanvugt) wrote : | # |
Eventually I will get around to proposing the automated test for this..
- 3703. By Daniel van Vugt
-
Merge latest trunk
- 3704. By Daniel van Vugt
-
Remove another EOL whitespace
| Mir CI Bot (mir-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:3704
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
- 3705. By Daniel van Vugt
-
Merge latest trunk
| Mir CI Bot (mir-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:3705
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
- 3706. By Daniel van Vugt
-
Merge latest trunk
| Daniel van Vugt (vanvugt) wrote : | # |
^^^
Bug 1633920
| Mir CI Bot (mir-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:3706
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
- 3707. By Daniel van Vugt
-
Merge latest trunk and fix a conflict
| Mir CI Bot (mir-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:3707
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
- 3708. By Daniel van Vugt
-
Merge latest trunk and fix conflicts
- 3709. By Daniel van Vugt
-
Merge latest trunk
- 3710. By Daniel van Vugt
-
Fix more whitespace
| Mir CI Bot (mir-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:3710
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Unmerged revisions
- 3710. By Daniel van Vugt
-
Fix more whitespace
- 3709. By Daniel van Vugt
-
Merge latest trunk
- 3708. By Daniel van Vugt
-
Merge latest trunk and fix conflicts
- 3707. By Daniel van Vugt
-
Merge latest trunk and fix a conflict
- 3706. By Daniel van Vugt
-
Merge latest trunk
- 3705. By Daniel van Vugt
-
Merge latest trunk
- 3704. By Daniel van Vugt
-
Remove another EOL whitespace
- 3703. By Daniel van Vugt
-
Merge latest trunk
- 3702. By Daniel van Vugt
-
Fix more whitespace
- 3701. By Daniel van Vugt
-
Merge latest trunk
Preview Diff
| 1 | === modified file 'COPYING.GPL' |
| 2 | --- COPYING.GPL 2013-03-04 15:57:30 +0000 |
| 3 | +++ COPYING.GPL 2016-10-27 03:52:22 +0000 |
| 4 | @@ -77,7 +77,7 @@ |
| 5 | |
| 6 | "Copyright" also means copyright-like laws that apply to other kinds of |
| 7 | works, such as semiconductor masks. |
| 8 | - |
| 9 | + |
| 10 | "The Program" refers to any copyrightable work licensed under this |
| 11 | License. Each licensee is addressed as "you". "Licensees" and |
| 12 | "recipients" may be individuals or organizations. |
| 13 | @@ -510,7 +510,7 @@ |
| 14 | covered work in a country, or your recipient's use of the covered work |
| 15 | in a country, would infringe one or more identifiable patents in that |
| 16 | country that you have reason to believe are valid. |
| 17 | - |
| 18 | + |
| 19 | If, pursuant to or in connection with a single transaction or |
| 20 | arrangement, you convey, or propagate by procuring conveyance of, a |
| 21 | covered work, and grant a patent license to some of the parties |
| 22 | |
| 23 | === modified file 'HACKING.md' |
| 24 | --- HACKING.md 2013-06-17 15:35:53 +0000 |
| 25 | +++ HACKING.md 2016-10-27 03:52:22 +0000 |
| 26 | @@ -90,7 +90,7 @@ |
| 27 | strong and no-throw guarantees. http://www.boost.org/community/exception_safety.html |
| 28 | |
| 29 | A function is not required to check its preconditions (there should be no |
| 30 | -tests that preconditions failures are reported). This means that |
| 31 | +tests that preconditions failures are reported). This means that |
| 32 | preconditions may be verified using the "assert" macro - which may or may |
| 33 | not report problems (depending upon the NDEBUG define). |
| 34 | |
| 35 | @@ -103,7 +103,7 @@ |
| 36 | expected to refer to valid objects. This avoids repetitive tests for |
| 37 | validity. Unless otherwise documented functions and constructors that |
| 38 | take pointer parameters have validity of the referenced objects as a |
| 39 | -precondition. Exceptions to the rule must be of limited scope and |
| 40 | +precondition. Exceptions to the rule must be of limited scope and |
| 41 | documented. |
| 42 | |
| 43 | |
| 44 | |
| 45 | === modified file 'benchmarks/frame-uniformity/CMakeLists.txt' |
| 46 | --- benchmarks/frame-uniformity/CMakeLists.txt 2016-08-19 07:49:12 +0000 |
| 47 | +++ benchmarks/frame-uniformity/CMakeLists.txt 2016-10-27 03:52:22 +0000 |
| 48 | @@ -36,7 +36,7 @@ |
| 49 | mirserver |
| 50 | mirclient |
| 51 | mirplatform |
| 52 | - |
| 53 | + |
| 54 | mir-test-assist |
| 55 | |
| 56 | # needed for fake_event_hub_server_configuration.h (which relies on private APIs) |
| 57 | |
| 58 | === modified file 'benchmarks/frame-uniformity/frame_uniformity_test.h' |
| 59 | --- benchmarks/frame-uniformity/frame_uniformity_test.h 2015-06-25 03:00:08 +0000 |
| 60 | +++ benchmarks/frame-uniformity/frame_uniformity_test.h 2016-10-27 03:52:22 +0000 |
| 61 | @@ -46,13 +46,13 @@ |
| 62 | public: |
| 63 | FrameUniformityTest(FrameUniformityTestParameters const& parameters); |
| 64 | virtual ~FrameUniformityTest() = default; |
| 65 | - |
| 66 | + |
| 67 | mir::DefaultServerConfiguration& server_config() override; |
| 68 | - |
| 69 | + |
| 70 | void run_test(); |
| 71 | - |
| 72 | + |
| 73 | std::shared_ptr<TouchSamples> client_results(); |
| 74 | - |
| 75 | + |
| 76 | TouchProducingServer::TouchTimings server_timings(); |
| 77 | |
| 78 | private: |
| 79 | |
| 80 | === modified file 'benchmarks/frame-uniformity/main.cpp' |
| 81 | --- benchmarks/frame-uniformity/main.cpp 2015-04-28 07:54:10 +0000 |
| 82 | +++ benchmarks/frame-uniformity/main.cpp 2016-10-27 03:52:22 +0000 |
| 83 | @@ -46,7 +46,7 @@ |
| 84 | touch_start_time.time_since_epoch().count(); |
| 85 | |
| 86 | double alpha = elapsed_interval / total_interval; |
| 87 | - |
| 88 | + |
| 89 | return touch_start + alpha*(touch_end-touch_start); |
| 90 | } |
| 91 | |
| 92 | @@ -73,7 +73,7 @@ |
| 93 | double sum = 0; |
| 94 | for (auto const& sample : results) |
| 95 | { |
| 96 | - auto distance = pixel_lag_for_sample_at_time(touch_start_point, touch_end_point, touch_start_time, |
| 97 | + auto distance = pixel_lag_for_sample_at_time(touch_start_point, touch_end_point, touch_start_time, |
| 98 | touch_end_time, sample); |
| 99 | sum += distance; |
| 100 | } |
| 101 | @@ -93,11 +93,11 @@ |
| 102 | { |
| 103 | auto average_pixel_offset = compute_average_frame_offset(results, touch_start_point, touch_end_point, |
| 104 | touch_start_time, touch_end_time); |
| 105 | - |
| 106 | + |
| 107 | double sum = 0; |
| 108 | for (auto const& sample : results) |
| 109 | { |
| 110 | - auto distance = pixel_lag_for_sample_at_time(touch_start_point, touch_end_point, touch_start_time, |
| 111 | + auto distance = pixel_lag_for_sample_at_time(touch_start_point, touch_end_point, touch_start_time, |
| 112 | touch_end_time, sample); |
| 113 | sum += (distance-average_pixel_offset)*(distance-average_pixel_offset); |
| 114 | } |
| 115 | @@ -115,7 +115,7 @@ |
| 116 | geom::Point const touch_start_point{0, 0}; |
| 117 | geom::Point const touch_end_point{1024, 1024}; |
| 118 | std::chrono::milliseconds touch_duration{1000}; |
| 119 | - |
| 120 | + |
| 121 | int const run_count = 1; |
| 122 | double average_lag = 0, average_uniformity = 0; |
| 123 | |
| 124 | @@ -123,13 +123,13 @@ |
| 125 | setenv("MIR_CLIENT_PLATFORM_PATH", |
| 126 | (mtf::library_path() + "/client-modules").c_str(), |
| 127 | true); |
| 128 | - |
| 129 | + |
| 130 | for (int i = 0; i < run_count; i++) |
| 131 | { |
| 132 | FrameUniformityTest t({screen_size, touch_start_point, touch_end_point, touch_duration}); |
| 133 | |
| 134 | t.run_test(); |
| 135 | - |
| 136 | + |
| 137 | auto touch_timings = t.server_timings(); |
| 138 | auto touch_start_time = touch_timings.touch_start; |
| 139 | auto touch_end_time = touch_timings.touch_end; |
| 140 | @@ -137,14 +137,14 @@ |
| 141 | |
| 142 | auto results = compute_frame_uniformity(samples, touch_start_point, touch_end_point, |
| 143 | touch_start_time, touch_end_time); |
| 144 | - |
| 145 | + |
| 146 | average_lag += results.average_pixel_offset; |
| 147 | average_uniformity += results.frame_uniformity; |
| 148 | } |
| 149 | - |
| 150 | + |
| 151 | average_lag /= run_count; |
| 152 | average_uniformity /= run_count; |
| 153 | - |
| 154 | + |
| 155 | std::cout << "Average pixel lag: " << average_lag << "px" << std::endl; |
| 156 | std::cout << "Frame Uniformity (smaller scores are more uniform): " << average_uniformity << "px per sample\n" |
| 157 | << std::endl; |
| 158 | |
| 159 | === modified file 'benchmarks/frame-uniformity/touch_measuring_client.cpp' |
| 160 | --- benchmarks/frame-uniformity/touch_measuring_client.cpp 2015-06-17 05:20:42 +0000 |
| 161 | +++ benchmarks/frame-uniformity/touch_measuring_client.cpp 2016-10-27 03:52:22 +0000 |
| 162 | @@ -42,7 +42,7 @@ |
| 163 | |
| 164 | auto surface = mir_surface_create_sync(spec); |
| 165 | mir_surface_spec_release(spec); |
| 166 | - |
| 167 | + |
| 168 | if (!mir_surface_is_valid(surface)) |
| 169 | { |
| 170 | std::cerr << "Surface creation failed: " << mir_surface_get_error_message(surface) << std::endl; |
| 171 | @@ -55,14 +55,14 @@ |
| 172 | void input_callback(MirSurface * /* surface */, MirEvent const* event, void* context) |
| 173 | { |
| 174 | auto results = static_cast<TouchSamples*>(context); |
| 175 | - |
| 176 | + |
| 177 | results->record_pointer_coordinates(std::chrono::high_resolution_clock::now(), *event); |
| 178 | } |
| 179 | |
| 180 | void collect_input_and_frame_timing(MirSurface *surface, mt::Barrier& client_ready, std::chrono::high_resolution_clock::duration duration, std::shared_ptr<TouchSamples> const& results) |
| 181 | { |
| 182 | mir_surface_set_event_handler(surface, input_callback, results.get()); |
| 183 | - |
| 184 | + |
| 185 | client_ready.ready(); |
| 186 | |
| 187 | // May be better if end time were relative to the first input event |
| 188 | @@ -99,17 +99,17 @@ |
| 189 | std::cerr << "Connection to Mir failed: " << mir_connection_get_error_message(connection) << std::endl; |
| 190 | exit(1); |
| 191 | } |
| 192 | - |
| 193 | + |
| 194 | /* |
| 195 | * Set a null callback to avoid killing the process |
| 196 | * (default callback raises SIGHUP). |
| 197 | */ |
| 198 | mir_connection_set_lifecycle_event_callback(connection, null_lifecycle_callback, nullptr); |
| 199 | - |
| 200 | + |
| 201 | auto surface = create_surface(connection); |
| 202 | |
| 203 | collect_input_and_frame_timing(surface, client_ready, touch_duration, results_); |
| 204 | - |
| 205 | + |
| 206 | mir_surface_release_sync(surface); |
| 207 | mir_connection_release(connection); |
| 208 | } |
| 209 | |
| 210 | === modified file 'benchmarks/frame-uniformity/touch_measuring_client.h' |
| 211 | --- benchmarks/frame-uniformity/touch_measuring_client.h 2015-06-25 03:00:08 +0000 |
| 212 | +++ benchmarks/frame-uniformity/touch_measuring_client.h 2016-10-27 03:52:22 +0000 |
| 213 | @@ -31,16 +31,16 @@ |
| 214 | public: |
| 215 | TouchMeasuringClient(mir::test::Barrier& client_ready, |
| 216 | std::chrono::high_resolution_clock::duration const& touch_duration); |
| 217 | - |
| 218 | + |
| 219 | void run(std::string const& connect_string); |
| 220 | - |
| 221 | + |
| 222 | std::shared_ptr<TouchSamples> results(); |
| 223 | |
| 224 | private: |
| 225 | mir::test::Barrier& client_ready; |
| 226 | - |
| 227 | + |
| 228 | std::chrono::high_resolution_clock::duration const touch_duration; |
| 229 | - |
| 230 | + |
| 231 | std::shared_ptr<TouchSamples> results_; |
| 232 | }; |
| 233 | |
| 234 | |
| 235 | === modified file 'benchmarks/frame-uniformity/touch_producing_server.cpp' |
| 236 | --- benchmarks/frame-uniformity/touch_producing_server.cpp 2016-01-29 08:18:22 +0000 |
| 237 | +++ benchmarks/frame-uniformity/touch_producing_server.cpp 2016-10-27 03:52:22 +0000 |
| 238 | @@ -61,7 +61,7 @@ |
| 239 | |
| 240 | if (!graphics_platform) |
| 241 | graphics_platform = std::make_shared<VsyncSimulatingPlatform>(screen_dimensions.size, refresh_rate_in_hz); |
| 242 | - |
| 243 | + |
| 244 | return graphics_platform; |
| 245 | } |
| 246 | |
| 247 | @@ -86,7 +86,7 @@ |
| 248 | std::chrono::milliseconds const pause_between_events{10}; |
| 249 | |
| 250 | client_ready.ready(); |
| 251 | - |
| 252 | + |
| 253 | auto start = std::chrono::high_resolution_clock::now(); |
| 254 | auto end = start + touch_duration; |
| 255 | auto now = start; |
| 256 | @@ -100,7 +100,7 @@ |
| 257 | if (touch_start_time == std::chrono::high_resolution_clock::time_point::min()) |
| 258 | touch_start_time = now; |
| 259 | touch_end_time = now; |
| 260 | - |
| 261 | + |
| 262 | double alpha = (now.time_since_epoch().count()-start.time_since_epoch().count()) / static_cast<double>(end.time_since_epoch().count()-start.time_since_epoch().count()); |
| 263 | auto point = touch_start + alpha*(touch_end-touch_start); |
| 264 | synthesize_event_at(point); |
| 265 | |
| 266 | === modified file 'benchmarks/frame-uniformity/touch_producing_server.h' |
| 267 | --- benchmarks/frame-uniformity/touch_producing_server.h 2016-01-29 08:18:22 +0000 |
| 268 | +++ benchmarks/frame-uniformity/touch_producing_server.h 2016-10-27 03:52:22 +0000 |
| 269 | @@ -32,16 +32,16 @@ |
| 270 | { |
| 271 | public: |
| 272 | TouchProducingServer(mir::geometry::Rectangle screen_dimensions, mir::geometry::Point touch_start, mir::geometry::Point touch_end, std::chrono::high_resolution_clock::duration touch_duration, mir::test::Barrier& client_ready); |
| 273 | - |
| 274 | + |
| 275 | struct TouchTimings { |
| 276 | std::chrono::high_resolution_clock::time_point touch_start; |
| 277 | std::chrono::high_resolution_clock::time_point touch_end; |
| 278 | }; |
| 279 | TouchTimings touch_timings(); |
| 280 | - |
| 281 | + |
| 282 | std::shared_ptr<mir::graphics::Platform> the_graphics_platform() override; |
| 283 | |
| 284 | - ~TouchProducingServer(); |
| 285 | + ~TouchProducingServer(); |
| 286 | private: |
| 287 | mir::geometry::Rectangle const screen_dimensions; |
| 288 | |
| 289 | @@ -50,14 +50,14 @@ |
| 290 | std::chrono::high_resolution_clock::duration const touch_duration; |
| 291 | |
| 292 | mir::test::Barrier& client_ready; |
| 293 | - |
| 294 | + |
| 295 | std::thread input_injection_thread; |
| 296 | - |
| 297 | + |
| 298 | std::chrono::high_resolution_clock::time_point touch_start_time; |
| 299 | std::chrono::high_resolution_clock::time_point touch_end_time; |
| 300 | - |
| 301 | + |
| 302 | std::shared_ptr<mir::graphics::Platform> graphics_platform; |
| 303 | - |
| 304 | + |
| 305 | void synthesize_event_at(mir::geometry::Point const& point); |
| 306 | void thread_function(); |
| 307 | |
| 308 | |
| 309 | === modified file 'benchmarks/frame-uniformity/touch_samples.cpp' |
| 310 | --- benchmarks/frame-uniformity/touch_samples.cpp 2015-06-17 05:20:42 +0000 |
| 311 | +++ benchmarks/frame-uniformity/touch_samples.cpp 2016-10-27 03:52:22 +0000 |
| 312 | @@ -28,7 +28,7 @@ |
| 313 | } |
| 314 | samples_being_prepared.clear(); |
| 315 | } |
| 316 | - |
| 317 | + |
| 318 | void TouchSamples::record_pointer_coordinates(std::chrono::high_resolution_clock::time_point reception_time, |
| 319 | MirEvent const& event) |
| 320 | { |
| 321 | |
| 322 | === modified file 'benchmarks/frame-uniformity/touch_samples.h' |
| 323 | --- benchmarks/frame-uniformity/touch_samples.h 2014-10-22 14:08:51 +0000 |
| 324 | +++ benchmarks/frame-uniformity/touch_samples.h 2016-10-27 03:52:22 +0000 |
| 325 | @@ -30,7 +30,7 @@ |
| 326 | public: |
| 327 | TouchSamples() = default; |
| 328 | ~TouchSamples() = default; |
| 329 | - |
| 330 | + |
| 331 | // A touch sample |
| 332 | struct Sample |
| 333 | { |
| 334 | @@ -43,7 +43,7 @@ |
| 335 | std::chrono::high_resolution_clock::time_point frame_time; |
| 336 | }; |
| 337 | std::vector<Sample> get(); |
| 338 | - |
| 339 | + |
| 340 | void record_frame_time(std::chrono::high_resolution_clock::time_point time); |
| 341 | void record_pointer_coordinates(std::chrono::high_resolution_clock::time_point reception_time, |
| 342 | MirEvent const& ev); |
| 343 | |
| 344 | === modified file 'benchmarks/frame-uniformity/vsync_simulating_graphics_platform.cpp' |
| 345 | --- benchmarks/frame-uniformity/vsync_simulating_graphics_platform.cpp 2016-01-29 08:18:22 +0000 |
| 346 | +++ benchmarks/frame-uniformity/vsync_simulating_graphics_platform.cpp 2016-10-27 03:52:22 +0000 |
| 347 | @@ -54,10 +54,10 @@ |
| 348 | { |
| 349 | auto now = std::chrono::high_resolution_clock::now(); |
| 350 | auto next_sync = last_sync + std::chrono::seconds(1) / vsync_rate_in_hz; |
| 351 | - |
| 352 | + |
| 353 | if (now < next_sync) |
| 354 | std::this_thread::sleep_for(next_sync - now); |
| 355 | - |
| 356 | + |
| 357 | last_sync = now; |
| 358 | } |
| 359 | |
| 360 | @@ -65,7 +65,7 @@ |
| 361 | { |
| 362 | return std::chrono::milliseconds::zero(); |
| 363 | } |
| 364 | - |
| 365 | + |
| 366 | double const vsync_rate_in_hz; |
| 367 | |
| 368 | std::chrono::high_resolution_clock::time_point last_sync; |
| 369 | @@ -80,7 +80,7 @@ |
| 370 | group(output_size, vsync_rate_in_hz) |
| 371 | { |
| 372 | } |
| 373 | - |
| 374 | + |
| 375 | void for_each_display_sync_group(std::function<void(mg::DisplaySyncGroup&)> const& exec) override |
| 376 | { |
| 377 | exec(group); |
| 378 | |
| 379 | === modified file 'benchmarks/frame-uniformity/vsync_simulating_graphics_platform.h' |
| 380 | --- benchmarks/frame-uniformity/vsync_simulating_graphics_platform.h 2016-01-29 08:18:22 +0000 |
| 381 | +++ benchmarks/frame-uniformity/vsync_simulating_graphics_platform.h 2016-10-27 03:52:22 +0000 |
| 382 | @@ -29,13 +29,13 @@ |
| 383 | public: |
| 384 | VsyncSimulatingPlatform(mir::geometry::Size const& output_size, int vsync_rate_in_hz); |
| 385 | ~VsyncSimulatingPlatform() = default; |
| 386 | - |
| 387 | + |
| 388 | mir::UniqueModulePtr<mir::graphics::GraphicBufferAllocator> create_buffer_allocator(); |
| 389 | - |
| 390 | + |
| 391 | mir::UniqueModulePtr<mir::graphics::Display> create_display( |
| 392 | std::shared_ptr<mir::graphics::DisplayConfigurationPolicy> const& initial_conf_policy, |
| 393 | std::shared_ptr<mir::graphics::GLConfig> const& gl_config); |
| 394 | - |
| 395 | + |
| 396 | mir::UniqueModulePtr<mir::graphics::PlatformIpcOperations> make_ipc_operations() const; |
| 397 | |
| 398 | private: |
| 399 | |
| 400 | === modified file 'benchmarks/touch_event_latency.py' |
| 401 | --- benchmarks/touch_event_latency.py 2015-07-02 14:40:40 +0000 |
| 402 | +++ benchmarks/touch_event_latency.py 2016-10-27 03:52:22 +0000 |
| 403 | @@ -25,7 +25,7 @@ |
| 404 | evdev.ecodes.BTN_TOUCH, |
| 405 | ] |
| 406 | } |
| 407 | - |
| 408 | + |
| 409 | self.ui = evdev.UInput(events=allowed_events, name="autopilot-finger") |
| 410 | |
| 411 | def get_resolution(self): |
| 412 | |
| 413 | === modified file 'cmake/ABICheck.cmake' |
| 414 | --- cmake/ABICheck.cmake 2016-07-18 07:38:38 +0000 |
| 415 | +++ cmake/ABICheck.cmake 2016-10-27 03:52:22 +0000 |
| 416 | @@ -50,11 +50,11 @@ |
| 417 | cmake_policy(SET CMP0026 OLD) |
| 418 | endif() |
| 419 | get_property(LIB_DESC_LIBS TARGET ${libname} PROPERTY LOCATION) |
| 420 | - |
| 421 | + |
| 422 | get_includes(${libname} LIB_DESC_INCLUDE_PATHS) |
| 423 | set(LIB_DESC_GCC_OPTS "${CMAKE_CXX_FLAGS}") |
| 424 | |
| 425 | - # Optional EXCLUDE_HEADERS - a list |
| 426 | + # Optional EXCLUDE_HEADERS - a list |
| 427 | # while attempting an abi dump |
| 428 | get_value_for_key("${ARGN}" "EXCLUDE_HEADERS" LIB_DESC_SKIP_HEADERS) |
| 429 | |
| 430 | @@ -90,8 +90,8 @@ |
| 431 | add_custom_target(abi-dump-${libname} DEPENDS ${ABI_DUMP_NAME}) |
| 432 | endmacro(_define_abi_dump_for) |
| 433 | |
| 434 | -macro(_define_abi_check_for libname) |
| 435 | - add_custom_target(abi-check-${libname} |
| 436 | +macro(_define_abi_check_for libname) |
| 437 | + add_custom_target(abi-check-${libname} |
| 438 | COMMAND /bin/bash -c '${CMAKE_SOURCE_DIR}/tools/abi_check.sh ${libname} ${ABI_DUMPS_DIR} ${CMAKE_SOURCE_DIR}' |
| 439 | DEPENDS abi-dump-${libname} |
| 440 | ) |
| 441 | |
| 442 | === modified file 'cmake/Debian.cmake' |
| 443 | --- cmake/Debian.cmake 2012-11-12 12:27:40 +0000 |
| 444 | +++ cmake/Debian.cmake 2016-10-27 03:52:22 +0000 |
| 445 | @@ -9,13 +9,13 @@ |
| 446 | OUTPUT_VARIABLE DPKG_BUILDFLAGS_CFLAGS |
| 447 | OUTPUT_STRIP_TRAILING_WHITESPACE |
| 448 | ) |
| 449 | - |
| 450 | + |
| 451 | execute_process( |
| 452 | COMMAND ${DPKG_BUILDFLAGS} "--get" "CPPFLAGS" |
| 453 | OUTPUT_VARIABLE DPKG_BUILDFLAGS_CPPFLAGS |
| 454 | OUTPUT_STRIP_TRAILING_WHITESPACE |
| 455 | ) |
| 456 | - |
| 457 | + |
| 458 | execute_process( |
| 459 | COMMAND ${DPKG_BUILDFLAGS} "--get" "CXXFLAGS" |
| 460 | OUTPUT_VARIABLE DPKG_BUILDFLAGS_CXXFLAGS |
| 461 | |
| 462 | === modified file 'cmake/FindBoost.cmake' |
| 463 | --- cmake/FindBoost.cmake 2012-08-10 10:05:29 +0000 |
| 464 | +++ cmake/FindBoost.cmake 2016-10-27 03:52:22 +0000 |
| 465 | @@ -1194,7 +1194,7 @@ |
| 466 | set(Boost_LIBRARIES ${Boost_LIBRARIES} ${Boost_${UPPERCOMPONENT}_LIBRARY}) |
| 467 | if(${UPPERCOMPONENT} STREQUAL "THREAD" AND UNIX) |
| 468 | find_package (Threads) |
| 469 | - set(Boost_LIBRARIES |
| 470 | + set(Boost_LIBRARIES |
| 471 | ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) |
| 472 | endif(${UPPERCOMPONENT} STREQUAL "THREAD" AND UNIX) |
| 473 | endif( Boost_${UPPERCOMPONENT}_FOUND ) |
| 474 | |
| 475 | === modified file 'cmake/FindLcov.cmake' |
| 476 | --- cmake/FindLcov.cmake 2012-07-26 07:03:35 +0000 |
| 477 | +++ cmake/FindLcov.cmake 2016-10-27 03:52:22 +0000 |
| 478 | @@ -1,4 +1,4 @@ |
| 479 | -# - Find lcov |
| 480 | +# - Find lcov |
| 481 | # Will define: |
| 482 | # |
| 483 | # LCOV_EXECUTABLE - the lcov binary |
| 484 | |
| 485 | === modified file 'cmake/FindLibHardware.cmake' |
| 486 | --- cmake/FindLibHardware.cmake 2016-07-18 07:38:38 +0000 |
| 487 | +++ cmake/FindLibHardware.cmake 2016-10-27 03:52:22 +0000 |
| 488 | @@ -12,7 +12,7 @@ |
| 489 | |
| 490 | find_library(LIBHARDWARE_LIBRARY |
| 491 | NAMES libhardware.so.2 |
| 492 | - libhardware.so |
| 493 | + libhardware.so |
| 494 | ) |
| 495 | |
| 496 | set(LIBHARDWARE_LIBRARIES ${LIBHARDWARE_LIBRARY}) |
| 497 | |
| 498 | === modified file 'cmake/Findgcovr.cmake' |
| 499 | --- cmake/Findgcovr.cmake 2012-07-26 07:03:35 +0000 |
| 500 | +++ cmake/Findgcovr.cmake 2016-10-27 03:52:22 +0000 |
| 501 | @@ -1,4 +1,4 @@ |
| 502 | -# - Find gcovr scrip |
| 503 | +# - Find gcovr scrip |
| 504 | # Will define: |
| 505 | # |
| 506 | # GCOVR_EXECUTABLE - the gcovr script |
| 507 | |
| 508 | === modified file 'cmake/MirCommon.cmake' |
| 509 | --- cmake/MirCommon.cmake 2016-08-10 07:57:05 +0000 |
| 510 | +++ cmake/MirCommon.cmake 2016-10-27 03:52:22 +0000 |
| 511 | @@ -79,7 +79,7 @@ |
| 512 | set(TSAN_EXTRA_OPTIONS "external_symbolizer_path=${LLVM_SYMBOLIZER}") |
| 513 | endif() |
| 514 | endif() |
| 515 | - # Space after ${TSAN_EXTRA_OPTIONS} works around bug in TSAN env. variable parsing |
| 516 | + # Space after ${TSAN_EXTRA_OPTIONS} works around bug in TSAN env. variable parsing |
| 517 | list(APPEND test_env "TSAN_OPTIONS=\"suppressions=${CMAKE_SOURCE_DIR}/tools/tsan-suppressions second_deadlock_stack=1 halt_on_error=1 history_size=7 die_after_fork=0 ${TSAN_EXTRA_OPTIONS} \"") |
| 518 | # TSan does not support starting threads after fork |
| 519 | set(test_exclusion_filter "${test_exclusion_filter}:ThreadedDispatcherSignalTest.keeps_dispatching_after_signal_interruption") |
| 520 | |
| 521 | === modified file 'cmake/ParseArguments.cmake' |
| 522 | --- cmake/ParseArguments.cmake 2012-07-26 07:03:35 +0000 |
| 523 | +++ cmake/ParseArguments.cmake 2016-10-27 03:52:22 +0000 |
| 524 | @@ -18,29 +18,29 @@ |
| 525 | # * ARG_OPTION2: TRUE |
| 526 | # * ARG_OPTION3: TRUE |
| 527 | # |
| 528 | -# taken from http://www.cmake.org/Wiki/CMakeMacroParseArguments |
| 529 | +# taken from http://www.cmake.org/Wiki/CMakeMacroParseArguments |
| 530 | |
| 531 | MACRO(PARSE_ARGUMENTS prefix arg_names option_names) |
| 532 | SET(DEFAULT_ARGS) |
| 533 | - FOREACH(arg_name ${arg_names}) |
| 534 | + FOREACH(arg_name ${arg_names}) |
| 535 | SET(${prefix}_${arg_name}) |
| 536 | ENDFOREACH(arg_name) |
| 537 | FOREACH(option ${option_names}) |
| 538 | SET(${prefix}_${option} FALSE) |
| 539 | ENDFOREACH(option) |
| 540 | - |
| 541 | + |
| 542 | SET(current_arg_name DEFAULT_ARGS) |
| 543 | SET(current_arg_list) |
| 544 | - FOREACH(arg ${ARGN}) |
| 545 | - SET(larg_names ${arg_names}) |
| 546 | - LIST(FIND larg_names "${arg}" is_arg_name) |
| 547 | + FOREACH(arg ${ARGN}) |
| 548 | + SET(larg_names ${arg_names}) |
| 549 | + LIST(FIND larg_names "${arg}" is_arg_name) |
| 550 | IF (is_arg_name GREATER -1) |
| 551 | SET(${prefix}_${current_arg_name} ${current_arg_list}) |
| 552 | SET(current_arg_name ${arg}) |
| 553 | SET(current_arg_list) |
| 554 | ELSE (is_arg_name GREATER -1) |
| 555 | - SET(loption_names ${option_names}) |
| 556 | - LIST(FIND loption_names "${arg}" is_option) |
| 557 | + SET(loption_names ${option_names}) |
| 558 | + LIST(FIND loption_names "${arg}" is_option) |
| 559 | IF (is_option GREATER -1) |
| 560 | SET(${prefix}_${arg} TRUE) |
| 561 | ELSE (is_option GREATER -1) |
| 562 | |
| 563 | === modified file 'cross-compile-chroot.sh' |
| 564 | --- cross-compile-chroot.sh 2016-08-09 08:13:02 +0000 |
| 565 | +++ cross-compile-chroot.sh 2016-10-27 03:52:22 +0000 |
| 566 | @@ -22,7 +22,7 @@ |
| 567 | NUM_JOBS=$(( $(grep -c ^processor /proc/cpuinfo) + 1 )) |
| 568 | _do_update_chroot=0 |
| 569 | |
| 570 | -# Default to vivid as we don't seem to have any working wily devices right now |
| 571 | +# Default to vivid as we don't seem to have any working wily devices right now |
| 572 | dist=vivid |
| 573 | clean=0 |
| 574 | update_build_dir=0 |
| 575 | @@ -84,12 +84,12 @@ |
| 576 | export MIR_NDK_PATH=~/.cache/mir-${target_arch}-chroot-${dist} |
| 577 | fi |
| 578 | |
| 579 | -if [ ! -d ${MIR_NDK_PATH} ]; then |
| 580 | +if [ ! -d ${MIR_NDK_PATH} ]; then |
| 581 | echo "no partial chroot dir detected. attempting to create one" |
| 582 | _do_update_chroot=1 |
| 583 | fi |
| 584 | |
| 585 | -if [ ! -d ${BUILD_DIR} ]; then |
| 586 | +if [ ! -d ${BUILD_DIR} ]; then |
| 587 | mkdir ${BUILD_DIR} |
| 588 | fi |
| 589 | |
| 590 | @@ -157,7 +157,7 @@ |
| 591 | clean_build_dir ${BUILD_DIR} |
| 592 | fi |
| 593 | |
| 594 | -pushd ${BUILD_DIR} > /dev/null |
| 595 | +pushd ${BUILD_DIR} > /dev/null |
| 596 | |
| 597 | export PKG_CONFIG_PATH="${MIR_NDK_PATH}/usr/lib/pkgconfig:${MIR_NDK_PATH}/usr/lib/${target_machine}/pkgconfig" |
| 598 | export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 |
| 599 | @@ -171,8 +171,8 @@ |
| 600 | cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/LinuxCrossCompile.cmake \ |
| 601 | -DMIR_PLATFORM=${mir_platform} -DMIR_ENABLE_TESTS=${enable_tests}\ |
| 602 | -DMIR_USE_PRECOMPILED_HEADERS=OFF \ |
| 603 | - .. |
| 604 | + .. |
| 605 | |
| 606 | make -j${NUM_JOBS} $@ |
| 607 | |
| 608 | -popd > /dev/null |
| 609 | +popd > /dev/null |
| 610 | |
| 611 | === modified file 'debian/changelog' |
| 612 | --- debian/changelog 2016-08-25 08:16:10 +0000 |
| 613 | +++ debian/changelog 2016-10-27 03:52:22 +0000 |
| 614 | @@ -92,9 +92,9 @@ |
| 615 | . ftbfs in linking libmir-test-assist.a in xenial+overlay and |
| 616 | yakkety+overlay (LP: #1601810) |
| 617 | . [testsfail] failure in NestedInput.on_input_device_state_nested_* |
| 618 | - (LP: #1602646) |
| 619 | + (LP: #1602646) |
| 620 | . mirtest-dev provides an incorrect .pc file (LP: #1603080) |
| 621 | - . mir_test_framework::server_platform_path(), |
| 622 | + . mir_test_framework::server_platform_path(), |
| 623 | mir_test_framework::server_platform() don't support use in a downstream |
| 624 | test built against mir-test-assist (LP: #1603091) |
| 625 | . Servers based on Mir need a hook to execute code when the server is |
| 626 | @@ -105,7 +105,7 @@ |
| 627 | count, fixing dpi to 25.4 (LP: #1596051) |
| 628 | . Mir build and test failures with gcc-6 and LTO (LP: #1610215) |
| 629 | . [regression] Trust prompt not shown when starting camera (LP: #1612256) |
| 630 | - |
| 631 | + |
| 632 | -- Kevin DuBois <kevin.dubois@canonical.com> Mon, 15 Aug 2016 16:29:03 +0000 |
| 633 | |
| 634 | mir (0.23.5+16.10.20160729-0ubuntu2) yakkety; urgency=medium |
| 635 | @@ -170,7 +170,7 @@ |
| 636 | . No ABI changes in any libraries. Bugfix release only. |
| 637 | - Bugs fixed: |
| 638 | . Turn off NBS as workaround to LP: #1590765 |
| 639 | - |
| 640 | + |
| 641 | [ Daniel van Vugt, Kevin DuBois ] |
| 642 | * Mir 0.23.1 bugfix release. Fix flickering issue seen with onscreen |
| 643 | keyboard (LP: 1590765) |
| 644 | @@ -192,7 +192,7 @@ |
| 645 | . mirinputplatform ABI unchanged at 5 |
| 646 | - Enhancements: |
| 647 | . Enable internal usage of more flexible graphics buffer submission, |
| 648 | - precursing client API additions. |
| 649 | + precursing client API additions. |
| 650 | - Bug fixes: |
| 651 | . Potential NBS performance loss after resize (LP: #1579076) |
| 652 | . Performance loss with NBS and overlays on (LP: #1578159) |
| 653 | @@ -207,7 +207,7 @@ |
| 654 | . Virtual display output configuration is set to LVDS (LP: #1573782) |
| 655 | . Mir-on-X11 doesn't pass Alt+primary button drag to Mir (LP: #1575765) |
| 656 | . Mir-on-X11 breaks mir_proving_server resize logic (LP: #1575192) |
| 657 | - . Resizing can crash mir_demo_server (LP: #1575211) |
| 658 | + . Resizing can crash mir_demo_server (LP: #1575211) |
| 659 | . [regression] Cursor stops at phantom edge on M10 and N7 (LP: #1580774) |
| 660 | . [regression] MIR_CLIENT_PERF_REPORT is showing bogus render times and |
| 661 | buffer lag (LP: #1581368) |
| 662 | @@ -259,31 +259,31 @@ |
| 663 | upgrade to ld-2.23 (LP: #1560415) |
| 664 | . [regression] failure in CI on ThreadedDispatcherSignalTest.keeps_ |
| 665 | dispatching_after_signal_interruption under Valgrind (LP: #1499229) |
| 666 | - . [regression] Cursor mostly does not move at all in response to slow |
| 667 | + . [regression] Cursor mostly does not move at all in response to slow |
| 668 | mouse movement, but then sometimes jumps (LP: #1528109) |
| 669 | . Sometimes devices don't suspend - display turns back on immediately |
| 670 | (LP: #1549701) |
| 671 | . CI failure in NestedServer.display_orientation_changes_are_forwarded_to_ |
| 672 | host (LP: #1555074) |
| 673 | - . NBS fullscreen overlay benchmark performance is much lower than |
| 674 | + . NBS fullscreen overlay benchmark performance is much lower than |
| 675 | BufferQueue (LP: #1557962) |
| 676 | . server crashes when shutting down in smoke tests (LP: #1560900) |
| 677 | . [regression] [OTA-10] Spread animation stutters badly with only a few |
| 678 | apps opened (LP: #1563287) |
| 679 | . nested mir_demo_server crashes on startup (LP: #1570362) |
| 680 | - . mir_acceptance_tests & mir_unit_tests dump core files (even when |
| 681 | + . mir_acceptance_tests & mir_unit_tests dump core files (even when |
| 682 | everything passes) (LP: #1342092) |
| 683 | . [regression] Tests fail with: std::exception::what: Failed to read from |
| 684 | device: /dev/random after: 30 seconds (LP: #1541188) |
| 685 | . [testsfail] ClientLatency.throttled_input_rate_yields_lower_latency |
| 686 | (LP: #1554572) |
| 687 | - . NBS causes sudden loss of performance after un-fullscreening a swap |
| 688 | + . NBS causes sudden loss of performance after un-fullscreening a swap |
| 689 | interval zero client (LP: #1557442) |
| 690 | . surface creation with non-default buffer streams is ignored by server |
| 691 | (LP: #1563278) |
| 692 | . [regression] mir_integration_tests take significantly longer (27x |
| 693 | longer) when running with ctest (LP: #1568966) |
| 694 | - . CI failure in TestClientInput.receives_one_touch_event_per_frame |
| 695 | + . CI failure in TestClientInput.receives_one_touch_event_per_frame |
| 696 | (LP: #1570698) |
| 697 | . Racy shutdown in mir_demo_client_scroll causes SEGFAULT (LP: #1560943) |
| 698 | . mir_demo_client_target does not quit after SIGTERM/SIGINT (LP: #1562340) |
| 699 | @@ -501,7 +501,7 @@ |
| 700 | - Bugs fixed: |
| 701 | . Lock ordering issues causing deadlocks between input and display |
| 702 | configuration (LP: #1538632, LP: #1543594, LP: #1532607) |
| 703 | - . Workaound for a g++ 4.9 bug where std::uncaught_exception() |
| 704 | + . Workaound for a g++ 4.9 bug where std::uncaught_exception() |
| 705 | unexpectedly returns true |
| 706 | |
| 707 | [ CI Train Bot ] |
| 708 | @@ -618,7 +618,7 @@ |
| 709 | - No ABI changes. Bug fix release only. |
| 710 | - Bug fixed: |
| 711 | . [regression] pinch to zoom not working reliably (LP: #1531517) |
| 712 | - |
| 713 | + |
| 714 | |
| 715 | [ CI Train Bot ] |
| 716 | * No-change rebuild. |
| 717 | @@ -903,7 +903,7 @@ |
| 718 | (LP: #1488500) |
| 719 | . CI test failure in ClientLatency.triple_buffered_client_uses_all_buffers |
| 720 | (LP: #1491876) |
| 721 | - . Intermittent CI failure in |
| 722 | + . Intermittent CI failure in |
| 723 | DisplayConfigurationTest.changing_focus_from_client_with_config_to_client_without_config_configures_display |
| 724 | (LP: #1494663) |
| 725 | . acceptance test ClientLatency.double_buffered_client_uses_all_buffers |
| 726 | @@ -912,10 +912,10 @@ |
| 727 | . make ptest returns 0 when tests fail (LP: #1454250) |
| 728 | . [regression] Mir is holding buffers much longer than it used to |
| 729 | (LP: #1480164) |
| 730 | - . Acceptance test fails under debuild: |
| 731 | + . Acceptance test fails under debuild: |
| 732 | ClientCredsTestFixture.session_authorizer_receives_pid_of_connecting_clients |
| 733 | (LP: #1483097) |
| 734 | - . dpkg-shlibdeps: warning: |
| 735 | + . dpkg-shlibdeps: warning: |
| 736 | debian/mir-platform-graphics-mesa-x4/usr/lib/x86_64-linux-gnu/mir/server-platform/server-mesa-x11.so.4 |
| 737 | contains an unresolvable reference to symbol |
| 738 | _ZN3mir6events10make_eventElNSt6chrono8durationIlSt5ratioILl1ELl1000000000EEEE17MirKeyboardActionjij: |
| 739 | @@ -1004,12 +1004,12 @@ |
| 740 | . Fix focus issues breaking autopilot tests entering text (LP: #1468029) |
| 741 | . Fix mir tests failure on armhf with GCC5 (LP: #1478213) |
| 742 | . mir_buffer_stream_swap_buffers_sync can hang constraints (LP: #1479899) |
| 743 | - . Loading libmirclient.so twice leads to a segfault in libmirprotobuf.so |
| 744 | + . Loading libmirclient.so twice leads to a segfault in libmirprotobuf.so |
| 745 | (LP: #1391976) |
| 746 | . Visible corruption in SDL apps (LP: #1460149) |
| 747 | . MultiThreadedCompositor::destroy_compositing_threads hangs/deadlocks on |
| 748 | shutdown or display reconfiguration (LP: #1471909) |
| 749 | - . ctest/"make test" reports 100% tests pass even when some fail. |
| 750 | + . ctest/"make test" reports 100% tests pass even when some fail. |
| 751 | (LP: #1472911) |
| 752 | . Mir server crashed - GLib-CRITICAL **: g_source_get_context: assertion |
| 753 | 'source->context != NULL || !SOURCE_DESTROYED (source)' failed |
| 754 | @@ -1018,7 +1018,7 @@ |
| 755 | hwc prepare()] (LP: #1474891) |
| 756 | . [regression] Input focus delay after switching app back into focus |
| 757 | (LP: #1480654) |
| 758 | - . GLibMainLoopTest.propagates_exception_from_server_action fails with |
| 759 | + . GLibMainLoopTest.propagates_exception_from_server_action fails with |
| 760 | GCC 5 in armhf (LP: #1482274) |
| 761 | . [enhancement] Mir lacks relative mouse support (LP: #1276322) |
| 762 | . ShmBuffer ignores pixel_format (LP: #1424909) |
| 763 | @@ -1028,7 +1028,7 @@ |
| 764 | (LP: #1439078) |
| 765 | . [regression] The software cursor has a rectangular shadow around it |
| 766 | in mir_proving_server (LP: #1447911) |
| 767 | - . TestClientCursorAPI.cursor_passed_through_nested_server fails |
| 768 | + . TestClientCursorAPI.cursor_passed_through_nested_server fails |
| 769 | intermittently (LP: #1462088) |
| 770 | . [enhancement] Add support for high colour (15/16-bit colour) clients |
| 771 | (LP: #1469673) |
| 772 | @@ -1072,7 +1072,7 @@ |
| 773 | . Mircommon ABI bumped to 5 |
| 774 | . Mirplatform ABI bumped to 8 |
| 775 | - Enhancements: |
| 776 | - . mir_demo_server: tweaks, features and improvements |
| 777 | + . mir_demo_server: tweaks, features and improvements |
| 778 | . More MirEvent-2.0 related changes and unifications |
| 779 | . New SurfaceInputDispatcher to replace the android InputDispatcher |
| 780 | . New Threaded dispatcher for Dispatchable added |
| 781 | @@ -1093,12 +1093,12 @@ |
| 782 | server start-up has finished (LP: #1451844) |
| 783 | . build-dependency on g++-4.9 dropped (LP: #1452320) |
| 784 | - Bug fixes: |
| 785 | - . Crash because uncaught exception in mir::events::add_touch |
| 786 | + . Crash because uncaught exception in mir::events::add_touch |
| 787 | (LP: #1437357) |
| 788 | . [vegetahd] android buffer allocator does consider hwc alignment |
| 789 | constraints (LP: #1461314) |
| 790 | . [regression] Touch input does not work at all any more (LP: #1464174) |
| 791 | - . Mir emits a mir_motion_action_hover_exit event before of a |
| 792 | + . Mir emits a mir_motion_action_hover_exit event before of a |
| 793 | mir_motion_action_pointer_down (LP: #1419048) |
| 794 | . [testsfail] NestedInput.nested_event_filter_receives_keyboard_from_host |
| 795 | failure in CI (LP: #1462033) |
| 796 | @@ -1376,8 +1376,8 @@ |
| 797 | [ Alberto Aguirre ] |
| 798 | * New upstream release 0.12.0 (https://launchpad.net/mir/+milestone/0.12.0) |
| 799 | - Packaging changes: |
| 800 | - . Client platform packages now include the Mir client platform ABI |
| 801 | - number. Thusly, mir-client-platform-(mesa|android) is replaced by |
| 802 | + . Client platform packages now include the Mir client platform ABI |
| 803 | + number. Thusly, mir-client-platform-(mesa|android) is replaced by |
| 804 | mir-client-platform-(mesa|android)2 |
| 805 | . Server graphics platform packages now include the Mir graphics |
| 806 | platform ABI number. Thusly, mir-platform-graphics-(mesa|android) |
| 807 | @@ -1391,7 +1391,7 @@ |
| 808 | . [regression] Platform libraries and packages are not versioned thus |
| 809 | are not installable in parallel (LP: #1423591) |
| 810 | . [regression] Deadlock in TimeoutFrameDroppingPolicy logic (LP: #1421255) |
| 811 | - |
| 812 | + |
| 813 | [ CI Train Bot ] |
| 814 | * New rebuild forced. |
| 815 | |
| 816 | @@ -1492,7 +1492,7 @@ |
| 817 | - ABI summary: Servers need rebuilding, but clients do not; |
| 818 | . Mirclient ABI unchanged at 8 |
| 819 | . Mircommon ABI unchanged at 3 |
| 820 | - . Mirplatform ABI bumped to 5 |
| 821 | + . Mirplatform ABI bumped to 5 |
| 822 | . Mirserver ABI bumped to 28 |
| 823 | - Bug fixes: |
| 824 | . [regression] Mir servers (since 0.9) randomly crash in malloc due to |
| 825 | @@ -1583,7 +1583,7 @@ |
| 826 | - Bug fixes: |
| 827 | . Add a debug interface to translate from surface to screen coordinates |
| 828 | (LP: #1346633) |
| 829 | - . Ensure a buffer requested by a surface is not delivered |
| 830 | + . Ensure a buffer requested by a surface is not delivered |
| 831 | after the surface is deleted (LP: #1376324) |
| 832 | . Overlays are not displayed onscreen in some positions (LP: #1378326) |
| 833 | . Server aborts when an exception is thrown from the main thread |
| 834 | @@ -1597,14 +1597,14 @@ |
| 835 | (LP: #1303817) |
| 836 | . A prompt session with an invalid application pid should be an error |
| 837 | (LP: #1377968) |
| 838 | - . When XDG_RUNTIME_DIR is defined but pointing to a non-existing |
| 839 | + . When XDG_RUNTIME_DIR is defined but pointing to a non-existing |
| 840 | directory use "/tmp" (LP: #1304873) |
| 841 | - . [regression] demo-shell bypass is not used on fullscreen surfaces if |
| 842 | + . [regression] demo-shell bypass is not used on fullscreen surfaces if |
| 843 | there are windowed surfaces behind (LP: #1378706) |
| 844 | . Mir upgrade through dist-upgrade installs incorrect platform |
| 845 | (LP: #1378995) |
| 846 | . Fix Mir progressbar example using internal glibc defines(LP: #239272) |
| 847 | - . Stop the default_lifecycle_event_handler raising SIGHUP while |
| 848 | + . Stop the default_lifecycle_event_handler raising SIGHUP while |
| 849 | disconnecting (LP: #1386185) |
| 850 | . [regression] Mir fails to build with MIR_ENABLE_TESTS=OFF (LP: #1388539) |
| 851 | . [regression] mir_demo_server_basic does not start (LP: #1391923) |
| 852 | @@ -1722,7 +1722,7 @@ |
| 853 | * New upstream release 0.7.3 (https://launchpad.net/mir/+milestone/0.7.3) |
| 854 | - Bug fixes |
| 855 | . Fix constructor syntax errors (LP: #1369389) |
| 856 | - . server: Workaround for unresponsive clients causing the server to hang |
| 857 | + . server: Workaround for unresponsive clients causing the server to hang |
| 858 | (LP: #1350207) |
| 859 | . Relax strict dependencies of graphics drivers on an exact version |
| 860 | of the libmirplatform2 package. It's blocking CI. (LP: #1370866) |
| 861 | @@ -1747,7 +1747,7 @@ |
| 862 | [ Alberto Aguirre ] |
| 863 | * New upstream release 0.7.1 (https://launchpad.net/mir/+milestone/0.7.1) |
| 864 | - Bug fixes |
| 865 | - . Recycle compositor threads by using a thread pool (LP: #1362841) |
| 866 | + . Recycle compositor threads by using a thread pool (LP: #1362841) |
| 867 | |
| 868 | -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Tue, 09 Sep 2014 18:28:01 +0000 |
| 869 | |
| 870 | @@ -1796,7 +1796,7 @@ |
| 871 | drawn (LP: #1348330) |
| 872 | . Client: Fix SIGTERM dispatch in our default lifecycle event handler |
| 873 | (LP: #1353867) |
| 874 | - . DemoRenderer: Don't try to create a texture of width zero. |
| 875 | + . DemoRenderer: Don't try to create a texture of width zero. |
| 876 | (LP: #1358210) |
| 877 | . Fix CI failures (LP: #1358698) |
| 878 | . Fix build failure: "variable ‘rc’ set but not used" which happens in |
| 879 | @@ -1974,7 +1974,7 @@ |
| 880 | - Bugs fixed: |
| 881 | . Nexus 10 leaks during overlay operations (LP: #1331769) |
| 882 | . MultiThreadedCompositor deadlocks (LP: #1335311) |
| 883 | - . Intermittent test failure in ClientSurfaceEvents can client query |
| 884 | + . Intermittent test failure in ClientSurfaceEvents can client query |
| 885 | orientation (LP: #1335741) |
| 886 | . Intermittent test failure in ClientSurfaceEvents/OrientationEvents |
| 887 | (LP: #1335752) |
| 888 | @@ -2115,7 +2115,7 @@ |
| 889 | where id is an opaque compositor ID of your choosing. |
| 890 | . Scene::set_change_callback() replaced by the more generic: |
| 891 | add_observer() and remove_observer() functions. |
| 892 | - . Added default implementation for SceneObserver. |
| 893 | + . Added default implementation for SceneObserver. |
| 894 | . SessionCreator renamed to ConnectionCreator. |
| 895 | . ConnectedSessions renamed to Connections. |
| 896 | . ProtobufSessionCreator renamed to ProtobufConnectionCreator. |
| 897 | @@ -2145,9 +2145,9 @@ |
| 898 | the mouse pointer is on. |
| 899 | . New shell controls documented. |
| 900 | - A new testing category, performance test, was introduced. It currently |
| 901 | - runs glmark2-es2 and compares the result to a minimum threshold. |
| 902 | + runs glmark2-es2 and compares the result to a minimum threshold. |
| 903 | - MIR_VERSION_MINOR is tied to MIRSERVER_ABI in the sense that a change |
| 904 | - in the former now requires dependent projects that a rebuild is |
| 905 | + in the former now requires dependent projects that a rebuild is |
| 906 | necessary. |
| 907 | - SwitchingBundle was replaced by BufferQueue. |
| 908 | - Expand credentials to include uid/gid for session authorizer. |
| 909 | @@ -2173,7 +2173,7 @@ |
| 910 | . [regression] unity8 fails to load libmirplatformgraphics |
| 911 | (undefined symbol: _ZN3mir8graphics9GLProgramD1Ev). (LP: #1317200) |
| 912 | . [regression] unity8 rendering artifacts. (LP: #1317260) |
| 913 | - . [regression] [BufferQueue] |
| 914 | + . [regression] [BufferQueue] |
| 915 | BufferQueueTest.compositor_never_owns_client_buffers occasionally |
| 916 | crashes with: what(): unexpected release: buffer was not given to |
| 917 | compositor. (LP: #1317801) |
| 918 | @@ -2185,16 +2185,16 @@ |
| 919 | and toolkit/apps are laggy/throttled. (LP: #1321886) |
| 920 | . [regression] [BufferQueue] current_buffer_users vector memory usage |
| 921 | grows unbounded. (LP: #1317808) |
| 922 | - . Intermittent test failures in |
| 923 | + . Intermittent test failures in |
| 924 | CustomInputDispatcherFixture.custom_input_dispatcher_receives_input. |
| 925 | (LP: #1318587) |
| 926 | - . [regression] [BufferQueue] Race condition in |
| 927 | + . [regression] [BufferQueue] Race condition in |
| 928 | BufferQueue::compositor_acquire could underflow shared_ptr refcount and |
| 929 | delete prematurely, crash. (LP: #1318632) |
| 930 | - . Overflow in |
| 931 | + . Overflow in |
| 932 | mir::client::rpc::MirSocketRpcChannel::receive_file_descriptors as |
| 933 | reported by address sanitizer. (LP: #1320821) |
| 934 | - . [regression] [input] Scroll events are now always zero: |
| 935 | + . [regression] [input] Scroll events are now always zero: |
| 936 | event.motion.pointer_coordinates[0].vscroll. (LP: #1321077) |
| 937 | . CI failures in CustomInputDispatcherFixture |
| 938 | .custom_input_dispatcher_gets_started_and_stopped. (LP: #1321215) |
| 939 | @@ -2214,7 +2214,7 @@ |
| 940 | client connects to Mir. (LP: #1314574) |
| 941 | . [regression] Clients can't acquire multiple buffers any more. |
| 942 | (LP: #1315302) |
| 943 | - . [regression] Enabling SwitchingBundleTest |
| 944 | + . [regression] Enabling SwitchingBundleTest |
| 945 | DISABLED_synchronous_clients_only_get_two_real_buffers now crashes with |
| 946 | no usable stack trace. It used to only fail. (LP: #1315312) |
| 947 | . [regression] [BufferQueue] double-buffered client freezes as no buffer |
| 948 | @@ -2247,29 +2247,29 @@ |
| 949 | - Bugs fixed: |
| 950 | . Stale socket issue. (LP: #1285215) |
| 951 | . Qt render gets blocked on EGLSwapBuffers. (LP: #1292306) |
| 952 | - . Lock order violated found in helgrind (potential deadlock). |
| 953 | + . Lock order violated found in helgrind (potential deadlock). |
| 954 | (LP: #1296544) |
| 955 | - . [regression] SwitchingBundle in framedropping mode can hang. |
| 956 | + . [regression] SwitchingBundle in framedropping mode can hang. |
| 957 | (LP: #1306464) |
| 958 | . [DPMS] Display backlight turns back on almost immediately after |
| 959 | being turned off. (LP: #1231857) |
| 960 | . Wrong frame is seen on wake up/resume/unlock. (LP: #1233564) |
| 961 | . Nested platform is not testable (LP: #1299101) |
| 962 | - . [regression] mir_demo_server_shell crashes on display resume. |
| 963 | + . [regression] mir_demo_server_shell crashes on display resume. |
| 964 | (LP: #1308941) |
| 965 | . Multi-threaded composition is actually mostly serialized by |
| 966 | SurfaceStack::guard. (LP: #1234018) |
| 967 | - . Mirscreencast slows down compositing and makes it very jerky. |
| 968 | + . Mirscreencast slows down compositing and makes it very jerky. |
| 969 | (LP: #1280938) |
| 970 | . Mirscreencast can cause clients to render faster than the screen |
| 971 | refresh rate. (LP: #1294361) |
| 972 | . Screen turns on when a new session/surface appears. (LP: #1297876) |
| 973 | - . mir-doc package is >56MB in size, expands to >100MB of files. |
| 974 | + . mir-doc package is >56MB in size, expands to >100MB of files. |
| 975 | (LP: #1304998) |
| 976 | . [regression] Clang: 'mir::test::doubles::MockSurface::visible' |
| 977 | - hides overloaded virtual function [-Woverloaded-virtual]. |
| 978 | + hides overloaded virtual function [-Woverloaded-virtual]. |
| 979 | (LP: #1301135) |
| 980 | - . [regression] GLRenderer* unit tests have recently become noisy. |
| 981 | + . [regression] GLRenderer* unit tests have recently become noisy. |
| 982 | (LP: #1308905) |
| 983 | . FocusController::set_focus_to() no longer seems to raise a session |
| 984 | to the top. (LP: #1302689) |
| 985 | @@ -2443,7 +2443,7 @@ |
| 986 | - tools: Add new libmirclientplatform.so to install_on_android.sh. |
| 987 | - Add "mir_demo_standalone_render_overlays", which is a free-standing |
| 988 | example of overlay support. |
| 989 | - - Proper DisplayConfiguration for the AndroidDisplay to be better |
| 990 | + - Proper DisplayConfiguration for the AndroidDisplay to be better |
| 991 | prepared for multi-monitor Android. |
| 992 | - Commenced/continued simplifying the surface class hierarchy: BasicSurface |
| 993 | has now absorbed SurfaceData. |
| 994 | @@ -2457,10 +2457,10 @@ |
| 995 | . examples: correct "fullscreen-surfaces" option. (LP: #1284554) |
| 996 | . Fix mutex data race reported by helgrind in integration test: |
| 997 | SwapperSwappingStress (LP: #1282886) |
| 998 | - . scene: Return null snapshots for sessions without surfaces |
| 999 | + . scene: Return null snapshots for sessions without surfaces |
| 1000 | (LP: #1281728) |
| 1001 | . tests: Address some raciness in |
| 1002 | - MesaDisplayTest.drm_device_change_event_triggers_handler. |
| 1003 | + MesaDisplayTest.drm_device_change_event_triggers_handler. |
| 1004 | (LP: #1283085) |
| 1005 | . tests: Suppress spurious memory errors occuring when running the |
| 1006 | unit tests on armhf with valgrind. (LP: #1279438) |
| 1007 | @@ -2471,8 +2471,8 @@ |
| 1008 | . Set field "current_format" when sending a display config to the |
| 1009 | server. (LP: #1277343) |
| 1010 | . Fix crash in android devices by working around a subtle threading |
| 1011 | - bug, use a dummy thead_local array to push the gl/egl context TLS |
| 1012 | - into a region where the future wait code does not overwrite it. |
| 1013 | + bug, use a dummy thead_local array to push the gl/egl context TLS |
| 1014 | + into a region where the future wait code does not overwrite it. |
| 1015 | (LP: #1280086) |
| 1016 | . compositor: calling SwitchingBundle::force_requests_to_complete() |
| 1017 | can be a no-op when there are no requests. (LP: #1281145) |
| 1018 | @@ -2586,7 +2586,7 @@ |
| 1019 | - compositor: ignore double requests to start or stop the |
| 1020 | MultiThreadedCompositor. |
| 1021 | - Add DisplayBuffer::orientation(), to tell the Renderer if we need it |
| 1022 | - to do screen rotation in GL (for platforms which don't implement |
| 1023 | + to do screen rotation in GL (for platforms which don't implement |
| 1024 | rotation natively) Fixes: https://bugs.launchpad.net/bugs/1203215. |
| 1025 | - graphics: add an post_update function that takes a list of renderables |
| 1026 | to the display buffer. This will let the display buffer take advantage |
| 1027 | @@ -2629,7 +2629,7 @@ |
| 1028 | background (LP: #1256702) |
| 1029 | . Compiling without tests fails (-DMIR_ENABLE_TESTS=NO) (LP: #1263724) |
| 1030 | . examples, doc: Make it clear and consistent how to use |
| 1031 | - a non-root client with a root compositor endpoint. |
| 1032 | + a non-root client with a root compositor endpoint. |
| 1033 | (LP: #1272143) |
| 1034 | . Avoid linking to umockdev on platforms (android) which don't yet |
| 1035 | use it. This allows mir_unit_tests to run on touch images again |
| 1036 | @@ -2655,7 +2655,7 @@ |
| 1037 | set. Otherwise SwitchingBundle::compositor_acquire could follow a bogus |
| 1038 | code path. (LP:#1270964) |
| 1039 | . tests: Override configuration to avoid creating an (unused) |
| 1040 | - filesystem endpoint for connections when using InProcessServer. |
| 1041 | + filesystem endpoint for connections when using InProcessServer. |
| 1042 | (LP: #1271604) |
| 1043 | . frontend: ensure that BasicConnector threads don't exit |
| 1044 | immediately. (LP: #1271655) |
| 1045 | @@ -2809,7 +2809,7 @@ |
| 1046 | MIR_SERVER_NAME=. |
| 1047 | - graphics,gbm: Inform the EGL platform about the used gbm device when |
| 1048 | using the native GBM platform |
| 1049 | - - examples: Restore GL state after initializing buffers, fixing crashes |
| 1050 | + - examples: Restore GL state after initializing buffers, fixing crashes |
| 1051 | observed in render_surfaces (LP: #1234563) |
| 1052 | - Continue refactoring the mir android display classes. |
| 1053 | - shell: Hoist focus control functions needed by unity-mir into |
| 1054 | |
| 1055 | === modified file 'doc/android_new_device_bringup.md' |
| 1056 | --- doc/android_new_device_bringup.md 2016-07-18 07:38:38 +0000 |
| 1057 | +++ doc/android_new_device_bringup.md 2016-10-27 03:52:22 +0000 |
| 1058 | @@ -10,7 +10,7 @@ |
| 1059 | Mir has a test suite available in the package mir-test-tools that checks the |
| 1060 | operation of Mir. |
| 1061 | Mir also provides a test suite in mir-android-diagnostics that is helpful in |
| 1062 | -checking how a new device will work with Mir. |
| 1063 | +checking how a new device will work with Mir. |
| 1064 | |
| 1065 | ##Mir and libhybris## |
| 1066 | Vendor provided drivers are compiled against Android's bionic libc. |
| 1067 | @@ -21,7 +21,7 @@ |
| 1068 | tests to see if mir will run on the device. The tests are aimed checking |
| 1069 | the operation of hybris on non-Mir graphics stacks. Furthermore, they test a |
| 1070 | more limited range of hardware module capabilities (e.g. they don't test HWC |
| 1071 | -overlay capability) |
| 1072 | +overlay capability) |
| 1073 | |
| 1074 | ###Mir Client Software Rendering### |
| 1075 | |
| 1076 | @@ -45,7 +45,7 @@ |
| 1077 | This test checks that the display can post content to the screen. It should |
| 1078 | flash the screen briefly and run without error. Since it is important that |
| 1079 | screen looks flawless, a visual inspection should also be perfomed using |
| 1080 | -mir_demo_standalone_render_to_fb and mir_demo_standalone_render_overlays |
| 1081 | +mir_demo_standalone_render_to_fb and mir_demo_standalone_render_overlays |
| 1082 | |
| 1083 | ###Mir GPU buffer allocations (gralloc tests)### |
| 1084 | |
| 1085 | @@ -113,22 +113,22 @@ |
| 1086 | Mir has some android specific options for watching HWC interactions. This |
| 1087 | option is available with mir_demo_standalone_* and mir_demo_server_* |
| 1088 | |
| 1089 | -If you run |
| 1090 | +If you run |
| 1091 | |
| 1092 | mir_proving_server --hwc-report log |
| 1093 | |
| 1094 | You will get output similar to this: |
| 1095 | |
| 1096 | before prepare(): |
| 1097 | - # | pos {l,t,r,b} | crop {l,t,r,b} | transform | blending | |
| 1098 | - 0 | { 0, 0, 512, 512} | { 0, 0, 512, 512} | NONE | NONE | |
| 1099 | - 1 | { 80, 80, 592, 592} | { 0, 0, 512, 512} | NONE | NONE | |
| 1100 | - 2 | { 0, 0, 768,1280} | { 0, 0, 768,1280} | NONE | NONE | |
| 1101 | + # | pos {l,t,r,b} | crop {l,t,r,b} | transform | blending | |
| 1102 | + 0 | { 0, 0, 512, 512} | { 0, 0, 512, 512} | NONE | NONE | |
| 1103 | + 1 | { 80, 80, 592, 592} | { 0, 0, 512, 512} | NONE | NONE | |
| 1104 | + 2 | { 0, 0, 768,1280} | { 0, 0, 768,1280} | NONE | NONE | |
| 1105 | after prepare(): |
| 1106 | - # | Type | |
| 1107 | - 0 | OVERLAY | |
| 1108 | - 1 | OVERLAY | |
| 1109 | - 2 | FB_TARGET | |
| 1110 | + # | Type | |
| 1111 | + 0 | OVERLAY | |
| 1112 | + 1 | OVERLAY | |
| 1113 | + 2 | FB_TARGET | |
| 1114 | set list(): |
| 1115 | # | handle |
| 1116 | 0 | 0x2183540 |
| 1117 | @@ -142,8 +142,8 @@ |
| 1118 | vsync signal and the blanking are also logged. |
| 1119 | |
| 1120 | The "--hwc-report log" option should work with all android-based mir servers |
| 1121 | -and demo standalone programs. If its more convenient, setting |
| 1122 | -MIR_SERVER_HWC_REPORT=log to the environment of the running server will give |
| 1123 | +and demo standalone programs. If its more convenient, setting |
| 1124 | +MIR_SERVER_HWC_REPORT=log to the environment of the running server will give |
| 1125 | the hwc report on stdout. |
| 1126 | |
| 1127 | ###Android platform quirks### |
| 1128 | @@ -164,7 +164,7 @@ |
| 1129 | |
| 1130 | This means that Mir does not support the version of hwc on the device. |
| 1131 | As of Feb 2016, Mir supports the legacy FB module, as well as HWC versions |
| 1132 | -1.0, 1.1, 1.2, 1.3, and 1.4. |
| 1133 | +1.0, 1.1, 1.2, 1.3, and 1.4. |
| 1134 | |
| 1135 | If you run |
| 1136 | |
| 1137 | |
| 1138 | === modified file 'doc/android_technical_details.md' |
| 1139 | --- doc/android_technical_details.md 2015-02-22 07:46:25 +0000 |
| 1140 | +++ doc/android_technical_details.md 2016-10-27 03:52:22 +0000 |
| 1141 | @@ -35,6 +35,6 @@ |
| 1142 | later. The deprecated FB HAL module from android's libhardware should also work. |
| 1143 | If you are attempting to get mir to work on a new device, check out |
| 1144 | \subpage android_new_device_bringup "this page" for suggestions on |
| 1145 | -troubleshooting. You can also |
| 1146 | +troubleshooting. You can also |
| 1147 | <a href="https://bugs.launchpad.net/mir">file a bug,</a> being very specific |
| 1148 | -about the chipset, GPU, and driver versions that your phone has. |
| 1149 | +about the chipset, GPU, and driver versions that your phone has. |
| 1150 | |
| 1151 | === modified file 'doc/building_source_for_arm.md' |
| 1152 | --- doc/building_source_for_arm.md 2016-09-08 02:58:56 +0000 |
| 1153 | +++ doc/building_source_for_arm.md 2016-10-27 03:52:22 +0000 |
| 1154 | @@ -7,7 +7,7 @@ |
| 1155 | Building on the ARM device |
| 1156 | -------------------------- |
| 1157 | |
| 1158 | -If you have an ARM device you should be able to compile and install directly |
| 1159 | +If you have an ARM device you should be able to compile and install directly |
| 1160 | on the device. Although this will usually be significantly slower than using a |
| 1161 | desktop. On the armhf or arm64 target device just follow these steps: |
| 1162 | |
| 1163 | @@ -63,7 +63,7 @@ |
| 1164 | |
| 1165 | * <a href="https://wiki.debian.org/sbuild"> https://wiki.debian.org/sbuild</a> |
| 1166 | * <a href="https://wiki.ubuntu.com/SimpleSbuild"> |
| 1167 | -https://wiki.ubuntu.com/SimpleSbuild</a> |
| 1168 | +https://wiki.ubuntu.com/SimpleSbuild</a> |
| 1169 | |
| 1170 | If you do not wish to run the Mir test suite during package generation, set |
| 1171 | DEB_BUILD_OPTIONS=nocheck to your environment |
| 1172 | @@ -76,20 +76,20 @@ |
| 1173 | |
| 1174 | $ cd mir_source_dir |
| 1175 | $ debuild -S -uc -us |
| 1176 | - $ cd .. |
| 1177 | + $ cd .. |
| 1178 | $ sbuild -d vivid --arch armhf mir_<version_string>.dsc |
| 1179 | |
| 1180 | Cross-compile sbuild package generation |
| 1181 | --------------------------------------- |
| 1182 | |
| 1183 | -This uses a cross-compile toolchain to compile the package, and generally |
| 1184 | +This uses a cross-compile toolchain to compile the package, and generally |
| 1185 | should be faster than the emulated sbuild package generation. |
| 1186 | |
| 1187 | -Substitute \<version_string> for the .dsc file name generated by the debuild |
| 1188 | +Substitute \<version_string> for the .dsc file name generated by the debuild |
| 1189 | command. |
| 1190 | |
| 1191 | $ cd mir_source_dir |
| 1192 | $ debuild -S -uc -us |
| 1193 | - $ cd .. |
| 1194 | + $ cd .. |
| 1195 | $ sbuild -d vivid --host armhf --build amd64 mir_\<version_string>.dsc |
| 1196 | |
| 1197 | |
| 1198 | === modified file 'doc/building_source_for_pc.md' |
| 1199 | --- doc/building_source_for_pc.md 2016-01-29 08:18:22 +0000 |
| 1200 | +++ doc/building_source_for_pc.md 2016-10-27 03:52:22 +0000 |
| 1201 | @@ -57,15 +57,15 @@ |
| 1202 | $ bin/mir_demo_server --launch_client bin/mir_demo_client_multiwin |
| 1203 | |
| 1204 | Other examples described elsewhere in this documentation assume you're using the |
| 1205 | -installed version and simply need "bin/" adding to specify the local build. |
| 1206 | +installed version and simply need "bin/" adding to specify the local build. |
| 1207 | |
| 1208 | |
| 1209 | Install Mir |
| 1210 | ----------- |
| 1211 | |
| 1212 | -*It should not be necessary to install Mir for experimental purposes (see |
| 1213 | +*It should not be necessary to install Mir for experimental purposes (see |
| 1214 | "Running Mir" above).* Further, if you are using an Ubuntu derived disto then |
| 1215 | -there's likely to be existing Mir binaries elsewhere that may interact badly |
| 1216 | +there's likely to be existing Mir binaries elsewhere that may interact badly |
| 1217 | with a second install. |
| 1218 | |
| 1219 | To install Mir just use the normal make install command: |
| 1220 | @@ -78,7 +78,7 @@ |
| 1221 | NB You may need "sudo ldconfig" to refresh the cache before the installed |
| 1222 | programs work. |
| 1223 | |
| 1224 | -If you install to a non-standard location, keep in mind that you will probably |
| 1225 | +If you install to a non-standard location, keep in mind that you will probably |
| 1226 | need to properly set the PKG_CONFIG_PATH environment variable to allow other |
| 1227 | applications to build against Mir, and LD_LIBRARY_PATH to allow applications to |
| 1228 | find the Mir libraries at runtime. |
| 1229 | |
| 1230 | === modified file 'doc/demo_server_controls.md' |
| 1231 | --- doc/demo_server_controls.md 2016-01-29 08:18:22 +0000 |
| 1232 | +++ doc/demo_server_controls.md 2016-10-27 03:52:22 +0000 |
| 1233 | @@ -39,7 +39,7 @@ |
| 1234 | |
| 1235 | For those writing client code request to set the surface attribute |
| 1236 | `mir_surface_attrib_state` are honoured: |
| 1237 | - - `mir_surface_state_restored`: restores the window |
| 1238 | + - `mir_surface_state_restored`: restores the window |
| 1239 | - `mir_surface_state_maximized`: maximizes size |
| 1240 | - `mir_surface_state_vertmaximized`: maximizes height |
| 1241 | - `mir_surface_state_horizmaximized`: maximizes width |
| 1242 | |
| 1243 | === modified file 'doc/dso_versioning_guide.md' |
| 1244 | --- doc/dso_versioning_guide.md 2016-07-18 07:38:38 +0000 |
| 1245 | +++ doc/dso_versioning_guide.md 2016-10-27 03:52:22 +0000 |
| 1246 | @@ -185,7 +185,7 @@ |
| 1247 | versions. For the moment, we can not bother trying to make this work. |
| 1248 | |
| 1249 | |
| 1250 | -See also: |
| 1251 | +See also: |
| 1252 | --------- |
| 1253 | [Binutils manual](https://sourceware.org/binutils/docs/ld/VERSION.html) |
| 1254 | |
| 1255 | |
| 1256 | === modified file 'doc/extra.css' |
| 1257 | --- doc/extra.css 2013-07-02 13:38:43 +0000 |
| 1258 | +++ doc/extra.css 2016-10-27 03:52:22 +0000 |
| 1259 | @@ -8,7 +8,7 @@ |
| 1260 | margin: 0px; |
| 1261 | padding: 2px 0px; |
| 1262 | } |
| 1263 | - |
| 1264 | + |
| 1265 | #projectbrief |
| 1266 | { |
| 1267 | font: 120% Ubuntu,Arial,sans-serif; |
| 1268 | |
| 1269 | === modified file 'doc/installing_prebuilt_on_android.md' |
| 1270 | --- doc/installing_prebuilt_on_android.md 2015-04-28 07:54:10 +0000 |
| 1271 | +++ doc/installing_prebuilt_on_android.md 2016-10-27 03:52:22 +0000 |
| 1272 | @@ -4,7 +4,7 @@ |
| 1273 | Supported Devices |
| 1274 | ----------------- |
| 1275 | |
| 1276 | -Mir has been used on an array of devices powered by the factory-provided |
| 1277 | +Mir has been used on an array of devices powered by the factory-provided |
| 1278 | android drivers. Mir currently supports the fb module and the hwc module |
| 1279 | up to version 1.3. If you encounter a problem with your device, please |
| 1280 | file a bug and we'll see if we can help. |
| 1281 | @@ -12,7 +12,7 @@ |
| 1282 | Installing Mir |
| 1283 | -------------- |
| 1284 | |
| 1285 | -Mir should be installed and used by default on Ubuntu Touch images. Mir is |
| 1286 | +Mir should be installed and used by default on Ubuntu Touch images. Mir is |
| 1287 | available in the Ubuntu archive. Ensure that the android platform drivers, |
| 1288 | available in the mir-graphics-drivers-android metapackage, are installed for |
| 1289 | an android-based device. |
| 1290 | |
| 1291 | === modified file 'doc/mainpage.md' |
| 1292 | --- doc/mainpage.md 2016-10-12 06:03:15 +0000 |
| 1293 | +++ doc/mainpage.md 2016-10-27 03:52:22 +0000 |
| 1294 | @@ -56,7 +56,7 @@ |
| 1295 | lp:~mir-team/mir/development-branch |
| 1296 | |
| 1297 | Approximately fortnightly, this development branch is promoted to the branch |
| 1298 | -used for the ubuntu archive and touch images. Please submit any merge proposals |
| 1299 | +used for the ubuntu archive and touch images. Please submit any merge proposals |
| 1300 | against the development branch. |
| 1301 | |
| 1302 | Please file bug reports at: https://bugs.launchpad.net/mir |
| 1303 | @@ -82,23 +82,23 @@ |
| 1304 | Mir server is written as a library which allows the server code to be adapted |
| 1305 | for bespoke applications. |
| 1306 | |
| 1307 | - - \subpage server_example.cpp |
| 1308 | + - \subpage server_example.cpp |
| 1309 | "server_example.cpp: a test executable hosting the following" |
| 1310 | - - \subpage server_example_input_event_filter.cpp |
| 1311 | + - \subpage server_example_input_event_filter.cpp |
| 1312 | "server_example_input_event_filter.cpp: provide a Quit command" |
| 1313 | - - \subpage server_example_display_configuration_policy.cpp |
| 1314 | + - \subpage server_example_display_configuration_policy.cpp |
| 1315 | "server_example_display_configuration_policy.cpp: configuring display layout" |
| 1316 | - - \subpage server_example_input_filter.cpp |
| 1317 | + - \subpage server_example_input_filter.cpp |
| 1318 | "server_example_input_filter.cpp: print input events to stdout" |
| 1319 | - - \subpage server_example_log_options.cpp |
| 1320 | + - \subpage server_example_log_options.cpp |
| 1321 | "server_example_log_options.cpp: replace Mir logger with glog" |
| 1322 | - - \subpage server_example_basic_window_manager.h |
| 1323 | + - \subpage server_example_basic_window_manager.h |
| 1324 | "server_example_basic_window_manager.h: How to wire up a window manager" |
| 1325 | - - \subpage server_example_window_management.cpp |
| 1326 | + - \subpage server_example_window_management.cpp |
| 1327 | "server_example_window_management.cpp: simple window management examples" |
| 1328 | - - \subpage server_example_canonical_window_manager.cpp |
| 1329 | + - \subpage server_example_canonical_window_manager.cpp |
| 1330 | "server_example_canonical_window_manager.cpp: canonical window management policy" |
| 1331 | - - \subpage server_example_custom_compositor.cpp |
| 1332 | + - \subpage server_example_custom_compositor.cpp |
| 1333 | "server_example_custom_compositor.cpp: demonstrate writing an alternative GL rendering code" |
| 1334 | |
| 1335 | Working on Mir code |
| 1336 | @@ -106,7 +106,7 @@ |
| 1337 | |
| 1338 | - \ref md_README "Mir Read me" |
| 1339 | - \ref md_HACKING "Mir hacking guide" |
| 1340 | - - \subpage android_new_device_bringup "New android device bringup" |
| 1341 | + - \subpage android_new_device_bringup "New android device bringup" |
| 1342 | - \ref component_reports |
| 1343 | - \ref dso_versioning_guide |
| 1344 | - \ref abi_compatibility_tools |
| 1345 | |
| 1346 | === modified file 'doc/setup_kvm_for_mir.md' |
| 1347 | --- doc/setup_kvm_for_mir.md 2015-06-17 05:20:42 +0000 |
| 1348 | +++ doc/setup_kvm_for_mir.md 2016-10-27 03:52:22 +0000 |
| 1349 | @@ -18,7 +18,7 @@ |
| 1350 | More details on setting up KVM can be found in the |
| 1351 | [wiki](https://help.ubuntu.com/community/KVM/Installation). |
| 1352 | |
| 1353 | -Now create a new virtual machine with virt-manager and a current Linux boot iso |
| 1354 | +Now create a new virtual machine with virt-manager and a current Linux boot iso |
| 1355 | image or reconfigure an existing installation. |
| 1356 | |
| 1357 | Configure the virtual machine |
| 1358 | @@ -29,7 +29,7 @@ |
| 1359 | configuration entries: Video and Display. |
| 1360 | |
| 1361 | * Open the Display settings and select SPICE instead of KVM |
| 1362 | -* Open the Video settings and select QXL as model. |
| 1363 | +* Open the Video settings and select QXL as model. |
| 1364 | |
| 1365 | Now boot the machine and build a new kernel and verify that you have the right |
| 1366 | Mesa package. |
| 1367 | @@ -41,7 +41,7 @@ |
| 1368 | Since the DRM QXL driver only provides KMS, GEM and dma-buf support, and no 3D |
| 1369 | GPU emulation or forwarding, Mesa will load the kms-swrast driver. This driver |
| 1370 | is available since Mesa 10.3.0. The necessary support for dmabuf fds and crtc |
| 1371 | -handling in QXL is available since Linux 3.18. |
| 1372 | +handling in QXL is available since Linux 3.18. |
| 1373 | |
| 1374 | With that we have enough support for EGL and GLESv2 to run Mir. |
| 1375 | |
| 1376 | |
| 1377 | === modified file 'doc/setup_vmware_for_mir.md' |
| 1378 | --- doc/setup_vmware_for_mir.md 2016-09-08 02:58:56 +0000 |
| 1379 | +++ doc/setup_vmware_for_mir.md 2016-10-27 03:52:22 +0000 |
| 1380 | @@ -33,9 +33,9 @@ |
| 1381 | |
| 1382 | 9. Try out a Mir demo server: |
| 1383 | 1. Change to VT2 and run |
| 1384 | - |
| 1385 | + |
| 1386 | `$ sudo mir_demo_server --launch-client mir_demo_client_egltriangle` |
| 1387 | - |
| 1388 | + |
| 1389 | 2. You should see a window with a triangle spinning fast |
| 1390 | 3. Use Alt + click + drag to move the window around |
| 1391 | 4. Use Ctrl+Alt+BkSp to stop the server |
| 1392 | |
| 1393 | === modified file 'doc/using_mir_on_android.md' |
| 1394 | --- doc/using_mir_on_android.md 2016-01-29 08:18:22 +0000 |
| 1395 | +++ doc/using_mir_on_android.md 2016-10-27 03:52:22 +0000 |
| 1396 | @@ -5,7 +5,7 @@ |
| 1397 | you're already using Mir. |
| 1398 | |
| 1399 | If you would like to run a pre-release version of Mir on your device, you'll |
| 1400 | -need to recompile our downstream dependencies (unity-system-compositor and |
| 1401 | +need to recompile our downstream dependencies (unity-system-compositor and |
| 1402 | qtmir) to ensure ABI compatibility with the pre-release version of Mir. |
| 1403 | |
| 1404 | Using some demo applications |
| 1405 | |
| 1406 | === modified file 'doc/using_mir_on_pc.md' |
| 1407 | --- doc/using_mir_on_pc.md 2016-01-29 08:18:22 +0000 |
| 1408 | +++ doc/using_mir_on_pc.md 2016-10-27 03:52:22 +0000 |
| 1409 | @@ -43,15 +43,15 @@ |
| 1410 | To run Mir as an X client start it from an X terminal: |
| 1411 | |
| 1412 | $ mir_demo_server --launch-client mir_demo_client_multiwin |
| 1413 | - |
| 1414 | + |
| 1415 | You can start additional Mir clients, for example (in a new terminal): |
| 1416 | |
| 1417 | $ mir_demo_egltriangle |
| 1418 | - |
| 1419 | + |
| 1420 | To exit from Mir: |
| 1421 | - |
| 1422 | + |
| 1423 | <Ctrl+Alt+BkSp> |
| 1424 | - |
| 1425 | + |
| 1426 | Note: up to Mir 0.18 it is also necessary to specify `--platform-input-lib` when |
| 1427 | starting the server: |
| 1428 | - for Mir-0.17 add: `--platform-input-lib server-mesa-x11.so.6` |
| 1429 | @@ -62,20 +62,20 @@ |
| 1430 | To run Mir natively on a PC/desktop/laptop: |
| 1431 | |
| 1432 | $ sudo DISPLAY= mir_demo_server --vt 1 --arw-file |
| 1433 | - |
| 1434 | -This will switch you to a Mir session on VT1. Switch back to your X-based |
| 1435 | + |
| 1436 | +This will switch you to a Mir session on VT1. Switch back to your X-based |
| 1437 | desktop: |
| 1438 | |
| 1439 | <Ctrl+Alt+F7> |
| 1440 | - |
| 1441 | + |
| 1442 | In a new terminal: |
| 1443 | |
| 1444 | $ mir_demo_client_multiwin -m /tmp/mir_socket |
| 1445 | - |
| 1446 | + |
| 1447 | Switch back to Mir. |
| 1448 | |
| 1449 | <Ctrl+Alt+F1> |
| 1450 | - |
| 1451 | + |
| 1452 | Watch your friends be amazed! |
| 1453 | |
| 1454 | To exit from Mir: |
| 1455 | |
| 1456 | === modified file 'examples/animated_cursor_demo_client.c' |
| 1457 | --- examples/animated_cursor_demo_client.c 2016-10-21 07:53:23 +0000 |
| 1458 | +++ examples/animated_cursor_demo_client.c 2016-10-27 03:52:22 +0000 |
| 1459 | @@ -39,7 +39,7 @@ |
| 1460 | |
| 1461 | MirGraphicsRegion region; |
| 1462 | mir_buffer_stream_get_graphics_region(stream, ®ion); |
| 1463 | - |
| 1464 | + |
| 1465 | for (int y = 0; y < region.height; ++y) |
| 1466 | { |
| 1467 | for (int x = 0; x < region.width; ++x) |
| 1468 | @@ -62,7 +62,7 @@ |
| 1469 | uint32_t* pixel = (uint32_t*)(origin + x*bpp + y*region.stride); |
| 1470 | *pixel = foreground; |
| 1471 | } |
| 1472 | - |
| 1473 | + |
| 1474 | mir_buffer_stream_swap_buffers_sync(stream); |
| 1475 | } |
| 1476 | |
| 1477 | @@ -76,7 +76,7 @@ |
| 1478 | MirCursorConfiguration* conf = mir_cursor_configuration_from_buffer_stream(stream, 0, 0); |
| 1479 | mir_wait_for(mir_surface_configure_cursor(surface, conf)); |
| 1480 | mir_cursor_configuration_destroy(conf); |
| 1481 | - |
| 1482 | + |
| 1483 | return stream; |
| 1484 | } |
| 1485 | |
| 1486 | |
| 1487 | === modified file 'examples/client_helpers.cpp' |
| 1488 | --- examples/client_helpers.cpp 2016-01-29 08:18:22 +0000 |
| 1489 | +++ examples/client_helpers.cpp 2016-10-27 03:52:22 +0000 |
| 1490 | @@ -131,7 +131,7 @@ |
| 1491 | mir_connection_get_available_surface_formats(connection, pixel_formats, mir_pixel_formats, &valid_formats); |
| 1492 | if (valid_formats == 0) |
| 1493 | throw std::runtime_error("no pixel formats for surface"); |
| 1494 | - selected_format = pixel_formats[0]; |
| 1495 | + selected_format = pixel_formats[0]; |
| 1496 | //select an 8 bit opaque format if we can |
| 1497 | if (!prefers_alpha) |
| 1498 | { |
| 1499 | @@ -145,7 +145,7 @@ |
| 1500 | } |
| 1501 | } |
| 1502 | } |
| 1503 | - |
| 1504 | + |
| 1505 | auto deleter = [](MirSurfaceSpec *spec) { mir_surface_spec_release(spec); }; |
| 1506 | std::unique_ptr<MirSurfaceSpec, decltype(deleter)> spec{ |
| 1507 | mir_connection_create_spec_for_normal_surface(connection, width, height, selected_format), |
| 1508 | |
| 1509 | === modified file 'examples/client_helpers.h' |
| 1510 | --- examples/client_helpers.h 2016-07-18 07:38:38 +0000 |
| 1511 | +++ examples/client_helpers.h 2016-10-27 03:52:22 +0000 |
| 1512 | @@ -26,7 +26,7 @@ |
| 1513 | |
| 1514 | namespace mir |
| 1515 | { |
| 1516 | -namespace examples |
| 1517 | +namespace examples |
| 1518 | { |
| 1519 | class Connection |
| 1520 | { |
| 1521 | |
| 1522 | === modified file 'examples/client_touch_validator.cpp' |
| 1523 | --- examples/client_touch_validator.cpp 2016-10-21 07:53:23 +0000 |
| 1524 | +++ examples/client_touch_validator.cpp 2016-10-27 03:52:22 +0000 |
| 1525 | @@ -79,7 +79,7 @@ |
| 1526 | must_be_present.erase(it); |
| 1527 | } |
| 1528 | // Here we validate condition 4 |
| 1529 | - else if (mir_touch_event_action(event, i) == mir_touch_action_down) |
| 1530 | + else if (mir_touch_event_action(event, i) == mir_touch_action_down) |
| 1531 | { |
| 1532 | if (found_a_up_down) |
| 1533 | printf("Found too many downs in one event\n"); |
| 1534 | @@ -99,16 +99,16 @@ |
| 1535 | printf("We received a touch which did not contain all required IDs\n"); |
| 1536 | return false; |
| 1537 | } |
| 1538 | - |
| 1539 | + |
| 1540 | return true; |
| 1541 | } |
| 1542 | - |
| 1543 | + |
| 1544 | class TouchState |
| 1545 | { |
| 1546 | public: |
| 1547 | TouchState() : last_event(nullptr) {} |
| 1548 | ~TouchState() { if (last_event) mir_event_unref(last_event); } |
| 1549 | - |
| 1550 | + |
| 1551 | void record_event(MirTouchEvent const* event) |
| 1552 | { |
| 1553 | if (!last_event) |
| 1554 | @@ -118,7 +118,7 @@ |
| 1555 | } |
| 1556 | if (!validate_events(reinterpret_cast<MirTouchEvent const*>(last_event), event)) |
| 1557 | abort(); |
| 1558 | - |
| 1559 | + |
| 1560 | mir_event_unref(last_event); |
| 1561 | last_event = mir_event_ref(reinterpret_cast<MirEvent const*>(event)); |
| 1562 | } |
| 1563 | @@ -133,7 +133,7 @@ |
| 1564 | auto tev = mir_input_event_get_touch_event(event); |
| 1565 | state->record_event(tev); |
| 1566 | } |
| 1567 | - |
| 1568 | + |
| 1569 | void on_event(MirSurface * /*surface*/, const MirEvent *event, void *context) |
| 1570 | { |
| 1571 | TouchState *state = (TouchState*)context; |
| 1572 | |
| 1573 | === modified file 'examples/cursors_demo_client.c' |
| 1574 | --- examples/cursors_demo_client.c 2016-10-21 07:53:23 +0000 |
| 1575 | +++ examples/cursors_demo_client.c 2016-10-27 03:52:22 +0000 |
| 1576 | @@ -46,11 +46,11 @@ |
| 1577 | |
| 1578 | size_t num_cursors = sizeof(cursors)/sizeof(*cursors); |
| 1579 | size_t real_index = cursor_index % num_cursors; |
| 1580 | - |
| 1581 | + |
| 1582 | MirCursorConfiguration *conf = mir_cursor_configuration_from_name(cursors[real_index]); |
| 1583 | |
| 1584 | mir_wait_for(mir_surface_configure_cursor(surface, conf)); |
| 1585 | - |
| 1586 | + |
| 1587 | mir_cursor_configuration_destroy(conf); |
| 1588 | } |
| 1589 | |
| 1590 | |
| 1591 | === modified file 'examples/demo_client_display_config.c' |
| 1592 | --- examples/demo_client_display_config.c 2016-10-21 07:53:23 +0000 |
| 1593 | +++ examples/demo_client_display_config.c 2016-10-27 03:52:22 +0000 |
| 1594 | @@ -333,13 +333,13 @@ |
| 1595 | { |
| 1596 | (void) surface; |
| 1597 | struct ClientContext *ctx = (struct ClientContext*) context; |
| 1598 | - |
| 1599 | + |
| 1600 | if (mir_event_get_type(event) != mir_event_type_input) |
| 1601 | return; |
| 1602 | MirInputEvent const* input_event = mir_event_get_input_event(event); |
| 1603 | if (mir_input_event_get_type(input_event) != mir_input_event_type_key) |
| 1604 | return; |
| 1605 | - |
| 1606 | + |
| 1607 | handle_keyboard_event(ctx, mir_input_event_get_keyboard_event(input_event)); |
| 1608 | } |
| 1609 | |
| 1610 | |
| 1611 | === modified file 'examples/eglapp.c' |
| 1612 | --- examples/eglapp.c 2016-10-21 07:53:23 +0000 |
| 1613 | +++ examples/eglapp.c 2016-10-27 03:52:22 +0000 |
| 1614 | @@ -105,7 +105,7 @@ |
| 1615 | return; |
| 1616 | if (mir_keyboard_event_key_code(kev) != XKB_KEY_q) |
| 1617 | return; |
| 1618 | - |
| 1619 | + |
| 1620 | running = 0; |
| 1621 | } |
| 1622 | |
| 1623 | @@ -147,7 +147,7 @@ |
| 1624 | { |
| 1625 | (void) surface; |
| 1626 | (void) unused; |
| 1627 | - |
| 1628 | + |
| 1629 | switch (mir_event_get_type(ev)) |
| 1630 | { |
| 1631 | case mir_event_type_input: |
| 1632 | @@ -478,14 +478,14 @@ |
| 1633 | CHECK(mir_surface_is_valid(surface), "Can't create a surface"); |
| 1634 | |
| 1635 | mir_surface_set_event_handler(surface, mir_eglapp_handle_event, NULL); |
| 1636 | - |
| 1637 | + |
| 1638 | MirCursorConfiguration *conf = mir_cursor_configuration_from_name(cursor_name); |
| 1639 | mir_surface_configure_cursor(surface, conf); |
| 1640 | mir_cursor_configuration_destroy(conf); |
| 1641 | |
| 1642 | eglsurface = eglCreateWindowSurface(egldisplay, eglconfig, |
| 1643 | (EGLNativeWindowType)mir_buffer_stream_get_egl_native_window(mir_surface_get_buffer_stream(surface)), NULL); |
| 1644 | - |
| 1645 | + |
| 1646 | CHECK(eglsurface != EGL_NO_SURFACE, "eglCreateWindowSurface failed"); |
| 1647 | |
| 1648 | eglctx = eglCreateContext(egldisplay, eglconfig, EGL_NO_CONTEXT, |
| 1649 | |
| 1650 | === modified file 'examples/eglsquare.cpp' |
| 1651 | --- examples/eglsquare.cpp 2015-05-29 12:53:18 +0000 |
| 1652 | +++ examples/eglsquare.cpp 2016-10-27 03:52:22 +0000 |
| 1653 | @@ -51,14 +51,14 @@ |
| 1654 | glClear(GL_COLOR_BUFFER_BIT); |
| 1655 | auto scaleUniform = glGetUniformLocation(program.program, "scale"); |
| 1656 | glUniform2fv(scaleUniform, 1, scale); |
| 1657 | - |
| 1658 | + |
| 1659 | context.swapbuffers(); |
| 1660 | context.release_current(); |
| 1661 | } |
| 1662 | |
| 1663 | void draw(float x, float y) |
| 1664 | { |
| 1665 | - float pos[2] = {x, y}; |
| 1666 | + float pos[2] = {x, y}; |
| 1667 | glUseProgram(program.program); |
| 1668 | glClear( GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT ); |
| 1669 | glUniform2fv(posUniform, 1, pos); |
| 1670 | @@ -68,7 +68,7 @@ |
| 1671 | } |
| 1672 | |
| 1673 | RenderProgram(RenderProgram const&) = delete; |
| 1674 | - RenderProgram& operator=(RenderProgram const&) = delete; |
| 1675 | + RenderProgram& operator=(RenderProgram const&) = delete; |
| 1676 | private: |
| 1677 | GLchar const*const frag_shader_src = |
| 1678 | { |
| 1679 | @@ -97,7 +97,7 @@ |
| 1680 | 1.0f, 1.0f, 0.0f, 1.0f, |
| 1681 | }; |
| 1682 | GLuint vPositionAttr; |
| 1683 | - GLuint posUniform; |
| 1684 | + GLuint posUniform; |
| 1685 | }; |
| 1686 | |
| 1687 | class SquareRenderingSurface |
| 1688 | |
| 1689 | === modified file 'examples/fingerpaint.c' |
| 1690 | --- examples/fingerpaint.c 2016-01-29 08:18:22 +0000 |
| 1691 | +++ examples/fingerpaint.c 2016-10-27 03:52:22 +0000 |
| 1692 | @@ -94,7 +94,7 @@ |
| 1693 | case mir_pixel_format_abgr_8888: |
| 1694 | case mir_pixel_format_xbgr_8888: |
| 1695 | alpha_shift = 24; |
| 1696 | - pixel = |
| 1697 | + pixel = |
| 1698 | (uint32_t)color->a << 24 | |
| 1699 | (uint32_t)color->b << 16 | |
| 1700 | (uint32_t)color->g << 8 | |
| 1701 | @@ -103,7 +103,7 @@ |
| 1702 | case mir_pixel_format_argb_8888: |
| 1703 | case mir_pixel_format_xrgb_8888: |
| 1704 | alpha_shift = 24; |
| 1705 | - pixel = |
| 1706 | + pixel = |
| 1707 | (uint32_t)color->a << 24 | |
| 1708 | (uint32_t)color->r << 16 | |
| 1709 | (uint32_t)color->g << 8 | |
| 1710 | @@ -157,7 +157,7 @@ |
| 1711 | char *row = region->vaddr + |
| 1712 | (y * region->stride) + |
| 1713 | (x * BYTES_PER_PIXEL(region->pixel_format)); |
| 1714 | - |
| 1715 | + |
| 1716 | for (j = 0; j < size; j++) |
| 1717 | { |
| 1718 | put_pixels(row, size, region->pixel_format, color); |
| 1719 | @@ -204,7 +204,7 @@ |
| 1720 | {0x00, 0xff, 0x00, 0xff}, |
| 1721 | {0x00, 0x00, 0xff, 0xff}, |
| 1722 | }; |
| 1723 | - |
| 1724 | + |
| 1725 | MirEventType event_type = mir_event_get_type(event); |
| 1726 | |
| 1727 | pthread_mutex_lock(&mutex); |
| 1728 | @@ -297,7 +297,7 @@ |
| 1729 | |
| 1730 | draw_box(canvas, x - radius, y - radius, 2*radius, &tone); |
| 1731 | } |
| 1732 | - |
| 1733 | + |
| 1734 | changed = true; |
| 1735 | } |
| 1736 | } |
| 1737 | @@ -476,7 +476,7 @@ |
| 1738 | { |
| 1739 | mir_surface_set_swapinterval(surf, swap_interval); |
| 1740 | mir_surface_set_event_handler(surf, &on_event, &canvas); |
| 1741 | - |
| 1742 | + |
| 1743 | canvas.width = width; |
| 1744 | canvas.height = height; |
| 1745 | canvas.stride = canvas.width * BYTES_PER_PIXEL(pixel_format); |
| 1746 | @@ -488,9 +488,9 @@ |
| 1747 | signal(SIGINT, shutdown); |
| 1748 | signal(SIGTERM, shutdown); |
| 1749 | signal(SIGHUP, shutdown); |
| 1750 | - |
| 1751 | + |
| 1752 | clear_region(&canvas, &background); |
| 1753 | - |
| 1754 | + |
| 1755 | MirBufferStream *bs = mir_surface_get_buffer_stream(surf); |
| 1756 | |
| 1757 | while (running) |
| 1758 | |
| 1759 | === modified file 'examples/input_shapes.cpp' |
| 1760 | --- examples/input_shapes.cpp 2015-06-29 22:01:30 +0000 |
| 1761 | +++ examples/input_shapes.cpp 2016-10-27 03:52:22 +0000 |
| 1762 | @@ -51,14 +51,14 @@ |
| 1763 | glClear(GL_COLOR_BUFFER_BIT); |
| 1764 | auto scaleUniform = glGetUniformLocation(program.program, "scale"); |
| 1765 | glUniform2fv(scaleUniform, 1, scale); |
| 1766 | - |
| 1767 | + |
| 1768 | context.swapbuffers(); |
| 1769 | context.release_current(); |
| 1770 | } |
| 1771 | |
| 1772 | void draw(float x, float y) |
| 1773 | { |
| 1774 | - float pos[2] = {x, y}; |
| 1775 | + float pos[2] = {x, y}; |
| 1776 | glUseProgram(program.program); |
| 1777 | glClear( GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT ); |
| 1778 | glUniform2fv(posUniform, 1, pos); |
| 1779 | @@ -68,7 +68,7 @@ |
| 1780 | } |
| 1781 | |
| 1782 | RenderProgram(RenderProgram const&) = delete; |
| 1783 | - RenderProgram& operator=(RenderProgram const&) = delete; |
| 1784 | + RenderProgram& operator=(RenderProgram const&) = delete; |
| 1785 | private: |
| 1786 | GLchar const*const frag_shader_src = |
| 1787 | { |
| 1788 | @@ -97,7 +97,7 @@ |
| 1789 | 1.0f, 1.0f, 0.0f, 1.0f, |
| 1790 | }; |
| 1791 | GLuint vPositionAttr; |
| 1792 | - GLuint posUniform; |
| 1793 | + GLuint posUniform; |
| 1794 | }; |
| 1795 | |
| 1796 | class SurfaceWithAHole |
| 1797 | |
| 1798 | === modified file 'examples/multiwin.c' |
| 1799 | --- examples/multiwin.c 2015-07-16 07:03:19 +0000 |
| 1800 | +++ examples/multiwin.c 2016-10-27 03:52:22 +0000 |
| 1801 | @@ -61,28 +61,28 @@ |
| 1802 | switch (format) |
| 1803 | { |
| 1804 | case mir_pixel_format_abgr_8888: |
| 1805 | - pixel = |
| 1806 | + pixel = |
| 1807 | (uint32_t)color->a << 24 | |
| 1808 | (uint32_t)color->b << 16 | |
| 1809 | (uint32_t)color->g << 8 | |
| 1810 | (uint32_t)color->r; |
| 1811 | break; |
| 1812 | case mir_pixel_format_xbgr_8888: |
| 1813 | - pixel = |
| 1814 | + pixel = |
| 1815 | /* Not filling in the X byte is correct but buggy (LP: #1423462) */ |
| 1816 | (uint32_t)color->b << 16 | |
| 1817 | (uint32_t)color->g << 8 | |
| 1818 | (uint32_t)color->r; |
| 1819 | break; |
| 1820 | case mir_pixel_format_argb_8888: |
| 1821 | - pixel = |
| 1822 | + pixel = |
| 1823 | (uint32_t)color->a << 24 | |
| 1824 | (uint32_t)color->r << 16 | |
| 1825 | (uint32_t)color->g << 8 | |
| 1826 | (uint32_t)color->b; |
| 1827 | break; |
| 1828 | case mir_pixel_format_xrgb_8888: |
| 1829 | - pixel = |
| 1830 | + pixel = |
| 1831 | /* Not filling in the X byte is correct but buggy (LP: #1423462) */ |
| 1832 | (uint32_t)color->r << 16 | |
| 1833 | (uint32_t)color->g << 8 | |
| 1834 | |
| 1835 | === modified file 'examples/progressbar.c' |
| 1836 | --- examples/progressbar.c 2015-06-17 05:20:42 +0000 |
| 1837 | +++ examples/progressbar.c 2016-10-27 03:52:22 +0000 |
| 1838 | @@ -91,7 +91,7 @@ |
| 1839 | case mir_pixel_format_abgr_8888: |
| 1840 | case mir_pixel_format_xbgr_8888: |
| 1841 | alpha_shift = 24; |
| 1842 | - pixel = |
| 1843 | + pixel = |
| 1844 | (uint32_t)color->a << 24 | |
| 1845 | (uint32_t)color->b << 16 | |
| 1846 | (uint32_t)color->g << 8 | |
| 1847 | @@ -100,7 +100,7 @@ |
| 1848 | case mir_pixel_format_argb_8888: |
| 1849 | case mir_pixel_format_xrgb_8888: |
| 1850 | alpha_shift = 24; |
| 1851 | - pixel = |
| 1852 | + pixel = |
| 1853 | (uint32_t)color->a << 24 | |
| 1854 | (uint32_t)color->r << 16 | |
| 1855 | (uint32_t)color->g << 8 | |
| 1856 | @@ -154,7 +154,7 @@ |
| 1857 | char *row = region->vaddr + |
| 1858 | (y * region->stride) + |
| 1859 | (x * BYTES_PER_PIXEL(region->pixel_format)); |
| 1860 | - |
| 1861 | + |
| 1862 | for (j = 0; j < size; j++) |
| 1863 | { |
| 1864 | put_pixels(row, size, region->pixel_format, color); |
| 1865 | @@ -286,7 +286,7 @@ |
| 1866 | signal(SIGINT, shutdown); |
| 1867 | signal(SIGTERM, shutdown); |
| 1868 | signal(SIGHUP, shutdown); |
| 1869 | - |
| 1870 | + |
| 1871 | while (running) |
| 1872 | { |
| 1873 | static const int box_width = 8; |
| 1874 | |
| 1875 | === modified file 'examples/server_example_adorning_compositor.cpp' |
| 1876 | --- examples/server_example_adorning_compositor.cpp 2016-10-12 06:03:15 +0000 |
| 1877 | +++ examples/server_example_adorning_compositor.cpp 2016-10-27 03:52:22 +0000 |
| 1878 | @@ -202,7 +202,7 @@ |
| 1879 | for(auto& element : scene_sequence) |
| 1880 | { |
| 1881 | //courteously inform the client that its rendered |
| 1882 | - //if something is not to be rendered, mc::SceneElementSequence::occluded() should be called |
| 1883 | + //if something is not to be rendered, mc::SceneElementSequence::occluded() should be called |
| 1884 | element->rendered(); |
| 1885 | |
| 1886 | auto const renderable = element->renderable(); |
| 1887 | |
| 1888 | === modified file 'examples/server_example_adorning_compositor.h' |
| 1889 | --- examples/server_example_adorning_compositor.h 2016-01-29 08:18:22 +0000 |
| 1890 | +++ examples/server_example_adorning_compositor.h 2016-10-27 03:52:22 +0000 |
| 1891 | @@ -80,7 +80,7 @@ |
| 1892 | GLuint uvCoord; |
| 1893 | GLuint scaleUniform; |
| 1894 | GLuint posUniform; |
| 1895 | - GLuint alphaUniform; |
| 1896 | + GLuint alphaUniform; |
| 1897 | GLuint texture; |
| 1898 | |
| 1899 | std::shared_ptr<compositor::CompositorReport> const report; |
| 1900 | |
| 1901 | === modified file 'examples/server_example_canonical_window_manager.cpp' |
| 1902 | --- examples/server_example_canonical_window_manager.cpp 2016-10-12 06:03:15 +0000 |
| 1903 | +++ examples/server_example_canonical_window_manager.cpp 2016-10-27 03:52:22 +0000 |
| 1904 | @@ -400,7 +400,7 @@ |
| 1905 | if (modifications.input_shape.is_set()) |
| 1906 | { |
| 1907 | auto rectangles = modifications.input_shape.value(); |
| 1908 | - auto displacement = surface->top_left() - Point{0, 0}; |
| 1909 | + auto displacement = surface->top_left() - Point{0, 0}; |
| 1910 | for(auto& rect : rectangles) |
| 1911 | { |
| 1912 | rect.top_left = rect.top_left + displacement; |
| 1913 | |
| 1914 | === modified file 'examples/server_example_window_management_info.cpp' |
| 1915 | --- examples/server_example_window_management_info.cpp 2016-08-19 07:49:12 +0000 |
| 1916 | +++ examples/server_example_window_management_info.cpp 2016-10-27 03:52:22 +0000 |
| 1917 | @@ -250,8 +250,8 @@ |
| 1918 | std::shared_ptr<frontend::BufferStream> const buffer_stream; |
| 1919 | std::shared_ptr<scene::Session> const session; |
| 1920 | mg::BufferProperties properties; |
| 1921 | - mg::BufferID front_buffer; |
| 1922 | - mg::BufferID back_buffer; |
| 1923 | + mg::BufferID front_buffer; |
| 1924 | + mg::BufferID back_buffer; |
| 1925 | }; |
| 1926 | |
| 1927 | void mir::examples::SurfaceInfo::init_titlebar( |
| 1928 | |
| 1929 | === modified file 'examples/xcursor.c' |
| 1930 | --- examples/xcursor.c 2016-01-29 08:18:22 +0000 |
| 1931 | +++ examples/xcursor.c 2016-10-27 03:52:22 +0000 |
| 1932 | @@ -798,7 +798,7 @@ |
| 1933 | const char *path; |
| 1934 | char *inherits = NULL; |
| 1935 | const char *i; |
| 1936 | - |
| 1937 | + |
| 1938 | if (!theme || !name) |
| 1939 | return NULL; |
| 1940 | |
| 1941 | |
| 1942 | === modified file 'examples/xcursor_loader.cpp' |
| 1943 | --- examples/xcursor_loader.cpp 2016-07-18 07:38:38 +0000 |
| 1944 | +++ examples/xcursor_loader.cpp 2016-10-27 03:52:22 +0000 |
| 1945 | @@ -162,12 +162,12 @@ |
| 1946 | // Each XcursorImages represents images for the different sizes of a given symbolic cursor. |
| 1947 | void me::XCursorLoader::load_appropriately_sized_image(_XcursorImages *images) |
| 1948 | { |
| 1949 | - // We would rather take this lock in load_cursor_theme but the Xcursor lib style |
| 1950 | + // We would rather take this lock in load_cursor_theme but the Xcursor lib style |
| 1951 | // makes it difficult to use our standard 'pass the lg around to _locked members' pattern |
| 1952 | std::lock_guard<std::mutex> lg(guard); |
| 1953 | |
| 1954 | // We have to save all the images as XCursor expects us to free them. |
| 1955 | - // This contains the actual image data though, so we need to ensure they stay alive |
| 1956 | + // This contains the actual image data though, so we need to ensure they stay alive |
| 1957 | // with the lifetime of the mg::CursorImage instance which refers to them. |
| 1958 | auto saved_xcursor_library_resource = std::shared_ptr<_XcursorImages>(images, [](_XcursorImages *images) |
| 1959 | { |
| 1960 | @@ -194,7 +194,7 @@ |
| 1961 | { |
| 1962 | // Cursors are named by their square dimension...called the nominal size in XCursor terminology, so we just look up by width. |
| 1963 | // Later we verify the actual size. |
| 1964 | - xcursor_load_theme(theme_name.c_str(), mi::default_cursor_size.width.as_uint32_t(), |
| 1965 | + xcursor_load_theme(theme_name.c_str(), mi::default_cursor_size.width.as_uint32_t(), |
| 1966 | [](XcursorImages* images, void *this_ptr) -> void |
| 1967 | { |
| 1968 | // Can't use lambda capture as this lambda is thunked to a C function ptr |
| 1969 | @@ -212,7 +212,7 @@ |
| 1970 | if (size != mi::default_cursor_size) |
| 1971 | BOOST_THROW_EXCEPTION( |
| 1972 | std::logic_error("Only the default cursor size is currently supported (mi::default_cursor_size)")); |
| 1973 | - |
| 1974 | + |
| 1975 | std::lock_guard<std::mutex> lg(guard); |
| 1976 | |
| 1977 | auto it = loaded_images.find(xcursor_name); |
| 1978 | @@ -223,6 +223,6 @@ |
| 1979 | it = loaded_images.find("arrow"); |
| 1980 | if (it != loaded_images.end()) |
| 1981 | return it->second; |
| 1982 | - |
| 1983 | + |
| 1984 | return nullptr; |
| 1985 | } |
| 1986 | |
| 1987 | === modified file 'guides/cppguide.xml' |
| 1988 | --- guides/cppguide.xml 2015-06-17 05:20:42 +0000 |
| 1989 | +++ guides/cppguide.xml 2016-10-27 03:52:22 +0000 |
| 1990 | @@ -310,7 +310,7 @@ |
| 1991 | function, output from the function, or both. Input parameters |
| 1992 | are usually values or <code>const</code> references, while output |
| 1993 | and input/output parameters will be non-<code>const</code> |
| 1994 | - references or pointers to non-<code>const</code>. When ordering function |
| 1995 | + references or pointers to non-<code>const</code>. When ordering function |
| 1996 | parameters, put all output parameters before any input-only parameters. |
| 1997 | In particular, do not add new parameters to the end of the function just |
| 1998 | because they are new; place new output parameters before the input-only |
| 1999 | @@ -331,8 +331,8 @@ |
| 2000 | dependencies: your |
| 2001 | project's public |
| 2002 | <code>.h</code>, your |
| 2003 | - project's private |
| 2004 | - <code>.h</code>, other libraries' <code>.h</code>, .C library, C++ library, |
| 2005 | + project's private |
| 2006 | + <code>.h</code>, other libraries' <code>.h</code>, .C library, C++ library, |
| 2007 | </SUMMARY> |
| 2008 | <BODY> |
| 2009 | <p> |
| 2010 | @@ -359,11 +359,11 @@ |
| 2011 | <li> <code><var>dir2/foo2</var>.h</code> (preferred location |
| 2012 | — see details below).</li> |
| 2013 | <li> |
| 2014 | - Your project's public |
| 2015 | + Your project's public |
| 2016 | <code>.h</code> files. |
| 2017 | </li> |
| 2018 | <li> |
| 2019 | - Your project's private |
| 2020 | + Your project's private |
| 2021 | <code>.h</code> files. |
| 2022 | </li> |
| 2023 | <li> Other libraries' <code>.h</code> files.</li> |
| 2024 | @@ -784,7 +784,7 @@ |
| 2025 | |
| 2026 | <STYLEPOINT title="Constructors"> |
| 2027 | <SUMMARY> |
| 2028 | - The purpose of a constructor is to initialise a class so that its |
| 2029 | + The purpose of a constructor is to initialise a class so that its |
| 2030 | invariants hold. For value classes it is worth having a cheap default |
| 2031 | constructor. |
| 2032 | </SUMMARY> |
| 2033 | @@ -815,7 +815,7 @@ |
| 2034 | </ul> |
| 2035 | </CONS> |
| 2036 | <DECISION> |
| 2037 | - Constructors should not make virtual calls to functions, access |
| 2038 | + Constructors should not make virtual calls to functions, access |
| 2039 | potentially uninitialized global variables, etc. |
| 2040 | </DECISION> |
| 2041 | </BODY> |
| 2042 | @@ -962,7 +962,7 @@ |
| 2043 | If your class does not need a copy constructor or assignment |
| 2044 | operator, you must explicitly disable them. |
| 2045 | </p> |
| 2046 | - |
| 2047 | + |
| 2048 | </DECISION> |
| 2049 | </BODY> |
| 2050 | </STYLEPOINT> |
| 2051 | @@ -1182,9 +1182,9 @@ |
| 2052 | </CONS> |
| 2053 | <DECISION> |
| 2054 | <p> |
| 2055 | - In general, do overload operators where appropriate. |
| 2056 | + In general, do overload operators where appropriate. |
| 2057 | </p> |
| 2058 | - |
| 2059 | + |
| 2060 | <p> |
| 2061 | See also <a HREF="#Copy_Constructors">Copy Constructors</a> |
| 2062 | and <a HREF="#Function_Overloading">Function |
| 2063 | @@ -1206,7 +1206,7 @@ |
| 2064 | called <code>foo</code> and the accessor function |
| 2065 | <code>get_foo()</code>. You may also want a mutator function |
| 2066 | <code>set_foo()</code>. |
| 2067 | - Exception: <code>static const</code> data members need not |
| 2068 | + Exception: <code>static const</code> data members need not |
| 2069 | be <code>private</code>. |
| 2070 | </SUMMARY> |
| 2071 | <BODY> |
| 2072 | @@ -1813,7 +1813,7 @@ |
| 2073 | <code>int64_t</code>. |
| 2074 | |
| 2075 | </p> |
| 2076 | - |
| 2077 | + |
| 2078 | </DECISION> |
| 2079 | </BODY> |
| 2080 | </STYLEPOINT> |
| 2081 | @@ -2397,7 +2397,7 @@ |
| 2082 | |
| 2083 | <STYLEPOINT title="Enumerator Names"> |
| 2084 | <SUMMARY> |
| 2085 | - Enumerators should be named like |
| 2086 | + Enumerators should be named like |
| 2087 | <A HREF="#Class_Data_Members">member variables</A>: <code>out_of_memory</code>, enclosed within an enum class. |
| 2088 | </SUMMARY> |
| 2089 | <BODY> |
| 2090 | @@ -2965,7 +2965,7 @@ |
| 2091 | several code windows side-by-side, and thus don't have room to |
| 2092 | widen their windows in any case. People set up their work |
| 2093 | environment assuming a particular maximum window width, and 80 |
| 2094 | - columns has been the traditional standard. Why change it? |
| 2095 | + columns has been the traditional standard. Why change it? |
| 2096 | </PROS> |
| 2097 | <CONS> |
| 2098 | Proponents of change argue that a wider line can make code |
| 2099 | @@ -2978,7 +2978,7 @@ |
| 2100 | <DECISION> |
| 2101 | <p> |
| 2102 | 120 characters is the maximum. |
| 2103 | - </p> |
| 2104 | + </p> |
| 2105 | </DECISION> |
| 2106 | </BODY> |
| 2107 | </STYLEPOINT> |
| 2108 | @@ -3091,11 +3091,11 @@ |
| 2109 | </li> |
| 2110 | <li> All parameters should be in a single line if possible, otherwise: |
| 2111 | <ul> |
| 2112 | - <li> Wrap groups of parameters into the next line, and align the |
| 2113 | - first wrapped parameter to the first parameter in the previous |
| 2114 | + <li> Wrap groups of parameters into the next line, and align the |
| 2115 | + first wrapped parameter to the first parameter in the previous |
| 2116 | line. |
| 2117 | </li> |
| 2118 | - <li> Place each parameter in a separate line and indent each with 4 |
| 2119 | + <li> Place each parameter in a separate line and indent each with 4 |
| 2120 | spaces. |
| 2121 | </li> |
| 2122 | </ul> |
| 2123 | @@ -3480,7 +3480,7 @@ |
| 2124 | char s[12]{}; //all 12 chars are initialized to '\0' |
| 2125 | string s{}; //same as: string s; |
| 2126 | string name{"Some Name"}; |
| 2127 | - char* p=new char [5]{}; // all five chars are initialized to '\0' |
| 2128 | + char* p=new char [5]{}; // all five chars are initialized to '\0' |
| 2129 | </CODE_SNIPPET> |
| 2130 | </BODY> |
| 2131 | </STYLEPOINT> |
| 2132 | @@ -3498,7 +3498,7 @@ |
| 2133 | </p> |
| 2134 | <CODE_SNIPPET> |
| 2135 | // Good - directives at beginning of line |
| 2136 | - if (lopsided_score) |
| 2137 | + if (lopsided_score) |
| 2138 | { |
| 2139 | #if DISASTER_PENDING // Correct -- Starts at beginning of line |
| 2140 | drop_everything(); |
| 2141 | @@ -3511,7 +3511,7 @@ |
| 2142 | </CODE_SNIPPET> |
| 2143 | <BAD_CODE_SNIPPET> |
| 2144 | // Bad - indented directives |
| 2145 | - if (lopsided_score) |
| 2146 | + if (lopsided_score) |
| 2147 | { |
| 2148 | #if DISASTER_PENDING // Wrong! The "#if" should be at beginning of line |
| 2149 | drop_everything(); |
| 2150 | @@ -3551,7 +3551,7 @@ |
| 2151 | MyClass(MyClass const&) = delete; |
| 2152 | MyClass& operator=(MyClass const&) = delete; |
| 2153 | bool some_internal_function(); |
| 2154 | - |
| 2155 | + |
| 2156 | int some_var_; |
| 2157 | int some_other_var; |
| 2158 | }; |
| 2159 | |
| 2160 | === modified file 'guides/styleguide.xsl' |
| 2161 | --- guides/styleguide.xsl 2016-01-29 08:18:22 +0000 |
| 2162 | +++ guides/styleguide.xsl 2016-10-27 03:52:22 +0000 |
| 2163 | @@ -517,8 +517,8 @@ |
| 2164 | </xsl:template> |
| 2165 | |
| 2166 | <!-- Given text, determine the starting position of code. |
| 2167 | - This similar to num_leading_spaces_one_line but treats "Yes:" and "No:" |
| 2168 | - as spaces. Also, if there is no code on the first line, it searches |
| 2169 | + This similar to num_leading_spaces_one_line but treats "Yes:" and "No:" |
| 2170 | + as spaces. Also, if there is no code on the first line, it searches |
| 2171 | subsequent lines until a non-empty line is found. |
| 2172 | Used to find the start of code in snippets like: |
| 2173 | Yes: if(foo): |
| 2174 | @@ -549,7 +549,7 @@ |
| 2175 | <xsl:with-param name="current_count" select="$current_count + 3"/> |
| 2176 | </xsl:call-template> |
| 2177 | </xsl:when> |
| 2178 | - <!-- This is only reached if the first line is entirely whitespace or |
| 2179 | + <!-- This is only reached if the first line is entirely whitespace or |
| 2180 | contains nothing but "Yes:" or "No:"--> |
| 2181 | <xsl:when test="starts-with($text, '
')"> |
| 2182 | <xsl:call-template name="code_start_index"> |
| 2183 | @@ -682,7 +682,7 @@ |
| 2184 | 5) Print line[a:c] (Note that we ignore line[0:a]) |
| 2185 | 6) Print line[b:c] in an external span (in order to double the block |
| 2186 | indent in external code). |
| 2187 | - 7) Print line[c:<end>] with function names processed to produce both |
| 2188 | + 7) Print line[c:<end>] with function names processed to produce both |
| 2189 | internal and external names. |
| 2190 | 8) If there are more lines, recurse. |
| 2191 | --> |
| 2192 | @@ -786,7 +786,7 @@ |
| 2193 | <xsl:with-param name="b" select="$b"/> |
| 2194 | <xsl:with-param name="previous_indent" select="$b"/> |
| 2195 | <xsl:with-param name="previous_ends_with_colon" select="0"/> |
| 2196 | - <xsl:with-param name="is_first_line" select="1"/> |
| 2197 | + <xsl:with-param name="is_first_line" select="1"/> |
| 2198 | </xsl:call-template> |
| 2199 | </xsl:template> |
| 2200 | |
| 2201 | @@ -861,7 +861,7 @@ |
| 2202 | <!-- Given a single word of text convert it from CamelCase to |
| 2203 | lower_with_under. |
| 2204 | This means replacing each uppercase character with _ followed by the |
| 2205 | - lowercase version except for the first character which is replaced |
| 2206 | + lowercase version except for the first character which is replaced |
| 2207 | without adding the _.--> |
| 2208 | <xsl:template name="convert_camel_case_to_lowercase_with_under"> |
| 2209 | <xsl:param name="text"/> |
| 2210 | |
| 2211 | === modified file 'include/client/mir/events/event_builders.h' |
| 2212 | --- include/client/mir/events/event_builders.h 2016-10-13 17:14:36 +0000 |
| 2213 | +++ include/client/mir/events/event_builders.h 2016-10-27 03:52:22 +0000 |
| 2214 | @@ -37,7 +37,7 @@ |
| 2215 | namespace mir |
| 2216 | { |
| 2217 | typedef std::unique_ptr<MirEvent, void(*)(MirEvent*)> EventUPtr; |
| 2218 | - |
| 2219 | + |
| 2220 | namespace events |
| 2221 | { |
| 2222 | // Surface orientation change event |
| 2223 | |
| 2224 | === modified file 'include/client/mir_toolkit/events/event.h' |
| 2225 | --- include/client/mir_toolkit/events/event.h 2016-10-12 06:03:15 +0000 |
| 2226 | +++ include/client/mir_toolkit/events/event.h 2016-10-27 03:52:22 +0000 |
| 2227 | @@ -100,7 +100,7 @@ |
| 2228 | MirEventType mir_event_get_type(MirEvent const* event); |
| 2229 | |
| 2230 | /** |
| 2231 | - * Retrieve the MirInputEvent associated with a MirEvent of |
| 2232 | + * Retrieve the MirInputEvent associated with a MirEvent of |
| 2233 | * type mir_event_type_input. See <mir_toolkit/events/input/input_event.h> |
| 2234 | * for accessors. |
| 2235 | * |
| 2236 | @@ -232,7 +232,7 @@ |
| 2237 | * \ (oo)\_______ |
| 2238 | * (__)\ )\/\ |
| 2239 | * ||----w | |
| 2240 | - * || || |
| 2241 | + * || || |
| 2242 | * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |
| 2243 | * NOTICE: mir_event_ref and mir_event_unref are implemented in terms of copy |
| 2244 | * until such time that direct MirEvent access is deprecated. This means you |
| 2245 | |
| 2246 | === modified file 'include/client/mir_toolkit/events/input/input_event.h' |
| 2247 | --- include/client/mir_toolkit/events/input/input_event.h 2016-10-12 06:03:15 +0000 |
| 2248 | +++ include/client/mir_toolkit/events/input/input_event.h 2016-10-27 03:52:22 +0000 |
| 2249 | @@ -112,7 +112,7 @@ |
| 2250 | * Retrieve the MirKeyboardEvent associated with a given input event. |
| 2251 | * |
| 2252 | * \param[in] event The input event |
| 2253 | - * \return The MirKeyboardEvent or NULL if event type is not |
| 2254 | + * \return The MirKeyboardEvent or NULL if event type is not |
| 2255 | * mir_input_event_type_key |
| 2256 | */ |
| 2257 | MirKeyboardEvent const* mir_input_event_get_keyboard_event(MirInputEvent const* event); |
| 2258 | @@ -121,7 +121,7 @@ |
| 2259 | * Retrieve the MirTouchEvent associated with a given input event. |
| 2260 | * |
| 2261 | * \param[in] event The input event |
| 2262 | - * \return The MirTouchEvent or NULL if event type is not |
| 2263 | + * \return The MirTouchEvent or NULL if event type is not |
| 2264 | * mir_input_event_type_touch |
| 2265 | */ |
| 2266 | MirTouchEvent const* mir_input_event_get_touch_event(MirInputEvent const* event); |
| 2267 | @@ -130,7 +130,7 @@ |
| 2268 | * Retrieve the MirPointerEvent associated with a given input event. |
| 2269 | * |
| 2270 | * \param[in] event The input event |
| 2271 | - * \return The MirPointerEvent or NULL if event type is not |
| 2272 | + * \return The MirPointerEvent or NULL if event type is not |
| 2273 | * mir_input_event_type_pointer |
| 2274 | */ |
| 2275 | MirPointerEvent const* mir_input_event_get_pointer_event(MirInputEvent const* event); |
| 2276 | |
| 2277 | === modified file 'include/client/mir_toolkit/events/input/keyboard_event.h' |
| 2278 | --- include/client/mir_toolkit/events/input/keyboard_event.h 2016-08-09 08:13:02 +0000 |
| 2279 | +++ include/client/mir_toolkit/events/input/keyboard_event.h 2016-10-27 03:52:22 +0000 |
| 2280 | @@ -57,7 +57,7 @@ |
| 2281 | |
| 2282 | /** |
| 2283 | * Retrieve the action which triggered a given key event. |
| 2284 | - * |
| 2285 | + * |
| 2286 | * \param [in] event The key event |
| 2287 | * \return The associated action |
| 2288 | */ |
| 2289 | |
| 2290 | === modified file 'include/client/mir_toolkit/events/input/pointer_event.h' |
| 2291 | --- include/client/mir_toolkit/events/input/pointer_event.h 2016-08-09 08:13:02 +0000 |
| 2292 | +++ include/client/mir_toolkit/events/input/pointer_event.h 2016-10-27 03:52:22 +0000 |
| 2293 | @@ -72,7 +72,7 @@ |
| 2294 | mir_pointer_axes |
| 2295 | } MirPointerAxis; |
| 2296 | |
| 2297 | -/* |
| 2298 | +/* |
| 2299 | * Identifiers for pointer buttons |
| 2300 | */ |
| 2301 | typedef enum { |
| 2302 | @@ -130,7 +130,7 @@ |
| 2303 | * \param [in] axis The axis to retreive a value from |
| 2304 | * \return The value of the given axis |
| 2305 | */ |
| 2306 | -float mir_pointer_event_axis_value(MirPointerEvent const* event, |
| 2307 | +float mir_pointer_event_axis_value(MirPointerEvent const* event, |
| 2308 | MirPointerAxis axis); |
| 2309 | |
| 2310 | /** |
| 2311 | |
| 2312 | === modified file 'include/client/mir_toolkit/events/input/touch_event.h' |
| 2313 | --- include/client/mir_toolkit/events/input/touch_event.h 2016-08-09 08:13:02 +0000 |
| 2314 | +++ include/client/mir_toolkit/events/input/touch_event.h 2016-10-27 03:52:22 +0000 |
| 2315 | @@ -32,7 +32,7 @@ |
| 2316 | */ |
| 2317 | typedef struct MirTouchEvent MirTouchEvent; |
| 2318 | |
| 2319 | -/** |
| 2320 | +/** |
| 2321 | * An identifier for a touch-point. TouchId's are unique per-gesture. |
| 2322 | * That is to say, once a touch has gone down at time T, no other touch will |
| 2323 | * use that touch's ID until all touches at time T have come up. |
| 2324 | @@ -144,7 +144,7 @@ |
| 2325 | * \param [in] axis The axis to retreive a value from |
| 2326 | * \return The value of the given axis |
| 2327 | */ |
| 2328 | -float mir_touch_event_axis_value(MirTouchEvent const* event, |
| 2329 | +float mir_touch_event_axis_value(MirTouchEvent const* event, |
| 2330 | size_t touch_index, MirTouchAxis axis); |
| 2331 | |
| 2332 | /** |
| 2333 | |
| 2334 | === modified file 'include/client/mir_toolkit/events/input_configuration_event.h' |
| 2335 | --- include/client/mir_toolkit/events/input_configuration_event.h 2016-07-18 07:38:38 +0000 |
| 2336 | +++ include/client/mir_toolkit/events/input_configuration_event.h 2016-10-27 03:52:22 +0000 |
| 2337 | @@ -39,7 +39,7 @@ |
| 2338 | /// |
| 2339 | /// Of course as things stand there is no client input-device introspection API so these events |
| 2340 | /// are difficult to use. |
| 2341 | - |
| 2342 | + |
| 2343 | typedef enum |
| 2344 | { |
| 2345 | mir_input_configuration_action_configuration_changed, |
| 2346 | |
| 2347 | === modified file 'include/client/mir_toolkit/events/resize_event.h' |
| 2348 | --- include/client/mir_toolkit/events/resize_event.h 2016-07-18 07:38:38 +0000 |
| 2349 | +++ include/client/mir_toolkit/events/resize_event.h 2016-10-27 03:52:22 +0000 |
| 2350 | @@ -31,7 +31,7 @@ |
| 2351 | |
| 2352 | /** |
| 2353 | * Retrieve the new width reported by a given MirResizeEvent |
| 2354 | - * |
| 2355 | + * |
| 2356 | * \param[in] ev The resize event |
| 2357 | * \return The reported width |
| 2358 | */ |
| 2359 | @@ -39,7 +39,7 @@ |
| 2360 | |
| 2361 | /** |
| 2362 | * Retrieve the new height reported by a given MirResizeEvent |
| 2363 | - * |
| 2364 | + * |
| 2365 | * \param[in] ev The resize event |
| 2366 | * \return The reported height |
| 2367 | */ |
| 2368 | |
| 2369 | === modified file 'include/client/mir_toolkit/events/surface_placement.h' |
| 2370 | --- include/client/mir_toolkit/events/surface_placement.h 2016-09-14 13:51:11 +0000 |
| 2371 | +++ include/client/mir_toolkit/events/surface_placement.h 2016-10-27 03:52:22 +0000 |
| 2372 | @@ -33,7 +33,7 @@ |
| 2373 | |
| 2374 | /** |
| 2375 | * Retrieve the relative position from a placement notification |
| 2376 | - * |
| 2377 | + * |
| 2378 | * \param [in] event The placement event |
| 2379 | * \return The position relative to the parent surface |
| 2380 | */ |
| 2381 | |
| 2382 | === modified file 'include/client/mir_toolkit/mir_buffer_stream.h' |
| 2383 | --- include/client/mir_toolkit/mir_buffer_stream.h 2016-10-12 06:03:15 +0000 |
| 2384 | +++ include/client/mir_toolkit/mir_buffer_stream.h 2016-10-27 03:52:22 +0000 |
| 2385 | @@ -50,17 +50,17 @@ |
| 2386 | char const *mir_buffer_stream_get_error_message(MirBufferStream *buffer_stream); |
| 2387 | |
| 2388 | /** |
| 2389 | - * Create a new buffer stream. |
| 2390 | + * Create a new buffer stream. |
| 2391 | * |
| 2392 | * For example, the resulting buffer stream may be used |
| 2393 | - * with mir_cursor_configuration_from_buffer_stream, |
| 2394 | + * with mir_cursor_configuration_from_buffer_stream, |
| 2395 | * in order to post images to the system cursor. |
| 2396 | * |
| 2397 | * \param [in] connection A valid connection |
| 2398 | * \param [in] width Requested buffer width |
| 2399 | * \param [in] height Requested buffer height |
| 2400 | * \param [in] format Requested pixel format |
| 2401 | - * \param [in] buffer_usage Requested buffer usage, use |
| 2402 | + * \param [in] buffer_usage Requested buffer usage, use |
| 2403 | * mir_buffer_usage_software for cursor image streams |
| 2404 | * \param [in] callback Callback to be invoked when the request completes |
| 2405 | * The callback is guaranteed to be called and called with a |
| 2406 | @@ -78,9 +78,9 @@ |
| 2407 | void* context); |
| 2408 | |
| 2409 | /** |
| 2410 | - * Create a new buffer stream unattached to a surface and wait for the result. |
| 2411 | - * The resulting buffer stream may be used with |
| 2412 | - * mir_cursor_configuration_from_buffer_stream in order to post images |
| 2413 | + * Create a new buffer stream unattached to a surface and wait for the result. |
| 2414 | + * The resulting buffer stream may be used with |
| 2415 | + * mir_cursor_configuration_from_buffer_stream in order to post images |
| 2416 | * to the system cursor. |
| 2417 | * |
| 2418 | * \param [in] connection A valid connection |
| 2419 | @@ -90,7 +90,7 @@ |
| 2420 | * \param [in] buffer_usage Requested buffer usage, use |
| 2421 | * mir_buffer_usage_software for cursor image streams |
| 2422 | * |
| 2423 | - * \return The new buffer stream. This is guaranteed non-null, |
| 2424 | + * \return The new buffer stream. This is guaranteed non-null, |
| 2425 | * but may be invalid in the case of error. |
| 2426 | */ |
| 2427 | MirBufferStream* mir_connection_create_buffer_stream_sync(MirConnection *connection, |
| 2428 | @@ -116,7 +116,7 @@ |
| 2429 | void *context); |
| 2430 | |
| 2431 | /** |
| 2432 | - * Release the specified buffer stream like in mir,_buffer_stream_release(), |
| 2433 | + * Release the specified buffer stream like in mir,_buffer_stream_release(), |
| 2434 | * but also wait for the operation to complete. |
| 2435 | * \param [in] buffer_stream The buffer stream to be released |
| 2436 | */ |
| 2437 | @@ -124,7 +124,7 @@ |
| 2438 | |
| 2439 | /** |
| 2440 | * Get the underlying platform type so the buffer obtained in "raw" |
| 2441 | - * representation in mir_buffer_stream_get_current_buffer() |
| 2442 | + * representation in mir_buffer_stream_get_current_buffer() |
| 2443 | * may be understood |
| 2444 | * |
| 2445 | * \deprecated Use of this function is inherently non-portable in the presence |
| 2446 | @@ -137,7 +137,7 @@ |
| 2447 | * |
| 2448 | * \pre The stream is valid |
| 2449 | * \param [in] stream The stream |
| 2450 | - * \return One of mir_platform_type_android or |
| 2451 | + * \return One of mir_platform_type_android or |
| 2452 | * mir_platform_type_gbm |
| 2453 | */ |
| 2454 | /// @cond |
| 2455 | @@ -156,7 +156,7 @@ |
| 2456 | |
| 2457 | /** |
| 2458 | * Advance a buffer stream's buffer. The returned handle remains valid until the |
| 2459 | - * next call to mir_buffer_stream_swap_buffers, until the buffer stream has been |
| 2460 | + * next call to mir_buffer_stream_swap_buffers, until the buffer stream has been |
| 2461 | * released or the connection to the server has been released. |
| 2462 | * \warning callback could be called from another thread. You must do any |
| 2463 | * locking appropriate to protect your data accessed in the |
| 2464 | @@ -173,7 +173,7 @@ |
| 2465 | void *context); |
| 2466 | |
| 2467 | /** |
| 2468 | - * Advance a buffer stream's buffer as in mir_buffer stream_swap_buffers(), |
| 2469 | + * Advance a buffer stream's buffer as in mir_buffer stream_swap_buffers(), |
| 2470 | * but also wait for the operation to complete. |
| 2471 | * \param [in] buffer_stream The buffer stream whose buffer to advance |
| 2472 | */ |
| 2473 | |
| 2474 | === modified file 'include/client/mir_toolkit/mir_cursor_configuration.h' |
| 2475 | --- include/client/mir_toolkit/mir_cursor_configuration.h 2016-09-08 02:58:56 +0000 |
| 2476 | +++ include/client/mir_toolkit/mir_cursor_configuration.h 2016-10-27 03:52:22 +0000 |
| 2477 | @@ -55,7 +55,7 @@ |
| 2478 | |
| 2479 | /** |
| 2480 | * Returns a new cursor configuration tied to a given buffer stream. |
| 2481 | - * If the configuration is successfully applied buffers from the stream will be used |
| 2482 | + * If the configuration is successfully applied buffers from the stream will be used |
| 2483 | * to fill the system cursor. |
| 2484 | * \param [in] stream The buffer stream |
| 2485 | * \param [in] hotspot_x The x-coordinate to use as the cursor's hotspot. |
| 2486 | |
| 2487 | === modified file 'include/client/mir_toolkit/mir_screencast.h' |
| 2488 | --- include/client/mir_toolkit/mir_screencast.h 2016-07-18 07:38:38 +0000 |
| 2489 | +++ include/client/mir_toolkit/mir_screencast.h 2016-10-27 03:52:22 +0000 |
| 2490 | @@ -152,9 +152,9 @@ |
| 2491 | MirScreencast* screencast); |
| 2492 | |
| 2493 | /** |
| 2494 | - * Retrieve the MirBufferStream associated with a screencast |
| 2495 | + * Retrieve the MirBufferStream associated with a screencast |
| 2496 | * (to advance buffers, obtain EGLNativeWindowType, etc...) |
| 2497 | - * |
| 2498 | + * |
| 2499 | * \param[in] screencast The screencast |
| 2500 | */ |
| 2501 | MirBufferStream* mir_screencast_get_buffer_stream(MirScreencast* screencast); |
| 2502 | |
| 2503 | === modified file 'include/client/mir_toolkit/mir_surface.h' |
| 2504 | --- include/client/mir_toolkit/mir_surface.h 2016-10-12 06:03:15 +0000 |
| 2505 | +++ include/client/mir_toolkit/mir_surface.h 2016-10-27 03:52:22 +0000 |
| 2506 | @@ -500,12 +500,12 @@ |
| 2507 | * On application of the spec, a stream that is not present in the surface, |
| 2508 | * but is in the list will be associated with the surface. |
| 2509 | * Streams set a displacement from the top-left corner of the surface. |
| 2510 | - * |
| 2511 | + * |
| 2512 | * \warning disassociating streams from the surface will not release() them. |
| 2513 | * \warning It is wiser to arrange the streams within the bounds of the |
| 2514 | * surface the spec is applied to. Shells can define their own |
| 2515 | * behavior as to what happens to an out-of-bound stream. |
| 2516 | - * |
| 2517 | + * |
| 2518 | * \param [in] spec The spec to accumulate the request in. |
| 2519 | * \param [in] streams An array of non-null streams info. |
| 2520 | * \param [in] num_streams The number of elements in the streams array. |
| 2521 | @@ -734,7 +734,7 @@ |
| 2522 | * \return The DPI of the surface, or zero if unknown. |
| 2523 | */ |
| 2524 | int mir_surface_get_dpi(MirSurface* surface); |
| 2525 | - |
| 2526 | + |
| 2527 | /** |
| 2528 | * Query the focus state for a surface. |
| 2529 | * \param [in] surface The surface to operate on |
| 2530 | @@ -750,7 +750,7 @@ |
| 2531 | MirSurfaceVisibility mir_surface_get_visibility(MirSurface *surface); |
| 2532 | |
| 2533 | /** |
| 2534 | - * Choose the cursor state for a surface: whether a cursor is shown, |
| 2535 | + * Choose the cursor state for a surface: whether a cursor is shown, |
| 2536 | * and which cursor if so. |
| 2537 | * \param [in] surface The surface to operate on |
| 2538 | * \param [in] parameters The configuration parameters obtained |
| 2539 | |
| 2540 | === modified file 'include/client/mir_toolkit/version.h' |
| 2541 | --- include/client/mir_toolkit/version.h 2016-10-12 06:03:15 +0000 |
| 2542 | +++ include/client/mir_toolkit/version.h 2016-10-27 03:52:22 +0000 |
| 2543 | @@ -40,7 +40,7 @@ |
| 2544 | * |
| 2545 | * The minor client API version. This will increase each time new backwards-compatible API |
| 2546 | * is added, and will reset to 0 each time MIR_CLIENT_MAJOR_VERSION is incremented. |
| 2547 | - * |
| 2548 | + * |
| 2549 | * See also: http://semver.org/ |
| 2550 | */ |
| 2551 | #define MIR_CLIENT_MINOR_VERSION (4) |
| 2552 | |
| 2553 | === modified file 'include/common/mir/fd.h' |
| 2554 | --- include/common/mir/fd.h 2015-02-22 07:46:25 +0000 |
| 2555 | +++ include/common/mir/fd.h 2016-10-27 03:52:22 +0000 |
| 2556 | @@ -25,7 +25,7 @@ |
| 2557 | //TODO: remove once mir::Fd is used more pervasively. |
| 2558 | // some existing code does not really allow us to transfer or share the ownership |
| 2559 | // of the fd. Constructing using mir::Fd(IntOwnedFd(int)) will help transition the existing |
| 2560 | -// code to using the mir::Fd type properly. |
| 2561 | +// code to using the mir::Fd type properly. |
| 2562 | struct IntOwnedFd |
| 2563 | { |
| 2564 | int int_owned_fd; |
| 2565 | |
| 2566 | === modified file 'include/common/mir/uncaught.h' |
| 2567 | --- include/common/mir/uncaught.h 2016-10-20 14:35:09 +0000 |
| 2568 | +++ include/common/mir/uncaught.h 2016-10-27 03:52:22 +0000 |
| 2569 | @@ -19,7 +19,7 @@ |
| 2570 | #ifndef MIR_CLIENT_API_HELPERS_H_ |
| 2571 | #define MIR_CLIENT_API_HELPERS_H_ |
| 2572 | |
| 2573 | -#include <boost/exception/diagnostic_information.hpp> |
| 2574 | +#include <boost/exception/diagnostic_information.hpp> |
| 2575 | |
| 2576 | #include "mir/log.h" |
| 2577 | |
| 2578 | |
| 2579 | === modified file 'include/core/mir/geometry/rectangle.h' |
| 2580 | --- include/core/mir/geometry/rectangle.h 2016-08-25 08:16:10 +0000 |
| 2581 | +++ include/core/mir/geometry/rectangle.h 2016-10-27 03:52:22 +0000 |
| 2582 | @@ -67,7 +67,7 @@ |
| 2583 | |
| 2584 | X left() const { return top_left.x; } |
| 2585 | X right() const { return bottom_right().x; } |
| 2586 | - Y top() const { return top_left.y; } |
| 2587 | + Y top() const { return top_left.y; } |
| 2588 | Y bottom() const { return bottom_right().y; } |
| 2589 | }; |
| 2590 | |
| 2591 | |
| 2592 | === modified file 'include/platform/mir/graphics/cursor_image.h' |
| 2593 | --- include/platform/mir/graphics/cursor_image.h 2015-02-22 07:46:25 +0000 |
| 2594 | +++ include/platform/mir/graphics/cursor_image.h 2016-10-27 03:52:22 +0000 |
| 2595 | @@ -34,12 +34,12 @@ |
| 2596 | |
| 2597 | virtual void const* as_argb_8888() const = 0; |
| 2598 | virtual geometry::Size size() const = 0; |
| 2599 | - |
| 2600 | + |
| 2601 | // We use "hotspot" to mean the offset within a cursor image |
| 2602 | // which should be placed at the onscreen |
| 2603 | // location of the pointer. |
| 2604 | virtual geometry::Displacement hotspot() const = 0; |
| 2605 | - |
| 2606 | + |
| 2607 | |
| 2608 | protected: |
| 2609 | CursorImage() = default; |
| 2610 | |
| 2611 | === modified file 'include/platform/mir/graphics/display.h' |
| 2612 | --- include/platform/mir/graphics/display.h 2016-10-12 06:03:15 +0000 |
| 2613 | +++ include/platform/mir/graphics/display.h 2016-10-27 03:52:22 +0000 |
| 2614 | @@ -71,7 +71,7 @@ |
| 2615 | |
| 2616 | /** Post the content of the DisplayBuffers associated with this DisplaySyncGroup. |
| 2617 | * The content of all the DisplayBuffers in this DisplaySyncGroup are guaranteed to be onscreen |
| 2618 | - * in the near future. On some platforms, this may wait a potentially long time for vsync. |
| 2619 | + * in the near future. On some platforms, this may wait a potentially long time for vsync. |
| 2620 | **/ |
| 2621 | virtual void post() = 0; |
| 2622 | |
| 2623 | |
| 2624 | === modified file 'include/platform/mir/graphics/display_buffer.h' |
| 2625 | --- include/platform/mir/graphics/display_buffer.h 2016-10-12 06:03:15 +0000 |
| 2626 | +++ include/platform/mir/graphics/display_buffer.h 2016-10-27 03:52:22 +0000 |
| 2627 | @@ -52,9 +52,9 @@ |
| 2628 | /** The area the DisplayBuffer occupies in the virtual screen space. */ |
| 2629 | virtual geometry::Rectangle view_area() const = 0; |
| 2630 | |
| 2631 | - /** This will render renderlist to the screen and post the result to the |
| 2632 | + /** This will render renderlist to the screen and post the result to the |
| 2633 | * screen if there is a hardware optimization that can be done. |
| 2634 | - * \param [in] renderlist |
| 2635 | + * \param [in] renderlist |
| 2636 | * The renderables that should appear on the screen if the hardware |
| 2637 | * is capable of optmizing that list somehow. If what you want |
| 2638 | * displayed on the screen cannot be represented by a RenderableList, |
| 2639 | |
| 2640 | === modified file 'include/platform/mir/graphics/platform_ipc_operations.h' |
| 2641 | --- include/platform/mir/graphics/platform_ipc_operations.h 2016-10-12 06:03:15 +0000 |
| 2642 | +++ include/platform/mir/graphics/platform_ipc_operations.h 2016-10-27 03:52:22 +0000 |
| 2643 | @@ -29,7 +29,7 @@ |
| 2644 | enum class BufferIpcMsgType |
| 2645 | { |
| 2646 | full_msg, //pack the full ipc representation of the buffer |
| 2647 | - update_msg //assume the client has a full representation, and pack only updates to the buffer |
| 2648 | + update_msg //assume the client has a full representation, and pack only updates to the buffer |
| 2649 | }; |
| 2650 | class Buffer; |
| 2651 | class BufferIpcMessage; |
| 2652 | @@ -69,15 +69,15 @@ |
| 2653 | */ |
| 2654 | virtual std::shared_ptr<PlatformIPCPackage> connection_ipc_package() = 0; |
| 2655 | |
| 2656 | - |
| 2657 | + |
| 2658 | /** |
| 2659 | * Arranges a platform specific operation triggered by an IPC call |
| 2660 | * \returns the response that will be sent to the client |
| 2661 | - * \param [in] opcode the opcode that indicates the action to be performed |
| 2662 | + * \param [in] opcode the opcode that indicates the action to be performed |
| 2663 | * \param [in] message the message that was sent to the server |
| 2664 | */ |
| 2665 | virtual PlatformOperationMessage platform_operation( |
| 2666 | - unsigned int const opcode, PlatformOperationMessage const& message) = 0; |
| 2667 | + unsigned int const opcode, PlatformOperationMessage const& message) = 0; |
| 2668 | |
| 2669 | protected: |
| 2670 | PlatformIpcOperations() = default; |
| 2671 | |
| 2672 | === modified file 'include/renderers/sw/mir/renderer/sw/pixel_source.h' |
| 2673 | --- include/renderers/sw/mir/renderer/sw/pixel_source.h 2016-09-09 03:47:07 +0000 |
| 2674 | +++ include/renderers/sw/mir/renderer/sw/pixel_source.h 2016-10-27 03:52:22 +0000 |
| 2675 | @@ -35,7 +35,7 @@ |
| 2676 | public: |
| 2677 | virtual ~PixelSource() = default; |
| 2678 | |
| 2679 | - //functions have legacy issues with their signatures. |
| 2680 | + //functions have legacy issues with their signatures. |
| 2681 | //FIXME: correct write, it requires that the user does too much to use it correctly, |
| 2682 | // (ie, it forces them to figure out what size is proper, alloc a buffer, fill it, and then |
| 2683 | // copy the data into the buffer) |
| 2684 | |
| 2685 | === modified file 'include/server/mir/compositor/scene_element.h' |
| 2686 | --- include/server/mir/compositor/scene_element.h 2015-06-17 05:20:42 +0000 |
| 2687 | +++ include/server/mir/compositor/scene_element.h 2016-10-27 03:52:22 +0000 |
| 2688 | @@ -41,7 +41,7 @@ |
| 2689 | |
| 2690 | //TODO: Decoration is opaque on purpose. It is only used by an internal example, |
| 2691 | // and this function should be removed from the public API. |
| 2692 | - virtual std::unique_ptr<Decoration> decoration() const = 0; |
| 2693 | + virtual std::unique_ptr<Decoration> decoration() const = 0; |
| 2694 | |
| 2695 | protected: |
| 2696 | SceneElement() = default; |
| 2697 | |
| 2698 | === modified file 'include/server/mir/frontend/buffer_stream.h' |
| 2699 | --- include/server/mir/frontend/buffer_stream.h 2016-07-18 07:38:38 +0000 |
| 2700 | +++ include/server/mir/frontend/buffer_stream.h 2016-10-27 03:52:22 +0000 |
| 2701 | @@ -43,19 +43,19 @@ |
| 2702 | { |
| 2703 | public: |
| 2704 | virtual ~BufferStream() = default; |
| 2705 | - |
| 2706 | + |
| 2707 | virtual void swap_buffers(graphics::Buffer* old_buffer, std::function<void(graphics::Buffer* new_buffer)> complete) = 0; |
| 2708 | |
| 2709 | virtual void add_observer(std::shared_ptr<scene::SurfaceObserver> const& observer) = 0; |
| 2710 | virtual void remove_observer(std::weak_ptr<scene::SurfaceObserver> const& observer) = 0; |
| 2711 | - |
| 2712 | + |
| 2713 | virtual void with_most_recent_buffer_do( |
| 2714 | std::function<void(graphics::Buffer&)> const& exec) = 0; |
| 2715 | |
| 2716 | virtual MirPixelFormat pixel_format() const = 0; |
| 2717 | |
| 2718 | //TODO: associate/disassociate_buffer are only used for timeout framedropping policy decisions. |
| 2719 | - // They will be removed once timeout framedropping policy moves to the client side. |
| 2720 | + // They will be removed once timeout framedropping policy moves to the client side. |
| 2721 | virtual void associate_buffer(graphics::BufferID) = 0; |
| 2722 | virtual void disassociate_buffer(graphics::BufferID) = 0; |
| 2723 | |
| 2724 | |
| 2725 | === modified file 'include/server/mir/input/seat_report.h' |
| 2726 | --- include/server/mir/input/seat_report.h 2016-08-01 21:27:13 +0000 |
| 2727 | +++ include/server/mir/input/seat_report.h 2016-10-27 03:52:22 +0000 |
| 2728 | @@ -38,7 +38,7 @@ |
| 2729 | { |
| 2730 | public: |
| 2731 | virtual ~SeatReport() = default; |
| 2732 | - |
| 2733 | + |
| 2734 | virtual void seat_add_device(uint64_t id) = 0; |
| 2735 | virtual void seat_remove_device(uint64_t id) = 0; |
| 2736 | virtual void seat_dispatch_event(MirEvent const& event) = 0; |
| 2737 | |
| 2738 | === modified file 'include/server/mir/input/touch_visualizer.h' |
| 2739 | --- include/server/mir/input/touch_visualizer.h 2016-01-29 08:18:22 +0000 |
| 2740 | +++ include/server/mir/input/touch_visualizer.h 2016-10-27 03:52:22 +0000 |
| 2741 | @@ -38,15 +38,15 @@ |
| 2742 | struct Spot |
| 2743 | { |
| 2744 | geometry::Point touch_location; |
| 2745 | - |
| 2746 | + |
| 2747 | // If pressure is zero, the touch-point can be interpreted as a hover. |
| 2748 | float pressure; |
| 2749 | }; |
| 2750 | - |
| 2751 | + |
| 2752 | // Toggle visualization of touches |
| 2753 | virtual void enable() = 0; |
| 2754 | virtual void disable() = 0; |
| 2755 | - |
| 2756 | + |
| 2757 | // Visualize a given set of touches statelessly. |
| 2758 | virtual void visualize_touches(std::vector<Spot> const& touches) = 0; |
| 2759 | |
| 2760 | |
| 2761 | === modified file 'include/server/mir/scene/observer.h' |
| 2762 | --- include/server/mir/scene/observer.h 2015-02-22 07:46:25 +0000 |
| 2763 | +++ include/server/mir/scene/observer.h 2016-10-27 03:52:22 +0000 |
| 2764 | @@ -36,7 +36,7 @@ |
| 2765 | virtual void surface_added(Surface* surface) = 0; |
| 2766 | virtual void surface_removed(Surface* surface) = 0; |
| 2767 | virtual void surfaces_reordered() = 0; |
| 2768 | - |
| 2769 | + |
| 2770 | // Used to indicate the scene has changed in some way beyond the present surfaces |
| 2771 | // and will require full recomposition. |
| 2772 | virtual void scene_changed() = 0; |
| 2773 | |
| 2774 | === modified file 'include/server/mir/scene/surface.h' |
| 2775 | --- include/server/mir/scene/surface.h 2016-10-12 06:03:15 +0000 |
| 2776 | +++ include/server/mir/scene/surface.h 2016-10-27 03:52:22 +0000 |
| 2777 | @@ -64,7 +64,7 @@ |
| 2778 | /// Size of the surface including window frame (if any) |
| 2779 | virtual geometry::Size size() const = 0; |
| 2780 | |
| 2781 | - virtual graphics::RenderableList generate_renderables(compositor::CompositorID id) const = 0; |
| 2782 | + virtual graphics::RenderableList generate_renderables(compositor::CompositorID id) const = 0; |
| 2783 | virtual int buffers_ready_for_compositor(void const* compositor_id) const = 0; |
| 2784 | |
| 2785 | virtual float alpha() const = 0; //only used in examples/ |
| 2786 | @@ -91,7 +91,7 @@ |
| 2787 | virtual void set_transformation(glm::mat4 const& t) = 0; |
| 2788 | virtual void set_alpha(float alpha) = 0; |
| 2789 | virtual void set_orientation(MirOrientation orientation) = 0; |
| 2790 | - |
| 2791 | + |
| 2792 | virtual void set_cursor_image(std::shared_ptr<graphics::CursorImage> const& image) override = 0; |
| 2793 | virtual std::shared_ptr<graphics::CursorImage> cursor_image() const override = 0; |
| 2794 | |
| 2795 | |
| 2796 | === modified file 'include/server/mir/server.h' |
| 2797 | --- include/server/mir/server.h 2016-07-28 23:00:22 +0000 |
| 2798 | +++ include/server/mir/server.h 2016-10-27 03:52:22 +0000 |
| 2799 | @@ -53,7 +53,7 @@ |
| 2800 | namespace scene |
| 2801 | { |
| 2802 | class ApplicationNotRespondingDetector; |
| 2803 | -class BufferStreamFactory; |
| 2804 | +class BufferStreamFactory; |
| 2805 | class PromptSessionListener; |
| 2806 | class PromptSessionManager; |
| 2807 | class SessionListener; |
| 2808 | |
| 2809 | === modified file 'include/server/mir/shell/surface_specification.h' |
| 2810 | --- include/server/mir/shell/surface_specification.h 2016-10-12 06:03:15 +0000 |
| 2811 | +++ include/server/mir/shell/surface_specification.h 2016-10-27 03:52:22 +0000 |
| 2812 | @@ -80,7 +80,7 @@ |
| 2813 | optional_value<std::weak_ptr<scene::Surface>> parent; |
| 2814 | |
| 2815 | optional_value<std::vector<geometry::Rectangle>> input_shape; |
| 2816 | - |
| 2817 | + |
| 2818 | // TODO scene::SurfaceCreationParameters overlaps this content but has additional fields: |
| 2819 | // geometry::Point top_left; |
| 2820 | // input::InputReceptionMode input_mode; |
| 2821 | |
| 2822 | === modified file 'include/test/mir/test/doubles/nested_mock_egl.h' |
| 2823 | --- include/test/mir/test/doubles/nested_mock_egl.h 2016-01-29 08:18:22 +0000 |
| 2824 | +++ include/test/mir/test/doubles/nested_mock_egl.h 2016-10-27 03:52:22 +0000 |
| 2825 | @@ -27,7 +27,7 @@ |
| 2826 | { |
| 2827 | namespace doubles |
| 2828 | { |
| 2829 | -/// MockEGL with configuration for operating a nested server. |
| 2830 | +/// MockEGL with configuration for operating a nested server. |
| 2831 | class NestedMockEGL : public ::testing::NiceMock<MockEGL> |
| 2832 | { |
| 2833 | public: |
| 2834 | |
| 2835 | === modified file 'include/test/mir/test/doubles/null_display.h' |
| 2836 | --- include/test/mir/test/doubles/null_display.h 2016-10-12 06:03:15 +0000 |
| 2837 | +++ include/test/mir/test/doubles/null_display.h 2016-10-27 03:52:22 +0000 |
| 2838 | @@ -68,7 +68,7 @@ |
| 2839 | |
| 2840 | std::shared_ptr<graphics::Cursor> create_hardware_cursor(std::shared_ptr<graphics::CursorImage> const& /* initial_image */) override |
| 2841 | { |
| 2842 | - return {}; |
| 2843 | + return {}; |
| 2844 | } |
| 2845 | std::unique_ptr<graphics::VirtualOutput> create_virtual_output(int /*width*/, int /*height*/) override |
| 2846 | { |
| 2847 | |
| 2848 | === modified file 'include/test/mir/test/event_factory.h' |
| 2849 | --- include/test/mir/test/event_factory.h 2016-01-29 08:18:22 +0000 |
| 2850 | +++ include/test/mir/test/event_factory.h 2016-10-27 03:52:22 +0000 |
| 2851 | @@ -91,7 +91,7 @@ |
| 2852 | TouchParameters& from_device(int device_id); |
| 2853 | TouchParameters& at_position(geometry::Point abs_pos); |
| 2854 | TouchParameters& with_action(Action touch_action); |
| 2855 | - |
| 2856 | + |
| 2857 | int device_id; |
| 2858 | int abs_x; |
| 2859 | int abs_y; |
| 2860 | |
| 2861 | === modified file 'include/test/mir/test/event_matchers.h' |
| 2862 | --- include/test/mir/test/event_matchers.h 2016-10-11 18:10:32 +0000 |
| 2863 | +++ include/test/mir/test/event_matchers.h 2016-10-27 03:52:22 +0000 |
| 2864 | @@ -99,7 +99,7 @@ |
| 2865 | auto kev = maybe_key_event(to_address(arg)); |
| 2866 | if (kev == nullptr) |
| 2867 | return false; |
| 2868 | - |
| 2869 | + |
| 2870 | if (mir_keyboard_event_action(kev) != mir_keyboard_action_down) |
| 2871 | return false; |
| 2872 | |
| 2873 | @@ -111,7 +111,7 @@ |
| 2874 | auto kev = maybe_key_event(to_address(arg)); |
| 2875 | if (kev == nullptr) |
| 2876 | return false; |
| 2877 | - |
| 2878 | + |
| 2879 | if (mir_keyboard_event_action(kev) != mir_keyboard_action_repeat) |
| 2880 | return false; |
| 2881 | |
| 2882 | @@ -123,7 +123,7 @@ |
| 2883 | auto kev = maybe_key_event(to_address(arg)); |
| 2884 | if (kev == nullptr) |
| 2885 | return false; |
| 2886 | - |
| 2887 | + |
| 2888 | if (mir_keyboard_event_action(kev) != mir_keyboard_action_up) |
| 2889 | return false; |
| 2890 | |
| 2891 | @@ -135,12 +135,12 @@ |
| 2892 | auto kev = maybe_key_event(to_address(arg)); |
| 2893 | if (kev == nullptr) |
| 2894 | return false; |
| 2895 | - |
| 2896 | + |
| 2897 | if(mir_keyboard_event_modifiers(kev) != modifiers) |
| 2898 | { |
| 2899 | return false; |
| 2900 | } |
| 2901 | - |
| 2902 | + |
| 2903 | return true; |
| 2904 | } |
| 2905 | |
| 2906 | @@ -186,7 +186,7 @@ |
| 2907 | { |
| 2908 | auto expected = maybe_touch_event(to_address(event)); |
| 2909 | auto actual = maybe_touch_event(to_address(arg)); |
| 2910 | - |
| 2911 | + |
| 2912 | if (expected == nullptr || actual == nullptr) |
| 2913 | return false; |
| 2914 | |
| 2915 | @@ -199,9 +199,9 @@ |
| 2916 | if (mir_touch_event_id(actual, i) != mir_touch_event_id(expected, i) || |
| 2917 | mir_touch_event_action(actual, i) != mir_touch_event_action(expected, i) || |
| 2918 | mir_touch_event_tooltype(actual, i) != mir_touch_event_tooltype(expected, i) || |
| 2919 | - mir_touch_event_axis_value(actual, i, mir_touch_axis_x) != |
| 2920 | + mir_touch_event_axis_value(actual, i, mir_touch_axis_x) != |
| 2921 | mir_touch_event_axis_value(expected, i, mir_touch_axis_x) || |
| 2922 | - mir_touch_event_axis_value(actual, i, mir_touch_axis_y) != |
| 2923 | + mir_touch_event_axis_value(actual, i, mir_touch_axis_y) != |
| 2924 | mir_touch_event_axis_value(expected, i, mir_touch_axis_y)) |
| 2925 | { |
| 2926 | return false; |
| 2927 | |
| 2928 | === modified file 'include/test/mir_test_framework/declarative_placement_window_manage_policy.h' |
| 2929 | --- include/test/mir_test_framework/declarative_placement_window_manage_policy.h 2016-07-18 07:38:38 +0000 |
| 2930 | +++ include/test/mir_test_framework/declarative_placement_window_manage_policy.h 2016-10-27 03:52:22 +0000 |
| 2931 | @@ -39,7 +39,7 @@ |
| 2932 | public: |
| 2933 | DeclarativePlacementWindowManagerPolicy( |
| 2934 | mir::shell::WindowManagerTools* const tools, |
| 2935 | - SurfaceGeometries const& positions_by_name, |
| 2936 | + SurfaceGeometries const& positions_by_name, |
| 2937 | std::shared_ptr<mir::shell::DisplayLayout> const& display_layout); |
| 2938 | |
| 2939 | auto handle_place_new_surface( |
| 2940 | |
| 2941 | === modified file 'playground/demo-shell/demo_compositor.cpp' |
| 2942 | --- playground/demo-shell/demo_compositor.cpp 2016-10-12 06:03:15 +0000 |
| 2943 | +++ playground/demo-shell/demo_compositor.cpp 2016-10-27 03:52:22 +0000 |
| 2944 | @@ -70,7 +70,7 @@ |
| 2945 | for(auto const& it : elements) |
| 2946 | { |
| 2947 | auto const& renderable = it->renderable(); |
| 2948 | - |
| 2949 | + |
| 2950 | bool embellished = false; |
| 2951 | if (auto decor = it->decoration()) |
| 2952 | { |
| 2953 | @@ -179,10 +179,10 @@ |
| 2954 | int db_height = view_area.size.height.as_int(); |
| 2955 | int db_x = view_area.top_left.x.as_int(); |
| 2956 | int db_y = view_area.top_left.y.as_int(); |
| 2957 | - |
| 2958 | + |
| 2959 | float zoom_width = db_width / zoom_mag; |
| 2960 | float zoom_height = db_height / zoom_mag; |
| 2961 | - |
| 2962 | + |
| 2963 | // Note the 0.5f. This is because cursors (and all input in general) |
| 2964 | // measures coordinates at the centre of a pixel. But GL measures to |
| 2965 | // the top-left corner of a pixel. |
| 2966 | @@ -191,7 +191,7 @@ |
| 2967 | |
| 2968 | float normal_x = screen_x / db_width; |
| 2969 | float normal_y = screen_y / db_height; |
| 2970 | - |
| 2971 | + |
| 2972 | // Position the viewport so the cursor location matches up. |
| 2973 | // This assumes the hardware cursor still traverses the physical |
| 2974 | // screen and isn't being warped. |
| 2975 | |
| 2976 | === modified file 'playground/demo-shell/demo_renderer.h' |
| 2977 | --- playground/demo-shell/demo_renderer.h 2016-01-29 08:18:22 +0000 |
| 2978 | +++ playground/demo-shell/demo_renderer.h 2016-10-27 03:52:22 +0000 |
| 2979 | @@ -79,7 +79,7 @@ |
| 2980 | |
| 2981 | ColourEffect colour_effect; |
| 2982 | Program inverse_program, contrast_program; |
| 2983 | - |
| 2984 | + |
| 2985 | mutable DecorMap decor_map; |
| 2986 | mutable typo::GLCache title_cache; |
| 2987 | }; |
| 2988 | |
| 2989 | === modified file 'playground/demo-shell/window_manager.cpp' |
| 2990 | --- playground/demo-shell/window_manager.cpp 2016-07-26 03:56:14 +0000 |
| 2991 | +++ playground/demo-shell/window_manager.cpp 2016-10-27 03:52:22 +0000 |
| 2992 | @@ -186,7 +186,7 @@ |
| 2993 | left = old_pos.x.as_int() + dx; |
| 2994 | else if (xedge == right_edge) |
| 2995 | right = old_pos.x.as_int() + old_size.width.as_int() + dx; |
| 2996 | - |
| 2997 | + |
| 2998 | if (yedge == top_edge && dy < height) |
| 2999 | top = old_pos.y.as_int() + dy; |
| 3000 | else if (yedge == bottom_edge) |
| 3001 | @@ -206,7 +206,7 @@ |
| 3002 | |
| 3003 | auto modifiers = mir_keyboard_event_modifiers(kev); |
| 3004 | auto scan_code = mir_keyboard_event_scan_code(kev); |
| 3005 | - |
| 3006 | + |
| 3007 | if (modifiers & mir_input_event_modifier_alt && |
| 3008 | scan_code == KEY_TAB) // TODO: Use keycode once we support keymapping on the server side |
| 3009 | { |
| 3010 | @@ -295,7 +295,7 @@ |
| 3011 | case KEY_0: preferred_mode = true; break; |
| 3012 | default: break; |
| 3013 | } |
| 3014 | - |
| 3015 | + |
| 3016 | if (rotating || mode_change || preferred_mode) |
| 3017 | { |
| 3018 | compositor->stop(); |
| 3019 | @@ -322,7 +322,7 @@ |
| 3020 | mode_change) % nmodes; |
| 3021 | } |
| 3022 | }); |
| 3023 | - |
| 3024 | + |
| 3025 | display->configure(*conf); |
| 3026 | compositor->start(); |
| 3027 | return true; |
| 3028 | @@ -397,7 +397,7 @@ |
| 3029 | // there's a clear edge to the desktop. |
| 3030 | if (zoom_exponent < 0) |
| 3031 | zoom_exponent = 0; |
| 3032 | - |
| 3033 | + |
| 3034 | new_zoom_mag = powf(1.2f, zoom_exponent); |
| 3035 | handled = true; |
| 3036 | } |
| 3037 | @@ -444,7 +444,7 @@ |
| 3038 | old_size = surf->size(); |
| 3039 | } |
| 3040 | |
| 3041 | - if (surf && |
| 3042 | + if (surf && |
| 3043 | (modifiers & mir_input_event_modifier_alt) && |
| 3044 | action == mir_pointer_action_motion && |
| 3045 | vscroll) |
| 3046 | @@ -583,7 +583,7 @@ |
| 3047 | return false; |
| 3048 | auto iev = mir_event_get_input_event(&event); |
| 3049 | auto input_type = mir_input_event_get_type(iev); |
| 3050 | - |
| 3051 | + |
| 3052 | if (input_type == mir_input_event_type_key) |
| 3053 | { |
| 3054 | return handle_key_event(mir_input_event_get_keyboard_event(iev)); |
| 3055 | |
| 3056 | === modified file 'playground/demo-shell/window_manager.h' |
| 3057 | --- playground/demo-shell/window_manager.h 2016-07-26 03:56:14 +0000 |
| 3058 | +++ playground/demo-shell/window_manager.h 2016-10-27 03:52:22 +0000 |
| 3059 | @@ -49,7 +49,7 @@ |
| 3060 | |
| 3061 | class WindowManager : public input::EventFilter |
| 3062 | { |
| 3063 | -public: |
| 3064 | +public: |
| 3065 | WindowManager(); |
| 3066 | ~WindowManager() = default; |
| 3067 | |
| 3068 | @@ -58,7 +58,7 @@ |
| 3069 | void set_compositor(std::shared_ptr<compositor::Compositor> const& compositor); |
| 3070 | void set_input_scene(std::shared_ptr<input::Scene> const& scene); |
| 3071 | void force_redraw(); |
| 3072 | - |
| 3073 | + |
| 3074 | bool handle(MirEvent const& event) override; |
| 3075 | |
| 3076 | protected: |
| 3077 | |
| 3078 | === modified file 'playground/mir_demo_client_chain_jumping_buffers.c' |
| 3079 | --- playground/mir_demo_client_chain_jumping_buffers.c 2016-06-08 18:37:32 +0000 |
| 3080 | +++ playground/mir_demo_client_chain_jumping_buffers.c 2016-10-27 03:52:22 +0000 |
| 3081 | @@ -55,7 +55,7 @@ |
| 3082 | else |
| 3083 | pixel[j] = fg; |
| 3084 | } |
| 3085 | - vaddr += region.stride; |
| 3086 | + vaddr += region.stride; |
| 3087 | } |
| 3088 | } |
| 3089 | |
| 3090 | |
| 3091 | === modified file 'playground/mir_demo_client_prerendered_frames.c' |
| 3092 | --- playground/mir_demo_client_prerendered_frames.c 2016-10-11 07:12:33 +0000 |
| 3093 | +++ playground/mir_demo_client_prerendered_frames.c 2016-10-27 03:52:22 +0000 |
| 3094 | @@ -34,7 +34,7 @@ |
| 3095 | float distance(int x0, int y0, int x1, int y1) |
| 3096 | { |
| 3097 | float dx = x1 - x0; |
| 3098 | - float dy = y1 - y0; |
| 3099 | + float dy = y1 - y0; |
| 3100 | return sqrt((dx * dx + dy * dy)); |
| 3101 | } |
| 3102 | |
| 3103 | @@ -45,7 +45,7 @@ |
| 3104 | if ((!region.vaddr) || (region.pixel_format != mir_pixel_format_abgr_8888)) |
| 3105 | return; |
| 3106 | int const center_x = region.width / 2; |
| 3107 | - int const center_y = region.height / 2; |
| 3108 | + int const center_y = region.height / 2; |
| 3109 | unsigned char* vaddr = (unsigned char*) region.vaddr; |
| 3110 | for(int i = 0; i < region.height; i++) |
| 3111 | { |
| 3112 | @@ -53,13 +53,13 @@ |
| 3113 | for(int j = 0; j < region.width ; j++) |
| 3114 | { |
| 3115 | int const centered_i = i - center_y; |
| 3116 | - int const centered_j = j - center_x; |
| 3117 | + int const centered_j = j - center_x; |
| 3118 | if (distance(0,0, centered_i, centered_j) > radius) |
| 3119 | pixel[j] = bg; |
| 3120 | else |
| 3121 | pixel[j] = fg; |
| 3122 | } |
| 3123 | - vaddr += region.stride; |
| 3124 | + vaddr += region.stride; |
| 3125 | } |
| 3126 | } |
| 3127 | |
| 3128 | @@ -215,7 +215,7 @@ |
| 3129 | mir_presentation_chain_submit_buffer(chain, b); |
| 3130 | |
| 3131 | if ((i == num_prerendered_frames - 1) || (i == 0)) |
| 3132 | - inc *= -1; |
| 3133 | + inc *= -1; |
| 3134 | i = i + inc; |
| 3135 | } |
| 3136 | |
| 3137 | |
| 3138 | === modified file 'src/client/buffer.cpp' |
| 3139 | --- src/client/buffer.cpp 2016-10-12 06:03:15 +0000 |
| 3140 | +++ src/client/buffer.cpp 2016-10-27 03:52:22 +0000 |
| 3141 | @@ -76,7 +76,7 @@ |
| 3142 | |
| 3143 | cb(); |
| 3144 | } |
| 3145 | - |
| 3146 | + |
| 3147 | MirGraphicsRegion mcl::Buffer::map_region() |
| 3148 | { |
| 3149 | std::lock_guard<decltype(mutex)> lk(mutex); |
| 3150 | |
| 3151 | === modified file 'src/client/buffer_factory.cpp' |
| 3152 | --- src/client/buffer_factory.cpp 2016-08-09 08:13:02 +0000 |
| 3153 | +++ src/client/buffer_factory.cpp 2016-10-27 03:52:22 +0000 |
| 3154 | @@ -71,7 +71,7 @@ |
| 3155 | if (buffer.has_error()) |
| 3156 | { |
| 3157 | b = std::make_unique<ErrorBuffer>( |
| 3158 | - buffer.error(), error_id--, |
| 3159 | + buffer.error(), error_id--, |
| 3160 | (*request_it)->cb, (*request_it)->cb_context, (*request_it)->connection); |
| 3161 | } |
| 3162 | else |
| 3163 | |
| 3164 | === modified file 'src/client/buffer_stream.cpp' |
| 3165 | --- src/client/buffer_stream.cpp 2016-10-26 05:15:38 +0000 |
| 3166 | +++ src/client/buffer_stream.cpp 2016-10-27 03:52:22 +0000 |
| 3167 | @@ -292,7 +292,7 @@ |
| 3168 | buffer_depository = std::make_unique<BufferDepository>( |
| 3169 | client_platform->create_buffer_factory(), factory, |
| 3170 | std::make_shared<Requests>(display_server, protobuf_bs->id().value()), map, |
| 3171 | - ideal_buffer_size, static_cast<MirPixelFormat>(protobuf_bs->pixel_format()), |
| 3172 | + ideal_buffer_size, static_cast<MirPixelFormat>(protobuf_bs->pixel_format()), |
| 3173 | protobuf_bs->buffer_usage(), nbuffers); |
| 3174 | |
| 3175 | egl_native_window_ = client_platform->create_egl_native_window(this); |
| 3176 | @@ -478,7 +478,7 @@ |
| 3177 | if (attrib != mir_surface_attrib_swapinterval) |
| 3178 | { |
| 3179 | BOOST_THROW_EXCEPTION(std::logic_error("Attempt to configure surface attribute " + std::to_string(attrib) + |
| 3180 | - " on BufferStream but only mir_surface_attrib_swapinterval is supported")); |
| 3181 | + " on BufferStream but only mir_surface_attrib_swapinterval is supported")); |
| 3182 | } |
| 3183 | |
| 3184 | auto i = interval; |
| 3185 | @@ -559,7 +559,7 @@ |
| 3186 | void mcl::BufferStream::buffer_unavailable() |
| 3187 | { |
| 3188 | std::unique_lock<decltype(mutex)> lock(mutex); |
| 3189 | - buffer_depository->lost_connection(); |
| 3190 | + buffer_depository->lost_connection(); |
| 3191 | } |
| 3192 | |
| 3193 | void mcl::BufferStream::set_size(geom::Size sz) |
| 3194 | |
| 3195 | === modified file 'src/client/buffer_vault.cpp' |
| 3196 | --- src/client/buffer_vault.cpp 2016-10-12 06:03:15 +0000 |
| 3197 | +++ src/client/buffer_vault.cpp 2016-10-27 03:52:22 +0000 |
| 3198 | @@ -91,7 +91,7 @@ |
| 3199 | { |
| 3200 | auto buffer = map->buffer(it.first); |
| 3201 | buffer->set_callback(ignore_buffer, nullptr); |
| 3202 | - } |
| 3203 | + } |
| 3204 | free_buffer(it.first); |
| 3205 | } |
| 3206 | catch (...) |
| 3207 | @@ -122,7 +122,7 @@ |
| 3208 | auto map = surface_map.lock(); |
| 3209 | if (!map) |
| 3210 | BOOST_THROW_EXCEPTION(std::logic_error("connection resources lost; cannot access buffer")); |
| 3211 | - |
| 3212 | + |
| 3213 | if (auto buffer = map->buffer(id)) |
| 3214 | return buffer; |
| 3215 | else |
| 3216 | @@ -155,7 +155,7 @@ |
| 3217 | for (auto it = buffers.begin(); it != buffers.end();) |
| 3218 | { |
| 3219 | auto buffer = checked_buffer_from_map(it->first); |
| 3220 | - if ((it->second == Owner::Self) && (buffer->size() != size)) |
| 3221 | + if ((it->second == Owner::Self) && (buffer->size() != size)) |
| 3222 | { |
| 3223 | current_buffer_count--; |
| 3224 | free_ids.push_back(it->first); |
| 3225 | @@ -165,7 +165,7 @@ |
| 3226 | { |
| 3227 | it++; |
| 3228 | } |
| 3229 | - } |
| 3230 | + } |
| 3231 | |
| 3232 | mcl::NoTLSPromise<std::shared_ptr<mcl::MirBuffer>> promise; |
| 3233 | auto it = available_buffer(); |
| 3234 | |
| 3235 | === modified file 'src/client/client_buffer_stream.h' |
| 3236 | --- src/client/client_buffer_stream.h 2016-10-11 18:59:08 +0000 |
| 3237 | +++ src/client/client_buffer_stream.h 2016-10-27 03:52:22 +0000 |
| 3238 | @@ -87,7 +87,7 @@ |
| 3239 | virtual MirPlatformType platform_type() = 0; |
| 3240 | |
| 3241 | virtual frontend::BufferStreamId rpc_id() const = 0; |
| 3242 | - |
| 3243 | + |
| 3244 | virtual bool valid() const = 0; |
| 3245 | virtual void set_size(geometry::Size) = 0; |
| 3246 | virtual MirWaitHandle* set_scale(float) = 0; |
| 3247 | |
| 3248 | === modified file 'src/client/connection_surface_map.cpp' |
| 3249 | --- src/client/connection_surface_map.cpp 2016-10-13 16:32:59 +0000 |
| 3250 | +++ src/client/connection_surface_map.cpp 2016-10-27 03:52:22 +0000 |
| 3251 | @@ -94,7 +94,7 @@ |
| 3252 | mf::BufferStreamId stream_id, std::shared_ptr<MirPresentationChain> const& chain) |
| 3253 | { |
| 3254 | std::lock_guard<decltype(stream_guard)> lk(stream_guard); |
| 3255 | - chains[stream_id] = chain; |
| 3256 | + chains[stream_id] = chain; |
| 3257 | } |
| 3258 | |
| 3259 | void mcl::ConnectionSurfaceMap::erase(mf::BufferStreamId stream_id) |
| 3260 | |
| 3261 | === modified file 'src/client/cursor_configuration.h' |
| 3262 | --- src/client/cursor_configuration.h 2015-04-28 07:54:10 +0000 |
| 3263 | +++ src/client/cursor_configuration.h 2016-10-27 03:52:22 +0000 |
| 3264 | @@ -29,9 +29,9 @@ |
| 3265 | } |
| 3266 | } |
| 3267 | |
| 3268 | -// Parameters for configuring the apperance and behavior of the system cursor. |
| 3269 | +// Parameters for configuring the apperance and behavior of the system cursor. |
| 3270 | // Will grow to include cursors specified by raw RGBA data, hotspots, etc... |
| 3271 | -struct MirCursorConfiguration |
| 3272 | +struct MirCursorConfiguration |
| 3273 | { |
| 3274 | MirCursorConfiguration(char const* name); |
| 3275 | MirCursorConfiguration(mir::client::ClientBufferStream const* stream, int hotspot_x, int hotspot_y); |
| 3276 | |
| 3277 | === modified file 'src/client/event.cpp' |
| 3278 | --- src/client/event.cpp 2016-10-12 06:03:15 +0000 |
| 3279 | +++ src/client/event.cpp 2016-10-27 03:52:22 +0000 |
| 3280 | @@ -115,21 +115,21 @@ |
| 3281 | MirSurfaceEvent const* mir_event_get_surface_event(MirEvent const* ev) |
| 3282 | { |
| 3283 | expect_event_type(ev, mir_event_type_surface); |
| 3284 | - |
| 3285 | + |
| 3286 | return ev->to_surface(); |
| 3287 | } |
| 3288 | |
| 3289 | MirResizeEvent const* mir_event_get_resize_event(MirEvent const* ev) |
| 3290 | { |
| 3291 | expect_event_type(ev, mir_event_type_resize); |
| 3292 | - |
| 3293 | + |
| 3294 | return ev->to_resize(); |
| 3295 | } |
| 3296 | |
| 3297 | MirPromptSessionEvent const* mir_event_get_prompt_session_event(MirEvent const* ev) |
| 3298 | { |
| 3299 | expect_event_type(ev, mir_event_type_prompt_session_state_change); |
| 3300 | - |
| 3301 | + |
| 3302 | return ev->to_prompt_session(); |
| 3303 | } |
| 3304 | |
| 3305 | |
| 3306 | === modified file 'src/client/event_printer.cpp' |
| 3307 | --- src/client/event_printer.cpp 2016-10-12 06:03:15 +0000 |
| 3308 | +++ src/client/event_printer.cpp 2016-10-27 03:52:22 +0000 |
| 3309 | @@ -345,7 +345,7 @@ |
| 3310 | |
| 3311 | for (size_t size = mir_input_device_state_event_device_count(&event), index = 0; index != size; ++index) |
| 3312 | { |
| 3313 | - out << mir_input_device_state_event_device_id(&event, index) |
| 3314 | + out << mir_input_device_state_event_device_id(&event, index) |
| 3315 | << " btns=" << mir_input_device_state_event_device_pointer_buttons(&event, index) |
| 3316 | << " pressed=("; |
| 3317 | auto key_count = mir_input_device_state_event_device_pressed_keys_count(&event, index); |
| 3318 | |
| 3319 | === modified file 'src/client/events/event_builders.cpp' |
| 3320 | --- src/client/events/event_builders.cpp 2016-10-13 16:23:04 +0000 |
| 3321 | +++ src/client/events/event_builders.cpp 2016-10-27 03:52:22 +0000 |
| 3322 | @@ -160,7 +160,7 @@ |
| 3323 | namespace |
| 3324 | { |
| 3325 | // Never exposed in old event, so lets avoid leaking it in to a header now. |
| 3326 | -enum |
| 3327 | +enum |
| 3328 | { |
| 3329 | AINPUT_SOURCE_CLASS_MASK = 0x000000ff, |
| 3330 | |
| 3331 | @@ -170,7 +170,7 @@ |
| 3332 | AINPUT_SOURCE_CLASS_POSITION = 0x00000008, |
| 3333 | AINPUT_SOURCE_CLASS_JOYSTICK = 0x00000010 |
| 3334 | }; |
| 3335 | -enum |
| 3336 | +enum |
| 3337 | { |
| 3338 | AINPUT_SOURCE_UNKNOWN = 0x00000000, |
| 3339 | |
| 3340 | @@ -325,7 +325,7 @@ |
| 3341 | |
| 3342 | mir::EventUPtr mev::make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp, |
| 3343 | std::vector<uint8_t> const& cookie, MirInputEventModifiers modifiers, MirPointerAction action, |
| 3344 | - MirPointerButtons buttons_pressed, |
| 3345 | + MirPointerButtons buttons_pressed, |
| 3346 | float x_axis_value, float y_axis_value, |
| 3347 | float hscroll_value, float vscroll_value, |
| 3348 | float relative_x_value, float relative_y_value) |
| 3349 | @@ -355,7 +355,7 @@ |
| 3350 | // Deprecated version with uint64_t mac |
| 3351 | mir::EventUPtr mev::make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp, |
| 3352 | uint64_t /*mac*/, MirInputEventModifiers modifiers, MirPointerAction action, |
| 3353 | - MirPointerButtons buttons_pressed, |
| 3354 | + MirPointerButtons buttons_pressed, |
| 3355 | float x_axis_value, float y_axis_value, |
| 3356 | float hscroll_value, float vscroll_value, |
| 3357 | float relative_x_value, float relative_y_value) |
| 3358 | @@ -381,7 +381,7 @@ |
| 3359 | // Deprecated version without relative axis |
| 3360 | mir::EventUPtr mev::make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp, |
| 3361 | uint64_t /*mac*/, MirInputEventModifiers modifiers, MirPointerAction action, |
| 3362 | - MirPointerButtons buttons_pressed, |
| 3363 | + MirPointerButtons buttons_pressed, |
| 3364 | float x_axis_value, float y_axis_value, |
| 3365 | float hscroll_value, float vscroll_value) |
| 3366 | { |
| 3367 | |
| 3368 | === modified file 'src/client/input/android/event_conversion_helpers.cpp' |
| 3369 | --- src/client/input/android/event_conversion_helpers.cpp 2016-07-18 07:38:38 +0000 |
| 3370 | +++ src/client/input/android/event_conversion_helpers.cpp 2016-10-27 03:52:22 +0000 |
| 3371 | @@ -78,7 +78,7 @@ |
| 3372 | { |
| 3373 | if (repeat_count > 0) |
| 3374 | return mir_keyboard_action_repeat; |
| 3375 | - |
| 3376 | + |
| 3377 | switch (android_action) |
| 3378 | { |
| 3379 | case AKEY_EVENT_ACTION_DOWN: |
| 3380 | @@ -211,7 +211,7 @@ |
| 3381 | } |
| 3382 | if (index_with_action < 0) |
| 3383 | return AMOTION_EVENT_ACTION_MOVE; |
| 3384 | - |
| 3385 | + |
| 3386 | int masked_action = AMOTION_EVENT_ACTION_MASK; |
| 3387 | switch (mev.action(index_with_action)) |
| 3388 | { |
| 3389 | |
| 3390 | === modified file 'src/client/input/input_event.cpp' |
| 3391 | --- src/client/input/input_event.cpp 2016-08-09 08:13:02 +0000 |
| 3392 | +++ src/client/input/input_event.cpp 2016-10-27 03:52:22 +0000 |
| 3393 | @@ -47,7 +47,7 @@ |
| 3394 | } |
| 3395 | |
| 3396 | // Never exposed in old event, so lets avoid leaking it in to a header now. |
| 3397 | -enum |
| 3398 | +enum |
| 3399 | { |
| 3400 | AINPUT_SOURCE_CLASS_MASK = 0x000000ff, |
| 3401 | |
| 3402 | @@ -57,7 +57,7 @@ |
| 3403 | AINPUT_SOURCE_CLASS_POSITION = 0x00000008, |
| 3404 | AINPUT_SOURCE_CLASS_JOYSTICK = 0x00000010 |
| 3405 | }; |
| 3406 | -enum |
| 3407 | +enum |
| 3408 | { |
| 3409 | AINPUT_SOURCE_UNKNOWN = 0x00000000, |
| 3410 | |
| 3411 | @@ -173,7 +173,7 @@ |
| 3412 | input_event_type_to_string(mir_input_event_get_type(ev))); |
| 3413 | abort(); |
| 3414 | } |
| 3415 | - |
| 3416 | + |
| 3417 | return reinterpret_cast<MirKeyboardEvent const*>(ev); |
| 3418 | } |
| 3419 | |
| 3420 | @@ -193,13 +193,13 @@ |
| 3421 | } |
| 3422 | |
| 3423 | MirInputEventModifiers mir_keyboard_event_modifiers(MirKeyboardEvent const* kev) |
| 3424 | -{ |
| 3425 | +{ |
| 3426 | return kev->modifiers(); |
| 3427 | } |
| 3428 | /* Touch event accessors */ |
| 3429 | |
| 3430 | MirInputEventModifiers mir_touch_event_modifiers(MirTouchEvent const* tev) |
| 3431 | -{ |
| 3432 | +{ |
| 3433 | return tev->to_motion()->modifiers(); |
| 3434 | } |
| 3435 | |
| 3436 | @@ -238,7 +238,7 @@ |
| 3437 | mir::log_critical("touch index is greater than pointer count"); |
| 3438 | abort(); |
| 3439 | } |
| 3440 | - |
| 3441 | + |
| 3442 | return static_cast<MirTouchAction>(event->to_motion()->action(touch_index)); |
| 3443 | } |
| 3444 | |
| 3445 | @@ -281,7 +281,7 @@ |
| 3446 | default: |
| 3447 | return -1; |
| 3448 | } |
| 3449 | -} |
| 3450 | +} |
| 3451 | |
| 3452 | /* Pointer event accessors */ |
| 3453 | |
| 3454 | @@ -298,12 +298,12 @@ |
| 3455 | } |
| 3456 | |
| 3457 | MirInputEventModifiers mir_pointer_event_modifiers(MirPointerEvent const* pev) |
| 3458 | -{ |
| 3459 | +{ |
| 3460 | return pev->to_motion()->modifiers(); |
| 3461 | } |
| 3462 | |
| 3463 | MirPointerAction mir_pointer_event_action(MirPointerEvent const* pev) |
| 3464 | -{ |
| 3465 | +{ |
| 3466 | return static_cast<MirPointerAction>(pev->to_motion()->action(0)); |
| 3467 | } |
| 3468 | |
| 3469 | |
| 3470 | === modified file 'src/client/lttng/CMakeLists.txt' |
| 3471 | --- src/client/lttng/CMakeLists.txt 2016-07-18 07:38:38 +0000 |
| 3472 | +++ src/client/lttng/CMakeLists.txt 2016-10-27 03:52:22 +0000 |
| 3473 | @@ -15,7 +15,7 @@ |
| 3474 | string(REPLACE "-flto" "" NO_LTO_FLAGS ${CMAKE_C_FLAGS}) |
| 3475 | set(CMAKE_C_FLAGS ${NO_LTO_FLAGS}) |
| 3476 | |
| 3477 | -# lttng-ust uses urcu headers which contain code blocks inside expressions |
| 3478 | +# lttng-ust uses urcu headers which contain code blocks inside expressions |
| 3479 | # this is a gnu extension. |
| 3480 | string(REPLACE "-pedantic" "" NO_PEDANTIC_CHECK_FLAGS ${CMAKE_CXX_FLAGS}) |
| 3481 | if("${CMAKE_CXX_COMPILER}" MATCHES "clang") |
| 3482 | |
| 3483 | === modified file 'src/client/lttng/input_receiver_report.cpp' |
| 3484 | --- src/client/lttng/input_receiver_report.cpp 2015-04-28 07:54:10 +0000 |
| 3485 | +++ src/client/lttng/input_receiver_report.cpp 2016-10-27 03:52:22 +0000 |
| 3486 | @@ -62,8 +62,8 @@ |
| 3487 | void mir::client::lttng::InputReceiverReport::report_touch(MirInputEvent const* event) const |
| 3488 | { |
| 3489 | auto tev = mir_input_event_get_touch_event(event); |
| 3490 | - |
| 3491 | - mir_tracepoint(mir_client_input_receiver, touch_event, mir_input_event_get_device_id(event), |
| 3492 | + |
| 3493 | + mir_tracepoint(mir_client_input_receiver, touch_event, mir_input_event_get_device_id(event), |
| 3494 | mir_touch_event_modifiers(tev), mir_input_event_get_event_time(event)); |
| 3495 | |
| 3496 | for (unsigned int i = 0; i < mir_touch_event_point_count(tev); i++) |
| 3497 | |
| 3498 | === modified file 'src/client/lttng/input_receiver_report.h' |
| 3499 | --- src/client/lttng/input_receiver_report.h 2015-04-28 07:54:10 +0000 |
| 3500 | +++ src/client/lttng/input_receiver_report.h 2016-10-27 03:52:22 +0000 |
| 3501 | @@ -36,7 +36,7 @@ |
| 3502 | private: |
| 3503 | void report_touch(MirInputEvent const* event) const; |
| 3504 | void report_key(MirInputEvent const* event) const; |
| 3505 | - |
| 3506 | + |
| 3507 | ClientTracepointProvider tp_provider; |
| 3508 | }; |
| 3509 | |
| 3510 | |
| 3511 | === modified file 'src/client/mir_buffer_api.cpp' |
| 3512 | --- src/client/mir_buffer_api.cpp 2016-10-12 06:03:15 +0000 |
| 3513 | +++ src/client/mir_buffer_api.cpp 2016-10-27 03:52:22 +0000 |
| 3514 | @@ -34,7 +34,7 @@ |
| 3515 | |
| 3516 | //private NBS api under development |
| 3517 | void mir_connection_allocate_buffer( |
| 3518 | - MirConnection* connection, |
| 3519 | + MirConnection* connection, |
| 3520 | int width, int height, |
| 3521 | MirPixelFormat format, |
| 3522 | MirBufferUsage usage, |
| 3523 | @@ -50,7 +50,7 @@ |
| 3524 | } |
| 3525 | |
| 3526 | void ignore(MirBuffer*, void*){} |
| 3527 | -void mir_buffer_release(MirBuffer* b) |
| 3528 | +void mir_buffer_release(MirBuffer* b) |
| 3529 | try |
| 3530 | { |
| 3531 | mir::require(b); |
| 3532 | @@ -94,7 +94,7 @@ |
| 3533 | { |
| 3534 | mir::require(b); |
| 3535 | auto buffer = reinterpret_cast<mcl::MirBuffer*>(b); |
| 3536 | - |
| 3537 | + |
| 3538 | return buffer->wait_fence(access, std::chrono::nanoseconds(timeout)) ? 0 : -1; |
| 3539 | } |
| 3540 | catch (std::exception const& ex) |
| 3541 | |
| 3542 | === modified file 'src/client/mir_connection.cpp' |
| 3543 | --- src/client/mir_connection.cpp 2016-10-21 09:20:55 +0000 |
| 3544 | +++ src/client/mir_connection.cpp 2016-10-27 03:52:22 +0000 |
| 3545 | @@ -336,7 +336,7 @@ |
| 3546 | surface_requests.emplace_back(c); |
| 3547 | } |
| 3548 | |
| 3549 | - try |
| 3550 | + try |
| 3551 | { |
| 3552 | server.create_surface(&message, c->response.get(), |
| 3553 | gp::NewCallback(this, &MirConnection::surface_created, c.get())); |
| 3554 | @@ -377,7 +377,7 @@ |
| 3555 | if (request_it == surface_requests.end()) |
| 3556 | return; |
| 3557 | |
| 3558 | - auto surface_proto = request->response; |
| 3559 | + auto surface_proto = request->response; |
| 3560 | auto callback = request->cb; |
| 3561 | auto context = request->context; |
| 3562 | auto const& spec = request->spec; |
| 3563 | @@ -414,7 +414,7 @@ |
| 3564 | reason += surface_proto->error(); |
| 3565 | if (surface_proto->has_error() && !surface_proto->has_id()) |
| 3566 | reason += " and "; |
| 3567 | - if (!surface_proto->has_id()) |
| 3568 | + if (!surface_proto->has_id()) |
| 3569 | reason += "Server assigned surface no id"; |
| 3570 | auto id = next_error_id(lock); |
| 3571 | surf = std::make_shared<MirSurface>(reason, this, id, request->wh); |
| 3572 | @@ -505,7 +505,7 @@ |
| 3573 | callback(surface, context); |
| 3574 | auto id = surface->id(); |
| 3575 | surface_map->erase(mf::SurfaceId(id)); |
| 3576 | - return new_wait_handle; |
| 3577 | + return new_wait_handle; |
| 3578 | } |
| 3579 | |
| 3580 | SurfaceRelease surf_release{surface, new_wait_handle, callback, context}; |
| 3581 | @@ -1245,7 +1245,7 @@ |
| 3582 | std::unique_lock<decltype(mutex)> lock(mutex); |
| 3583 | mf::BufferStreamId id(next_error_id(lock).as_value()); |
| 3584 | auto chain = std::make_shared<mcl::ErrorChain>(this, id.as_value(), error_msg); |
| 3585 | - surface_map->insert(id, chain); |
| 3586 | + surface_map->insert(id, chain); |
| 3587 | |
| 3588 | if (request->callback) |
| 3589 | request->callback(static_cast<MirPresentationChain*>(chain.get()), request->context); |
| 3590 | |
| 3591 | === modified file 'src/client/mir_connection.h' |
| 3592 | --- src/client/mir_connection.h 2016-10-13 16:32:59 +0000 |
| 3593 | +++ src/client/mir_connection.h 2016-10-27 03:52:22 +0000 |
| 3594 | @@ -337,7 +337,6 @@ |
| 3595 | std::unique_ptr<google::protobuf::Closure> const pong_callback; |
| 3596 | |
| 3597 | std::unique_ptr<mir::dispatch::ThreadedDispatcher> const eventloop; |
| 3598 | - |
| 3599 | |
| 3600 | struct SurfaceRelease; |
| 3601 | struct StreamRelease; |
| 3602 | |
| 3603 | === modified file 'src/client/mir_cursor_api.cpp' |
| 3604 | --- src/client/mir_cursor_api.cpp 2016-10-12 10:12:15 +0000 |
| 3605 | +++ src/client/mir_cursor_api.cpp 2016-10-27 03:52:22 +0000 |
| 3606 | @@ -47,7 +47,7 @@ |
| 3607 | |
| 3608 | MirCursorConfiguration::MirCursorConfiguration(char const* name) : |
| 3609 | name{name ? name : std::string()}, |
| 3610 | - stream(nullptr) |
| 3611 | + stream(nullptr) |
| 3612 | { |
| 3613 | } |
| 3614 | |
| 3615 | @@ -65,7 +65,7 @@ |
| 3616 | |
| 3617 | MirCursorConfiguration* mir_cursor_configuration_from_name(char const* name) |
| 3618 | { |
| 3619 | - try |
| 3620 | + try |
| 3621 | { |
| 3622 | return new MirCursorConfiguration(name); |
| 3623 | } |
| 3624 | @@ -79,7 +79,7 @@ |
| 3625 | MirCursorConfiguration* mir_cursor_configuration_from_buffer_stream(MirBufferStream const* stream, int hotspot_x, |
| 3626 | int hotspot_y) |
| 3627 | { |
| 3628 | - try |
| 3629 | + try |
| 3630 | { |
| 3631 | return new MirCursorConfiguration(reinterpret_cast<mcl::ClientBufferStream const*>(stream), hotspot_x, hotspot_y); |
| 3632 | } |
| 3633 | |
| 3634 | === modified file 'src/client/mir_surface.cpp' |
| 3635 | --- src/client/mir_surface.cpp 2016-10-12 06:03:15 +0000 |
| 3636 | +++ src/client/mir_surface.cpp 2016-10-27 03:52:22 +0000 |
| 3637 | @@ -149,7 +149,7 @@ |
| 3638 | |
| 3639 | if (surface_proto.fd_size() > 0 && handle_event_callback) |
| 3640 | { |
| 3641 | - input_thread = std::make_shared<md::ThreadedDispatcher>("Input dispatch", |
| 3642 | + input_thread = std::make_shared<md::ThreadedDispatcher>("Input dispatch", |
| 3643 | input_platform->create_input_receiver( surface_proto.fd(0), keymapper, handle_event_callback)); |
| 3644 | } |
| 3645 | |
| 3646 | @@ -271,11 +271,11 @@ |
| 3647 | } |
| 3648 | } |
| 3649 | } |
| 3650 | - |
| 3651 | + |
| 3652 | configure_cursor_wait_handle.expect_result(); |
| 3653 | server->configure_cursor(&setting, void_response.get(), |
| 3654 | google::protobuf::NewCallback(this, &MirSurface::on_cursor_configured)); |
| 3655 | - |
| 3656 | + |
| 3657 | return &configure_cursor_wait_handle; |
| 3658 | } |
| 3659 | |
| 3660 | @@ -507,7 +507,7 @@ |
| 3661 | mir::client::ClientBufferStream* MirSurface::get_buffer_stream() |
| 3662 | { |
| 3663 | std::lock_guard<decltype(mutex)> lock(mutex); |
| 3664 | - |
| 3665 | + |
| 3666 | return default_stream.get(); |
| 3667 | } |
| 3668 | |
| 3669 | |
| 3670 | === modified file 'src/client/mir_surface.h' |
| 3671 | --- src/client/mir_surface.h 2016-10-21 07:53:23 +0000 |
| 3672 | +++ src/client/mir_surface.h 2016-10-27 03:52:22 +0000 |
| 3673 | @@ -181,7 +181,7 @@ |
| 3674 | // out into a separate class in the libmirclient-debug DSO. |
| 3675 | bool translate_to_screen_coordinates(int x, int y, |
| 3676 | int* screen_x, int* screen_y); |
| 3677 | - |
| 3678 | + |
| 3679 | // Non-blocking |
| 3680 | int attrib(MirSurfaceAttrib a) const; |
| 3681 | |
| 3682 | |
| 3683 | === modified file 'src/client/mir_surface_api.cpp' |
| 3684 | --- src/client/mir_surface_api.cpp 2016-10-21 09:20:55 +0000 |
| 3685 | +++ src/client/mir_surface_api.cpp 2016-10-27 03:52:22 +0000 |
| 3686 | @@ -458,7 +458,7 @@ |
| 3687 | MirWaitHandle* mir_surface_configure_cursor(MirSurface* surface, MirCursorConfiguration const* cursor) |
| 3688 | { |
| 3689 | MirWaitHandle *result = nullptr; |
| 3690 | - |
| 3691 | + |
| 3692 | try |
| 3693 | { |
| 3694 | if (surface) |
| 3695 | @@ -601,7 +601,7 @@ |
| 3696 | if (spec->streams.is_set()) |
| 3697 | spec->streams.value().push_back(info); |
| 3698 | else |
| 3699 | - spec->streams = std::vector<ContentInfo>{info}; |
| 3700 | + spec->streams = std::vector<ContentInfo>{info}; |
| 3701 | } |
| 3702 | catch (std::exception const& ex) |
| 3703 | { |
| 3704 | @@ -621,7 +621,7 @@ |
| 3705 | if (spec->streams.is_set()) |
| 3706 | spec->streams.value().push_back(info); |
| 3707 | else |
| 3708 | - spec->streams = std::vector<ContentInfo>{info}; |
| 3709 | + spec->streams = std::vector<ContentInfo>{info}; |
| 3710 | } |
| 3711 | catch (std::exception const& ex) |
| 3712 | { |
| 3713 | |
| 3714 | === modified file 'src/client/rpc/CMakeLists.txt' |
| 3715 | --- src/client/rpc/CMakeLists.txt 2016-08-01 07:24:32 +0000 |
| 3716 | +++ src/client/rpc/CMakeLists.txt 2016-10-27 03:52:22 +0000 |
| 3717 | @@ -1,4 +1,4 @@ |
| 3718 | -add_library(mirclientrpc OBJECT |
| 3719 | +add_library(mirclientrpc OBJECT |
| 3720 | |
| 3721 | mir_basic_rpc_channel.cpp |
| 3722 | null_rpc_report.cpp |
| 3723 | |
| 3724 | === modified file 'src/client/rpc/mir_protobuf_rpc_channel.cpp' |
| 3725 | --- src/client/rpc/mir_protobuf_rpc_channel.cpp 2016-10-12 06:03:15 +0000 |
| 3726 | +++ src/client/rpc/mir_protobuf_rpc_channel.cpp 2016-10-27 03:52:22 +0000 |
| 3727 | @@ -100,9 +100,9 @@ |
| 3728 | (*lifecycle_control)(mir_lifecycle_connection_lost); |
| 3729 | } |
| 3730 | pending_calls.force_completion(); |
| 3731 | - //NB: once the old semantics are not around, this explicit call to notify |
| 3732 | + //NB: once the old semantics are not around, this explicit call to notify |
| 3733 | //the streams of disconnection shouldn't be needed. |
| 3734 | - if (auto map = surface_map.lock()) |
| 3735 | + if (auto map = surface_map.lock()) |
| 3736 | { |
| 3737 | map->with_all_streams_do( |
| 3738 | [](mcl::ClientBufferStream* receiver) { |
| 3739 | @@ -324,7 +324,7 @@ |
| 3740 | receiver->buffer_available(seq.buffer_request().buffer()); |
| 3741 | }); |
| 3742 | } |
| 3743 | - |
| 3744 | + |
| 3745 | else if (seq.buffer_request().has_operation()) |
| 3746 | { |
| 3747 | auto stream_cmd = seq.buffer_request().operation(); |
| 3748 | @@ -334,7 +334,7 @@ |
| 3749 | { |
| 3750 | case mp::BufferOperation::add: |
| 3751 | buffer = buffer_factory->generate_buffer(seq.buffer_request().buffer()); |
| 3752 | - map->insert(buffer_id, buffer); |
| 3753 | + map->insert(buffer_id, buffer); |
| 3754 | buffer->received(); |
| 3755 | break; |
| 3756 | case mp::BufferOperation::update: |
| 3757 | |
| 3758 | === modified file 'src/client/surface_map.h' |
| 3759 | --- src/client/surface_map.h 2016-07-18 07:38:38 +0000 |
| 3760 | +++ src/client/surface_map.h 2016-10-27 03:52:22 +0000 |
| 3761 | @@ -47,7 +47,7 @@ |
| 3762 | virtual void with_all_streams_do(std::function<void(ClientBufferStream*)> const&) const = 0; |
| 3763 | virtual std::shared_ptr<MirBuffer> buffer(int buffer_id) const = 0; |
| 3764 | virtual void insert(int buffer_id, std::shared_ptr<MirBuffer> const& buffer) = 0; |
| 3765 | - virtual void erase(int buffer_id) = 0; |
| 3766 | + virtual void erase(int buffer_id) = 0; |
| 3767 | |
| 3768 | protected: |
| 3769 | virtual ~SurfaceMap() = default; |
| 3770 | |
| 3771 | === modified file 'src/client/symbols-debug.map' |
| 3772 | --- src/client/symbols-debug.map 2015-06-17 05:20:42 +0000 |
| 3773 | +++ src/client/symbols-debug.map 2016-10-27 03:52:22 +0000 |
| 3774 | @@ -1,5 +1,5 @@ |
| 3775 | MIR_CLIENT_DEBUG_9 { |
| 3776 | - global: |
| 3777 | + global: |
| 3778 | mir_debug_*; |
| 3779 | local: *; |
| 3780 | }; |
| 3781 | |
| 3782 | === modified file 'src/client/symbols.map' |
| 3783 | --- src/client/symbols.map 2016-10-13 16:32:59 +0000 |
| 3784 | +++ src/client/symbols.map 2016-10-27 03:52:22 +0000 |
| 3785 | @@ -299,7 +299,7 @@ |
| 3786 | |
| 3787 | MIR_CLIENT_DETAIL_9 { |
| 3788 | global: |
| 3789 | - extern "C++" { |
| 3790 | + extern "C++" { |
| 3791 | mir::events::make_event*; |
| 3792 | mir::events::add_touch*; |
| 3793 | mir::input::android::Lexicon::translate*; |
| 3794 | @@ -331,12 +331,12 @@ |
| 3795 | typeinfo?for?mir::client::DefaultConnectionConfiguration; |
| 3796 | vtable?for?mir::client::DefaultConnectionConfiguration; |
| 3797 | mir::operator???std::ostream???Mir* |
| 3798 | - }; |
| 3799 | + }; |
| 3800 | }; |
| 3801 | |
| 3802 | MIR_CLIENT_DETAIL_9v18 { |
| 3803 | global: |
| 3804 | - extern "C++" { |
| 3805 | + extern "C++" { |
| 3806 | mir::client::DefaultConnectionConfiguration::the_input_devices*; |
| 3807 | mir::events::set_modifier*; |
| 3808 | mir::events::set_cursor_position*; |
| 3809 | @@ -346,7 +346,7 @@ |
| 3810 | |
| 3811 | MIR_CLIENT_DETAIL_9v19 { |
| 3812 | global: |
| 3813 | - extern "C++" { |
| 3814 | + extern "C++" { |
| 3815 | mir::input::android::android_pointer_action_from_mir*; |
| 3816 | mir::events::serialize_event*; |
| 3817 | mir::events::deserialize_event*; |
| 3818 | @@ -355,7 +355,7 @@ |
| 3819 | |
| 3820 | MIR_CLIENT_DETAIL_0.21 { |
| 3821 | global: |
| 3822 | - extern "C++" { |
| 3823 | + extern "C++" { |
| 3824 | mir::client::DefaultConnectionConfiguration::the_buffer_factory*; |
| 3825 | }; |
| 3826 | } MIR_CLIENT_DETAIL_9v19; |
| 3827 | @@ -397,7 +397,7 @@ |
| 3828 | |
| 3829 | MIR_CLIENT_DETAIL_0.24 { |
| 3830 | global: |
| 3831 | - extern "C++" { |
| 3832 | + extern "C++" { |
| 3833 | mir::input::receiver::XKBMapper::XKBMapper*; |
| 3834 | mir::input::receiver::XKBMapper::?XKBMapper*; |
| 3835 | mir::input::receiver::XKBMapper::set_key_state*; |
| 3836 | |
| 3837 | === modified file 'src/common/fd/fd.cpp' |
| 3838 | --- src/common/fd/fd.cpp 2015-02-22 07:46:25 +0000 |
| 3839 | +++ src/common/fd/fd.cpp 2016-10-27 03:52:22 +0000 |
| 3840 | @@ -36,7 +36,7 @@ |
| 3841 | if (!fd) return; |
| 3842 | if (*fd > mir::Fd::invalid) ::close(*fd); |
| 3843 | delete fd; |
| 3844 | - }} |
| 3845 | + }} |
| 3846 | { |
| 3847 | } |
| 3848 | |
| 3849 | |
| 3850 | === modified file 'src/common/fd/fd_socket_transmission.cpp' |
| 3851 | --- src/common/fd/fd_socket_transmission.cpp 2015-02-22 07:46:25 +0000 |
| 3852 | +++ src/common/fd/fd_socket_transmission.cpp 2016-10-27 03:52:22 +0000 |
| 3853 | @@ -105,13 +105,13 @@ |
| 3854 | struct iovec iov; |
| 3855 | iov.iov_base = static_cast<uint8_t*>(buffer) + bytes_read; |
| 3856 | iov.iov_len = bytes_requested - bytes_read; |
| 3857 | - |
| 3858 | + |
| 3859 | // Allocate space for control message |
| 3860 | static auto const builtin_n_fds = 5; |
| 3861 | static auto const builtin_cmsg_space = CMSG_SPACE(builtin_n_fds * sizeof(int)); |
| 3862 | auto const fds_bytes = (fds.size() - fds_read) * sizeof(int); |
| 3863 | mir::VariableLengthArray<builtin_cmsg_space> control{CMSG_SPACE(fds_bytes)}; |
| 3864 | - |
| 3865 | + |
| 3866 | // Message to read |
| 3867 | struct msghdr header; |
| 3868 | header.msg_name = NULL; |
| 3869 | @@ -121,7 +121,7 @@ |
| 3870 | header.msg_controllen = control.size(); |
| 3871 | header.msg_control = control.data(); |
| 3872 | header.msg_flags = 0; |
| 3873 | - |
| 3874 | + |
| 3875 | ssize_t const result = recvmsg(socket, &header, MSG_NOSIGNAL | MSG_WAITALL); |
| 3876 | if (result == 0) |
| 3877 | BOOST_THROW_EXCEPTION(socket_disconnected_error("Failed to read message from server: server has shutdown")); |
| 3878 | @@ -142,7 +142,7 @@ |
| 3879 | } |
| 3880 | |
| 3881 | bytes_read += result; |
| 3882 | - |
| 3883 | + |
| 3884 | // If we get a proper control message, copy the received |
| 3885 | // file descriptors back to the caller |
| 3886 | struct cmsghdr const* const cmsg = CMSG_FIRSTHDR(&header); |
| 3887 | |
| 3888 | === modified file 'src/common/sharedlibrary/CMakeLists.txt' |
| 3889 | --- src/common/sharedlibrary/CMakeLists.txt 2016-10-20 14:35:09 +0000 |
| 3890 | +++ src/common/sharedlibrary/CMakeLists.txt 2016-10-27 03:52:22 +0000 |
| 3891 | @@ -24,7 +24,7 @@ |
| 3892 | $<TARGET_OBJECTS:mirsharedsharedlibrary> |
| 3893 | ) |
| 3894 | |
| 3895 | -list(APPEND MIR_COMMON_REFERENCES |
| 3896 | +list(APPEND MIR_COMMON_REFERENCES |
| 3897 | ${Boost_LIBRARIES} |
| 3898 | dl |
| 3899 | ) |
| 3900 | |
| 3901 | === modified file 'src/common/sharedlibrary/module_deleter.cpp' |
| 3902 | --- src/common/sharedlibrary/module_deleter.cpp 2016-07-18 07:38:38 +0000 |
| 3903 | +++ src/common/sharedlibrary/module_deleter.cpp 2016-10-27 03:52:22 +0000 |
| 3904 | @@ -32,13 +32,13 @@ |
| 3905 | |
| 3906 | Dl_info library_info{nullptr, nullptr, nullptr, nullptr}; |
| 3907 | Dl_info executable_info{nullptr, nullptr, nullptr, nullptr}; |
| 3908 | - |
| 3909 | + |
| 3910 | dladdr(dlsym(nullptr, "main"), &executable_info); |
| 3911 | dladdr(address, &library_info); |
| 3912 | - |
| 3913 | + |
| 3914 | if (library_info.dli_fbase == executable_info.dli_fbase) |
| 3915 | return nullptr; |
| 3916 | - |
| 3917 | + |
| 3918 | return std::make_shared<mir::SharedLibrary>(library_info.dli_fname); |
| 3919 | } |
| 3920 | } |
| 3921 | |
| 3922 | === modified file 'src/common/symbols.map' |
| 3923 | --- src/common/symbols.map 2016-10-20 14:35:09 +0000 |
| 3924 | +++ src/common/symbols.map 2016-10-27 03:52:22 +0000 |
| 3925 | @@ -2,7 +2,7 @@ |
| 3926 | global: |
| 3927 | extern "C++" { |
| 3928 | # The following symbols come from running a script over the generated docs. Vis: |
| 3929 | -# ../tools/process_doxygen_xml.py doc/xml/*.xml | grep "^mircommon public" | sed "s/mircommon public: / /" | sort |
| 3930 | +# ../tools/process_doxygen_xml.py doc/xml/*.xml | grep "^mircommon public" | sed "s/mircommon public: / /" | sort |
| 3931 | mir::detail::libname_impl*; |
| 3932 | mir::detail::RefCountedLibrary::operator*; |
| 3933 | mir::detail::RefCountedLibrary::?RefCountedLibrary*; |
| 3934 | |
| 3935 | === modified file 'src/cookie/authority.cpp' |
| 3936 | --- src/cookie/authority.cpp 2016-07-18 07:38:38 +0000 |
| 3937 | +++ src/cookie/authority.cpp 2016-10-27 03:52:22 +0000 |
| 3938 | @@ -68,7 +68,7 @@ |
| 3939 | unsigned got = read(fd, buffer.data(), size); |
| 3940 | int error = errno; |
| 3941 | close(fd); |
| 3942 | - |
| 3943 | + |
| 3944 | if (got != size) |
| 3945 | BOOST_THROW_EXCEPTION(std::system_error(error, std::system_category(), |
| 3946 | "read failed on urandom")); |
| 3947 | |
| 3948 | === modified file 'src/cookie/hmac_cookie.cpp' |
| 3949 | --- src/cookie/hmac_cookie.cpp 2016-01-22 15:12:20 +0000 |
| 3950 | +++ src/cookie/hmac_cookie.cpp 2016-10-27 03:52:22 +0000 |
| 3951 | @@ -48,6 +48,6 @@ |
| 3952 | cookie_ptr += sizeof(timestamp_); |
| 3953 | |
| 3954 | memcpy(cookie_ptr, mac_.data(), mac_.size()); |
| 3955 | - |
| 3956 | + |
| 3957 | return serialized_cookie; |
| 3958 | } |
| 3959 | |
| 3960 | === modified file 'src/include/client/mir_toolkit/mir_buffer.h' |
| 3961 | --- src/include/client/mir_toolkit/mir_buffer.h 2016-10-12 06:03:15 +0000 |
| 3962 | +++ src/include/client/mir_toolkit/mir_buffer.h 2016-10-27 03:52:22 +0000 |
| 3963 | @@ -91,7 +91,7 @@ |
| 3964 | * Access the MirBufferPackage |
| 3965 | * |
| 3966 | * \param [in] buffer The buffer |
| 3967 | - * \return The MirBufferPackage representing buffer |
| 3968 | + * \return The MirBufferPackage representing buffer |
| 3969 | */ |
| 3970 | MirBufferPackage* mir_buffer_get_buffer_package(MirBuffer* buffer); |
| 3971 | |
| 3972 | @@ -126,7 +126,7 @@ |
| 3973 | * |
| 3974 | * \warning any fence currently associated with buffer will be replaced in favor |
| 3975 | * of fence without waiting for the replaced fence to clear |
| 3976 | - * \warning The Mir client api assumes ownership of the fence fd. |
| 3977 | + * \warning The Mir client api assumes ownership of the fence fd. |
| 3978 | * \param [in] buffer The buffer |
| 3979 | * \param [in] fence The fence that will be associated with buffer. If negative, |
| 3980 | * this will remove the fence associated with this buffer. |
| 3981 | @@ -139,7 +139,7 @@ |
| 3982 | MirBufferAccess access); |
| 3983 | |
| 3984 | /** Wait for the fence associated with the buffer to signal. After returning, |
| 3985 | - * it is permissible to access the buffer's content for the designated purpose in access. |
| 3986 | + * it is permissible to access the buffer's content for the designated purpose in access. |
| 3987 | * |
| 3988 | * \param [in] buffer The buffer |
| 3989 | * \param [in] access The access to wait for. |
| 3990 | |
| 3991 | === modified file 'src/include/client/mir_toolkit/mir_buffer_private.h' |
| 3992 | --- src/include/client/mir_toolkit/mir_buffer_private.h 2016-10-07 17:08:50 +0000 |
| 3993 | +++ src/include/client/mir_toolkit/mir_buffer_private.h 2016-10-27 03:52:22 +0000 |
| 3994 | @@ -34,7 +34,7 @@ |
| 3995 | * |
| 3996 | * \param [in] buffer The buffer |
| 3997 | * \param [out] target The target to use |
| 3998 | - * \param [out] client_buffer The EGLClientBuffer to use |
| 3999 | + * \param [out] client_buffer The EGLClientBuffer to use |
| 4000 | * \param [out] attrs The attributes to use |
| 4001 | **/ |
| 4002 | void mir_buffer_egl_image_parameters( |
| 4003 | |
| 4004 | === modified file 'src/include/client/mir_toolkit/mir_presentation_chain.h' |
| 4005 | --- src/include/client/mir_toolkit/mir_presentation_chain.h 2016-07-18 07:38:38 +0000 |
| 4006 | +++ src/include/client/mir_toolkit/mir_presentation_chain.h 2016-10-27 03:52:22 +0000 |
| 4007 | @@ -50,7 +50,7 @@ |
| 4008 | MirPresentationChain* presentation_chain); |
| 4009 | |
| 4010 | /** |
| 4011 | - * Create a new presentation chain. |
| 4012 | + * Create a new presentation chain. |
| 4013 | * |
| 4014 | * \param [in] connection A valid connection |
| 4015 | * \param [in] callback Callback to be invoked when the request |
| 4016 | @@ -87,7 +87,7 @@ |
| 4017 | * The server will notify the client when the buffer is available again via |
| 4018 | * the callback registered during buffer creation. |
| 4019 | * |
| 4020 | - * \warning: Once submitted, the buffer cannot be modified until the server |
| 4021 | + * \warning: Once submitted, the buffer cannot be modified until the server |
| 4022 | * has returned it. There's no guarantee about how long a server |
| 4023 | * may hold the submitted buffer. |
| 4024 | * |
| 4025 | @@ -108,7 +108,7 @@ |
| 4026 | * mir_surface_spec_add_buffer_stream will set the bottom-most content, |
| 4027 | * and subsequent calls to either will stack the content on top. |
| 4028 | * |
| 4029 | - * \warning Setting the dimensions or displacements to exceed the |
| 4030 | + * \warning Setting the dimensions or displacements to exceed the |
| 4031 | * bounds of MirSurface may result in clipping to the size |
| 4032 | * of the MirSurface, at the server's discretion. |
| 4033 | * |
| 4034 | @@ -132,7 +132,7 @@ |
| 4035 | * mir_surface_spec_add_buffer_stream will set the bottom-most content, |
| 4036 | * and subsequent calls to either will stack the content on top. |
| 4037 | * |
| 4038 | - * \warning Setting the displacements to exceed the |
| 4039 | + * \warning Setting the displacements to exceed the |
| 4040 | * bounds of MirSurface may result in clipping to the size |
| 4041 | * of the MirSurface, at the server's discretion. |
| 4042 | * |
| 4043 | |
| 4044 | === modified file 'src/include/common/mir/events/event_private.h' |
| 4045 | --- src/include/common/mir/events/event_private.h 2016-07-18 07:38:38 +0000 |
| 4046 | +++ src/include/common/mir/events/event_private.h 2016-10-27 03:52:22 +0000 |
| 4047 | @@ -17,7 +17,7 @@ |
| 4048 | */ |
| 4049 | |
| 4050 | // ================================== |
| 4051 | -// |
| 4052 | +// |
| 4053 | // Direct access to MirEvent deprecated. Prefer mir_event_* family of functions. |
| 4054 | // |
| 4055 | // ================================== |
| 4056 | |
| 4057 | === modified file 'src/include/common/mir/protobuf/protocol_version.h' |
| 4058 | --- src/include/common/mir/protobuf/protocol_version.h 2016-07-18 07:38:38 +0000 |
| 4059 | +++ src/include/common/mir/protobuf/protocol_version.h 2016-10-27 03:52:22 +0000 |
| 4060 | @@ -26,7 +26,7 @@ |
| 4061 | namespace protobuf |
| 4062 | { |
| 4063 | inline constexpr int current_protocol_version() |
| 4064 | -{ |
| 4065 | +{ |
| 4066 | return MIR_VERSION_NUMBER(0,3,3); |
| 4067 | } |
| 4068 | |
| 4069 | |
| 4070 | === modified file 'src/include/server/mir/frontend/fd_sets.h' |
| 4071 | --- src/include/server/mir/frontend/fd_sets.h 2016-01-29 08:18:22 +0000 |
| 4072 | +++ src/include/server/mir/frontend/fd_sets.h 2016-10-27 03:52:22 +0000 |
| 4073 | @@ -20,7 +20,7 @@ |
| 4074 | |
| 4075 | #include <vector> |
| 4076 | #include <initializer_list> |
| 4077 | -#include "mir/fd.h" |
| 4078 | +#include "mir/fd.h" |
| 4079 | |
| 4080 | namespace mir |
| 4081 | { |
| 4082 | |
| 4083 | === modified file 'src/include/server/mir/input/scene.h' |
| 4084 | --- src/include/server/mir/input/scene.h 2015-02-22 07:46:25 +0000 |
| 4085 | +++ src/include/server/mir/input/scene.h 2016-10-27 03:52:22 +0000 |
| 4086 | @@ -54,7 +54,7 @@ |
| 4087 | // Within the set of overlay renderables, rendering order is undefined. |
| 4088 | virtual void add_input_visualization(std::shared_ptr<graphics::Renderable> const& overlay) = 0; |
| 4089 | virtual void remove_input_visualization(std::weak_ptr<graphics::Renderable> const& overlay) = 0; |
| 4090 | - |
| 4091 | + |
| 4092 | // As input visualizations added through the overlay system will not use the standard SurfaceObserver |
| 4093 | // mechanism, we require this method to trigger recomposition. |
| 4094 | // TODO: How can something like SurfaceObserver be adapted to work with non surface renderables? |
| 4095 | |
| 4096 | === modified file 'src/include/server/mir/scene/legacy_scene_change_notification.h' |
| 4097 | --- src/include/server/mir/scene/legacy_scene_change_notification.h 2016-07-21 13:10:03 +0000 |
| 4098 | +++ src/include/server/mir/scene/legacy_scene_change_notification.h 2016-10-27 03:52:22 +0000 |
| 4099 | @@ -33,7 +33,7 @@ |
| 4100 | class SurfaceObserver; |
| 4101 | |
| 4102 | // A simple implementation of surface observer which forwards all changes to a provided callback. |
| 4103 | -// Also installs surface observers on each added surface which in turn forward each change to |
| 4104 | +// Also installs surface observers on each added surface which in turn forward each change to |
| 4105 | // said callback. |
| 4106 | class LegacySceneChangeNotification : public Observer |
| 4107 | { |
| 4108 | @@ -51,7 +51,7 @@ |
| 4109 | void surface_added(Surface* surface) override; |
| 4110 | void surface_removed(Surface* surface) override; |
| 4111 | void surfaces_reordered() override; |
| 4112 | - |
| 4113 | + |
| 4114 | void scene_changed() override; |
| 4115 | |
| 4116 | void surface_exists(Surface* surface) override; |
| 4117 | @@ -64,7 +64,7 @@ |
| 4118 | |
| 4119 | std::mutex surface_observers_guard; |
| 4120 | std::map<Surface*, std::weak_ptr<SurfaceObserver>> surface_observers; |
| 4121 | - |
| 4122 | + |
| 4123 | void add_surface_observer(Surface* surface); |
| 4124 | }; |
| 4125 | |
| 4126 | |
| 4127 | === modified file 'src/platform/symbols.map' |
| 4128 | --- src/platform/symbols.map 2016-10-12 10:29:45 +0000 |
| 4129 | +++ src/platform/symbols.map 2016-10-27 03:52:22 +0000 |
| 4130 | @@ -2,7 +2,7 @@ |
| 4131 | global: |
| 4132 | extern "C++" { |
| 4133 | # The following symbols come from running a script over the generated docs. Vis: |
| 4134 | -# ../tools/process_doxygen_xml.py doc/xml/*.xml | grep "^mirplatform public" | sed "s/mirplatform public: / /" | sort |
| 4135 | +# ../tools/process_doxygen_xml.py doc/xml/*.xml | grep "^mirplatform public" | sed "s/mirplatform public: / /" | sort |
| 4136 | mir::graphics::BufferBasic::BufferBasic*; |
| 4137 | mir::graphics::Buffer::Buffer*; |
| 4138 | mir::graphics::Buffer::id*; |
| 4139 | @@ -95,7 +95,7 @@ |
| 4140 | mir::graphics::UserDisplayConfigurationOutput::UserDisplayConfigurationOutput*; |
| 4141 | mir::options::arw_server_socket_opt*; |
| 4142 | # Why are server-only options here in libmirplatform?... |
| 4143 | - mir::options::composite_delay_opt*; |
| 4144 | + mir::options::composite_delay_opt*; |
| 4145 | mir::options::compositor_report_opt*; |
| 4146 | mir::options::Configuration::?Configuration*; |
| 4147 | mir::options::Configuration::Configuration*; |
| 4148 | @@ -223,9 +223,9 @@ |
| 4149 | vtable?for?mir::options::DefaultConfiguration; |
| 4150 | vtable?for?mir::options::Option; |
| 4151 | vtable?for?mir::options::ProgramOption; |
| 4152 | - |
| 4153 | + |
| 4154 | # These are "private" (declared in src/include) but are used by libmirserver. |
| 4155 | - # They are also likely to be needed by any 3rd party "graphics platform" |
| 4156 | + # They are also likely to be needed by any 3rd party "graphics platform" |
| 4157 | # implementation. They should probably become public at some stage. |
| 4158 | mir::graphics::alpha_channel_depth*; |
| 4159 | mir::graphics::blue_channel_depth*; |
| 4160 | |
| 4161 | === modified file 'src/platforms/CMakeLists.txt' |
| 4162 | --- src/platforms/CMakeLists.txt 2016-10-21 07:53:23 +0000 |
| 4163 | +++ src/platforms/CMakeLists.txt 2016-10-27 03:52:22 +0000 |
| 4164 | @@ -14,9 +14,9 @@ |
| 4165 | set(MIR_SERVER_GRAPHICS_PLATFORM_VERSION "MIR_GRAPHICS_PLATFORM_${MIR_SERVER_GRAPHICS_PLATFORM_STANZA_VERSION}") |
| 4166 | set(MIR_SERVER_GRAPHICS_PLATFORM_VERSION ${MIR_SERVER_GRAPHICS_PLATFORM_VERSION} PARENT_SCOPE) |
| 4167 | configure_file( |
| 4168 | - ${CMAKE_CURRENT_SOURCE_DIR}/input_platform_symbols.map.in |
| 4169 | + ${CMAKE_CURRENT_SOURCE_DIR}/input_platform_symbols.map.in |
| 4170 | ${CMAKE_CURRENT_BINARY_DIR}/input_platform_symbols.map) |
| 4171 | -set(MIR_INPUT_PLATFORM_VERSION_SCRIPT |
| 4172 | +set(MIR_INPUT_PLATFORM_VERSION_SCRIPT |
| 4173 | ${CMAKE_CURRENT_BINARY_DIR}/input_platform_symbols.map) |
| 4174 | set(MIR_INPUT_PLATFORM_VERSION_SCRIPT ${MIR_INPUT_PLATFORM_VERSION_SCRIPT} PARENT_SCOPE) |
| 4175 | |
| 4176 | |
| 4177 | === modified file 'src/platforms/android/client/buffer.cpp' |
| 4178 | --- src/platforms/android/client/buffer.cpp 2016-10-12 06:03:15 +0000 |
| 4179 | +++ src/platforms/android/client/buffer.cpp 2016-10-27 03:52:22 +0000 |
| 4180 | @@ -79,7 +79,7 @@ |
| 4181 | |
| 4182 | void mcla::Buffer::update_from(MirBufferPackage const& update_package) |
| 4183 | { |
| 4184 | - if ((update_package.flags & mir_buffer_flag_fenced) && |
| 4185 | + if ((update_package.flags & mir_buffer_flag_fenced) && |
| 4186 | (update_package.fd_items != 0)) |
| 4187 | { |
| 4188 | auto fence_fd = update_package.fd[0]; |
| 4189 | @@ -95,12 +95,12 @@ |
| 4190 | { |
| 4191 | message.flags = mir_buffer_flag_fenced; |
| 4192 | message.fd[0] = fence; |
| 4193 | - message.fd_items = 1; |
| 4194 | + message.fd_items = 1; |
| 4195 | } |
| 4196 | else |
| 4197 | { |
| 4198 | message.flags = 0; |
| 4199 | - message.fd_items = 0; |
| 4200 | + message.fd_items = 0; |
| 4201 | } |
| 4202 | } |
| 4203 | |
| 4204 | @@ -123,9 +123,9 @@ |
| 4205 | if (fence <= mir::Fd::invalid) |
| 4206 | native_buffer->reset_fence(); |
| 4207 | else if (access == mir_read) |
| 4208 | - native_buffer->update_usage(f, mga::BufferAccess::read); |
| 4209 | + native_buffer->update_usage(f, mga::BufferAccess::read); |
| 4210 | else if (access == mir_read_write) |
| 4211 | - native_buffer->update_usage(f, mga::BufferAccess::write); |
| 4212 | + native_buffer->update_usage(f, mga::BufferAccess::write); |
| 4213 | else |
| 4214 | BOOST_THROW_EXCEPTION(std::invalid_argument("invalid MirBufferAccess")); |
| 4215 | } |
| 4216 | @@ -144,9 +144,9 @@ |
| 4217 | ms = ms - std::chrono::milliseconds{1}; |
| 4218 | |
| 4219 | if (access == mir_read) |
| 4220 | - return native_buffer->ensure_available_for(mga::BufferAccess::read, ms); |
| 4221 | + return native_buffer->ensure_available_for(mga::BufferAccess::read, ms); |
| 4222 | if (access == mir_read_write) |
| 4223 | - return native_buffer->ensure_available_for(mga::BufferAccess::write, ms); |
| 4224 | + return native_buffer->ensure_available_for(mga::BufferAccess::write, ms); |
| 4225 | |
| 4226 | BOOST_THROW_EXCEPTION(std::invalid_argument("invalid MirBufferAccess")); |
| 4227 | } |
| 4228 | |
| 4229 | === modified file 'src/platforms/android/client/buffer.h' |
| 4230 | --- src/platforms/android/client/buffer.h 2016-10-12 06:03:15 +0000 |
| 4231 | +++ src/platforms/android/client/buffer.h 2016-10-27 03:52:22 +0000 |
| 4232 | @@ -62,7 +62,7 @@ |
| 4233 | void pack_native_window_buffer(); |
| 4234 | |
| 4235 | mir::Fd mutable api_user_fence; |
| 4236 | - |
| 4237 | + |
| 4238 | std::shared_ptr<BufferRegistrar> const buffer_registrar; |
| 4239 | std::shared_ptr<graphics::android::NativeBuffer> const native_buffer; |
| 4240 | MirPixelFormat const buffer_pf; |
| 4241 | |
| 4242 | === modified file 'src/platforms/android/client/egl_native_surface_interpreter.cpp' |
| 4243 | --- src/platforms/android/client/egl_native_surface_interpreter.cpp 2016-10-21 07:53:23 +0000 |
| 4244 | +++ src/platforms/android/client/egl_native_surface_interpreter.cpp 2016-10-27 03:52:22 +0000 |
| 4245 | @@ -42,7 +42,7 @@ |
| 4246 | { |
| 4247 | auto buffer = surface.get_current_buffer(); |
| 4248 | auto buffer_to_driver = mga::to_native_buffer_checked(buffer->native_buffer_handle()); |
| 4249 | - |
| 4250 | + |
| 4251 | ANativeWindowBuffer* anwb = buffer_to_driver->anwb(); |
| 4252 | anwb->format = driver_pixel_format; |
| 4253 | return buffer_to_driver.get(); |
| 4254 | @@ -91,7 +91,7 @@ |
| 4255 | } |
| 4256 | |
| 4257 | void mcla::EGLNativeSurfaceInterpreter::sync_to_display(bool should_sync) |
| 4258 | -{ |
| 4259 | +{ |
| 4260 | surface.request_and_wait_for_configure(mir_surface_attrib_swapinterval, should_sync); |
| 4261 | } |
| 4262 | |
| 4263 | |
| 4264 | === modified file 'src/platforms/android/common/android_native_buffer.cpp' |
| 4265 | --- src/platforms/android/common/android_native_buffer.cpp 2016-10-12 06:03:15 +0000 |
| 4266 | +++ src/platforms/android/common/android_native_buffer.cpp 2016-10-27 03:52:22 +0000 |
| 4267 | @@ -40,7 +40,7 @@ |
| 4268 | { |
| 4269 | if ((access == mga::BufferAccess::read) && (intent == mga::BufferAccess::read)) |
| 4270 | return; |
| 4271 | - |
| 4272 | + |
| 4273 | fence->wait(); |
| 4274 | } |
| 4275 | |
| 4276 | |
| 4277 | === modified file 'src/platforms/android/common/egl_sync_fence.cpp' |
| 4278 | --- src/platforms/android/common/egl_sync_fence.cpp 2016-07-18 07:38:38 +0000 |
| 4279 | +++ src/platforms/android/common/egl_sync_fence.cpp 2016-10-27 03:52:22 +0000 |
| 4280 | @@ -64,7 +64,7 @@ |
| 4281 | if (sync_point == EGL_NO_SYNC_KHR) |
| 4282 | { |
| 4283 | std::stringstream str; |
| 4284 | - str << "failed to add sync point to command buffer: 0x" << std::hex << eglGetError(); |
| 4285 | + str << "failed to add sync point to command buffer: 0x" << std::hex << eglGetError(); |
| 4286 | log_error(str.str()); |
| 4287 | } |
| 4288 | } |
| 4289 | |
| 4290 | === modified file 'src/platforms/android/common/native_window_report.cpp' |
| 4291 | --- src/platforms/android/common/native_window_report.cpp 2016-07-11 12:49:51 +0000 |
| 4292 | +++ src/platforms/android/common/native_window_report.cpp 2016-10-27 03:52:22 +0000 |
| 4293 | @@ -100,7 +100,7 @@ |
| 4294 | |
| 4295 | std::ostream& operator<<(std::ostream& out, ANativeWindow const* window) |
| 4296 | { |
| 4297 | - return out << "addr (" << static_cast<void const*>(window) << "): "; |
| 4298 | + return out << "addr (" << static_cast<void const*>(window) << "): "; |
| 4299 | } |
| 4300 | } |
| 4301 | |
| 4302 | @@ -121,7 +121,7 @@ |
| 4303 | else |
| 4304 | str << "none"; |
| 4305 | |
| 4306 | - logger->log(mir::logging::Severity::debug, str.str(), component_name); |
| 4307 | + logger->log(mir::logging::Severity::debug, str.str(), component_name); |
| 4308 | } |
| 4309 | |
| 4310 | void mga::ConsoleNativeWindowReport::buffer_event( |
| 4311 | @@ -129,14 +129,14 @@ |
| 4312 | { |
| 4313 | std::stringstream str; |
| 4314 | str << win << type << "_deprecated: " << buf; |
| 4315 | - logger->log(mir::logging::Severity::debug, str.str(), component_name); |
| 4316 | + logger->log(mir::logging::Severity::debug, str.str(), component_name); |
| 4317 | } |
| 4318 | |
| 4319 | void mga::ConsoleNativeWindowReport::query_event(ANativeWindow const* win, int type, int result) const |
| 4320 | { |
| 4321 | std::stringstream str; |
| 4322 | str << std::hex << win << "query: " << NativeQueryKey{type} << ": result: 0x" << result; |
| 4323 | - logger->log(mir::logging::Severity::debug, str.str(), component_name); |
| 4324 | + logger->log(mir::logging::Severity::debug, str.str(), component_name); |
| 4325 | } |
| 4326 | |
| 4327 | void mga::ConsoleNativeWindowReport::perform_event( |
| 4328 | @@ -150,7 +150,7 @@ |
| 4329 | str << ", "; |
| 4330 | str << "0x" << args[i]; |
| 4331 | } |
| 4332 | - logger->log(mir::logging::Severity::debug, str.str(), component_name); |
| 4333 | + logger->log(mir::logging::Severity::debug, str.str(), component_name); |
| 4334 | } |
| 4335 | |
| 4336 | void mga::NullNativeWindowReport::buffer_event(mga::BufferEvent, ANativeWindow const*, ANativeWindowBuffer*, int) const |
| 4337 | |
| 4338 | === modified file 'src/platforms/android/include/android/native_window.h' |
| 4339 | --- src/platforms/android/include/android/native_window.h 2016-01-29 13:10:01 +0000 |
| 4340 | +++ src/platforms/android/include/android/native_window.h 2016-10-27 03:52:22 +0000 |
| 4341 | @@ -16,6 +16,6 @@ |
| 4342 | * Authored by: Kevin DuBois <kevin.dubois@canonical.com> |
| 4343 | */ |
| 4344 | |
| 4345 | -//NOTE: this file exists to workaround a xenial packaging issue |
| 4346 | +//NOTE: this file exists to workaround a xenial packaging issue |
| 4347 | //described in LP: #1539571 |
| 4348 | #include "system/window.h" |
| 4349 | |
| 4350 | === modified file 'src/platforms/android/include/command_stream_sync.h' |
| 4351 | --- src/platforms/android/include/command_stream_sync.h 2016-01-28 17:46:29 +0000 |
| 4352 | +++ src/platforms/android/include/command_stream_sync.h 2016-10-27 03:52:22 +0000 |
| 4353 | @@ -39,7 +39,7 @@ |
| 4354 | virtual bool wait_for(std::chrono::nanoseconds ns) = 0; |
| 4355 | |
| 4356 | virtual ~CommandStreamSync() = default; |
| 4357 | - CommandStreamSync() = default; |
| 4358 | + CommandStreamSync() = default; |
| 4359 | CommandStreamSync(CommandStreamSync const&) = delete; |
| 4360 | CommandStreamSync& operator=(CommandStreamSync const&) = delete; |
| 4361 | }; |
| 4362 | |
| 4363 | === modified file 'src/platforms/android/server/buffer.cpp' |
| 4364 | --- src/platforms/android/server/buffer.cpp 2016-08-30 03:39:59 +0000 |
| 4365 | +++ src/platforms/android/server/buffer.cpp 2016-10-27 03:52:22 +0000 |
| 4366 | @@ -148,7 +148,7 @@ |
| 4367 | std::unique_lock<std::mutex> lk(content_lock); |
| 4368 | |
| 4369 | native_buffer->ensure_available_for(mga::BufferAccess::write); |
| 4370 | - |
| 4371 | + |
| 4372 | auto bpp = MIR_BYTES_PER_PIXEL(pixel_format()); |
| 4373 | size_t buffer_size_bytes = size().height.as_int() * size().width.as_int() * bpp; |
| 4374 | if (buffer_size_bytes != data_size) |
| 4375 | @@ -172,7 +172,7 @@ |
| 4376 | int line_offset_in_source = bpp*width*i; |
| 4377 | memcpy(vaddr + line_offset_in_buffer, data + line_offset_in_source, width * bpp); |
| 4378 | } |
| 4379 | - |
| 4380 | + |
| 4381 | hw_module->unlock(hw_module, native_buffer->handle()); |
| 4382 | } |
| 4383 | |
| 4384 | |
| 4385 | === modified file 'src/platforms/android/server/device_quirks.h' |
| 4386 | --- src/platforms/android/server/device_quirks.h 2016-08-09 08:13:02 +0000 |
| 4387 | +++ src/platforms/android/server/device_quirks.h 2016-10-27 03:52:22 +0000 |
| 4388 | @@ -87,7 +87,7 @@ |
| 4389 | bool const enable_width_alignment_quirk; |
| 4390 | bool const clear_fb_context_fence_; |
| 4391 | bool const fb_ion_heap_; |
| 4392 | - bool const working_egl_sync_; |
| 4393 | + bool const working_egl_sync_; |
| 4394 | }; |
| 4395 | } |
| 4396 | } |
| 4397 | |
| 4398 | === modified file 'src/platforms/android/server/display.cpp' |
| 4399 | --- src/platforms/android/server/display.cpp 2016-10-12 06:03:15 +0000 |
| 4400 | +++ src/platforms/android/server/display.cpp 2016-10-27 03:52:22 +0000 |
| 4401 | @@ -53,8 +53,8 @@ |
| 4402 | int pipes_raw[2] {-1, -1}; |
| 4403 | if (::pipe2(pipes_raw, O_CLOEXEC | O_NONBLOCK)) |
| 4404 | BOOST_THROW_EXCEPTION(std::runtime_error("failed to create display change pipe")); |
| 4405 | - read_pipe = mir::Fd{pipes_raw[0]}; |
| 4406 | - write_pipe = mir::Fd{pipes_raw[1]}; |
| 4407 | + read_pipe = mir::Fd{pipes_raw[0]}; |
| 4408 | + write_pipe = mir::Fd{pipes_raw[1]}; |
| 4409 | } |
| 4410 | |
| 4411 | void notify_change() |
| 4412 | @@ -106,7 +106,7 @@ |
| 4413 | { |
| 4414 | power_mode_safe(mga::DisplayName::primary, control, config.primary(), intended_mode); |
| 4415 | if (config.external().connected) |
| 4416 | - power_mode_safe(mga::DisplayName::external, control, config.external(), intended_mode); |
| 4417 | + power_mode_safe(mga::DisplayName::external, control, config.external(), intended_mode); |
| 4418 | } |
| 4419 | |
| 4420 | std::unique_ptr<mga::ConfigurableDisplayBuffer> create_display_buffer( |
| 4421 | @@ -123,7 +123,7 @@ |
| 4422 | std::shared_ptr<mga::FramebufferBundle> fbs{display_buffer_builder.create_framebuffers(config)}; |
| 4423 | auto cache = std::make_shared<mga::InterpreterCache>(); |
| 4424 | mga::DeviceQuirks quirks(mga::PropertiesOps{}, gl_context); |
| 4425 | - auto interpreter = std::make_shared<mga::ServerRenderWindow>(fbs, config.current_format, cache, quirks); |
| 4426 | + auto interpreter = std::make_shared<mga::ServerRenderWindow>(fbs, config.current_format, cache, quirks); |
| 4427 | auto native_window = std::make_shared<mga::MirNativeWindow>(interpreter, report); |
| 4428 | return std::unique_ptr<mga::ConfigurableDisplayBuffer>(new mga::DisplayBuffer( |
| 4429 | name, |
| 4430 | |
| 4431 | === modified file 'src/platforms/android/server/display_device.h' |
| 4432 | --- src/platforms/android/server/display_device.h 2016-07-18 07:38:38 +0000 |
| 4433 | +++ src/platforms/android/server/display_device.h 2016-10-27 03:52:22 +0000 |
| 4434 | @@ -46,9 +46,9 @@ |
| 4435 | LayerList& list; |
| 4436 | geometry::Displacement list_offset; |
| 4437 | SwappingGLContext& context; |
| 4438 | - RenderableListCompositor& compositor; |
| 4439 | + RenderableListCompositor& compositor; |
| 4440 | }; |
| 4441 | - |
| 4442 | + |
| 4443 | class DisplayDevice |
| 4444 | { |
| 4445 | public: |
| 4446 | |
| 4447 | === modified file 'src/platforms/android/server/fb_device.cpp' |
| 4448 | --- src/platforms/android/server/fb_device.cpp 2016-10-20 15:05:56 +0000 |
| 4449 | +++ src/platforms/android/server/fb_device.cpp 2016-10-27 03:52:22 +0000 |
| 4450 | @@ -49,7 +49,7 @@ |
| 4451 | int enable = 0; |
| 4452 | if (mode == mir_power_mode_on) |
| 4453 | enable = 1; |
| 4454 | - |
| 4455 | + |
| 4456 | if (fb_device->enableScreen) |
| 4457 | fb_device->enableScreen(fb_device.get(), enable); |
| 4458 | } |
| 4459 | |
| 4460 | === modified file 'src/platforms/android/server/graphic_buffer_allocator.h' |
| 4461 | --- src/platforms/android/server/graphic_buffer_allocator.h 2016-08-09 08:13:02 +0000 |
| 4462 | +++ src/platforms/android/server/graphic_buffer_allocator.h 2016-10-27 03:52:22 +0000 |
| 4463 | @@ -22,7 +22,7 @@ |
| 4464 | |
| 4465 | #include <cstddef> // to fix missing #includes in graphics.h from hardware.h |
| 4466 | #include <hardware/hardware.h> |
| 4467 | -#include "mir_toolkit/mir_native_buffer.h" |
| 4468 | +#include "mir_toolkit/mir_native_buffer.h" |
| 4469 | |
| 4470 | #include "mir/graphics/buffer_properties.h" |
| 4471 | #include "mir/graphics/graphic_buffer_allocator.h" |
| 4472 | |
| 4473 | === modified file 'src/platforms/android/server/hwc_device.cpp' |
| 4474 | --- src/platforms/android/server/hwc_device.cpp 2016-10-12 06:56:27 +0000 |
| 4475 | +++ src/platforms/android/server/hwc_device.cpp 2016-10-27 03:52:22 +0000 |
| 4476 | @@ -92,7 +92,7 @@ |
| 4477 | { |
| 4478 | if (content.name == mga::DisplayName::primary) |
| 4479 | lists[HWC_DISPLAY_PRIMARY] = content.list.native_list(); |
| 4480 | - else if (content.name == mga::DisplayName::external) |
| 4481 | + else if (content.name == mga::DisplayName::external) |
| 4482 | lists[HWC_DISPLAY_EXTERNAL] = content.list.native_list(); |
| 4483 | |
| 4484 | content.list.setup_fb(content.context.last_rendered_buffer()); |
| 4485 | @@ -118,7 +118,7 @@ |
| 4486 | content.list.swap_occurred(); |
| 4487 | purely_overlays = false; |
| 4488 | } |
| 4489 | - |
| 4490 | + |
| 4491 | //setup overlays |
| 4492 | for (auto& layer : content.list) |
| 4493 | { |
| 4494 | |
| 4495 | === modified file 'src/platforms/android/server/hwc_fallback_gl_renderer.cpp' |
| 4496 | --- src/platforms/android/server/hwc_fallback_gl_renderer.cpp 2016-08-09 08:13:02 +0000 |
| 4497 | +++ src/platforms/android/server/hwc_fallback_gl_renderer.cpp 2016-10-27 03:52:22 +0000 |
| 4498 | @@ -87,7 +87,7 @@ |
| 4499 | glUseProgram(*program); |
| 4500 | |
| 4501 | auto display_transform_uniform = glGetUniformLocation(*program, "display_transform"); |
| 4502 | - set_display_transform(display_transform_uniform, screen_pos); |
| 4503 | + set_display_transform(display_transform_uniform, screen_pos); |
| 4504 | |
| 4505 | position_attr = glGetAttribLocation(*program, "position"); |
| 4506 | texcoord_attr = glGetAttribLocation(*program, "texcoord"); |
| 4507 | |
| 4508 | === modified file 'src/platforms/android/server/hwc_fb_device.cpp' |
| 4509 | --- src/platforms/android/server/hwc_fb_device.cpp 2016-10-12 06:03:15 +0000 |
| 4510 | +++ src/platforms/android/server/hwc_fb_device.cpp 2016-10-27 03:52:22 +0000 |
| 4511 | @@ -39,7 +39,7 @@ |
| 4512 | mga::HwcFbDevice::HwcFbDevice( |
| 4513 | std::shared_ptr<HwcWrapper> const& hwc_wrapper, |
| 4514 | std::shared_ptr<framebuffer_device_t> const& fb_device) : |
| 4515 | - hwc_wrapper(hwc_wrapper), |
| 4516 | + hwc_wrapper(hwc_wrapper), |
| 4517 | fb_device(fb_device), |
| 4518 | vsync_subscription{ |
| 4519 | [hwc_wrapper, this]{ |
| 4520 | |
| 4521 | === modified file 'src/platforms/android/server/hwc_fb_device.h' |
| 4522 | --- src/platforms/android/server/hwc_fb_device.h 2016-09-02 08:19:31 +0000 |
| 4523 | +++ src/platforms/android/server/hwc_fb_device.h 2016-10-27 03:52:22 +0000 |
| 4524 | @@ -36,7 +36,7 @@ |
| 4525 | { |
| 4526 | class HwcWrapper; |
| 4527 | |
| 4528 | -class HwcFbDevice : public DisplayDevice |
| 4529 | +class HwcFbDevice : public DisplayDevice |
| 4530 | { |
| 4531 | public: |
| 4532 | HwcFbDevice(std::shared_ptr<HwcWrapper> const& hwc_wrapper, |
| 4533 | |
| 4534 | === modified file 'src/platforms/android/server/hwc_layerlist.cpp' |
| 4535 | --- src/platforms/android/server/hwc_layerlist.cpp 2016-01-29 08:18:22 +0000 |
| 4536 | +++ src/platforms/android/server/hwc_layerlist.cpp 2016-10-27 03:52:22 +0000 |
| 4537 | @@ -80,7 +80,7 @@ |
| 4538 | mode = Mode::target_only; |
| 4539 | else if (renderlist.empty() && !layer_adapter->needs_fb_target()) |
| 4540 | mode = Mode::skip_only; |
| 4541 | - else |
| 4542 | + else |
| 4543 | mode = Mode::no_extra_layers; |
| 4544 | } |
| 4545 | |
| 4546 | @@ -138,12 +138,12 @@ |
| 4547 | |
| 4548 | std::list<mga::HwcLayerEntry>::iterator mga::LayerList::begin() |
| 4549 | { |
| 4550 | - return layers.begin(); |
| 4551 | + return layers.begin(); |
| 4552 | } |
| 4553 | |
| 4554 | std::list<mga::HwcLayerEntry>::iterator mga::LayerList::end() |
| 4555 | { |
| 4556 | - return layers.end(); |
| 4557 | + return layers.end(); |
| 4558 | } |
| 4559 | |
| 4560 | hwc_display_contents_1_t* mga::LayerList::native_list() |
| 4561 | |
| 4562 | === modified file 'src/platforms/android/server/hwc_layers.cpp' |
| 4563 | --- src/platforms/android/server/hwc_layers.cpp 2016-10-12 06:03:15 +0000 |
| 4564 | +++ src/platforms/android/server/hwc_layers.cpp 2016-10-27 03:52:22 +0000 |
| 4565 | @@ -41,7 +41,7 @@ |
| 4566 | void mga::FloatSourceCrop::fill_source_crop( |
| 4567 | hwc_layer_1_t& hwc_layer, geometry::Rectangle const& crop_rect) const |
| 4568 | { |
| 4569 | - hwc_layer.sourceCropf = |
| 4570 | + hwc_layer.sourceCropf = |
| 4571 | { |
| 4572 | static_cast<float>(crop_rect.top_left.x.as_int()), |
| 4573 | static_cast<float>(crop_rect.top_left.y.as_int()), |
| 4574 | @@ -58,7 +58,7 @@ |
| 4575 | void mga::IntegerSourceCrop::fill_source_crop( |
| 4576 | hwc_layer_1_t& hwc_layer, geometry::Rectangle const& crop_rect) const |
| 4577 | { |
| 4578 | - hwc_layer.sourceCropi = |
| 4579 | + hwc_layer.sourceCropi = |
| 4580 | { |
| 4581 | crop_rect.top_left.x.as_int(), |
| 4582 | crop_rect.top_left.y.as_int(), |
| 4583 | @@ -75,7 +75,7 @@ |
| 4584 | void mga::Hwc10Adapter::fill_source_crop( |
| 4585 | hwc_layer_1_t& hwc_layer, geometry::Rectangle const& crop_rect) const |
| 4586 | { |
| 4587 | - hwc_layer.sourceCropi = |
| 4588 | + hwc_layer.sourceCropi = |
| 4589 | { |
| 4590 | crop_rect.top_left.x.as_int(), |
| 4591 | crop_rect.top_left.y.as_int(), |
| 4592 | @@ -209,7 +209,7 @@ |
| 4593 | hwc_layer->planeAlpha = plane_alpha_max; |
| 4594 | |
| 4595 | /* note, if the sourceCrop and DisplayFrame sizes differ, the output will be linearly scaled */ |
| 4596 | - hwc_layer->displayFrame = |
| 4597 | + hwc_layer->displayFrame = |
| 4598 | { |
| 4599 | position.top_left.x.as_int(), |
| 4600 | position.top_left.y.as_int(), |
| 4601 | |
| 4602 | === modified file 'src/platforms/android/server/hwc_layers.h' |
| 4603 | --- src/platforms/android/server/hwc_layers.h 2016-09-20 04:32:25 +0000 |
| 4604 | +++ src/platforms/android/server/hwc_layers.h 2016-10-27 03:52:22 +0000 |
| 4605 | @@ -53,8 +53,8 @@ |
| 4606 | virtual bool needs_fb_target() const = 0; |
| 4607 | virtual ~LayerAdapter() = default; |
| 4608 | LayerAdapter() = default; |
| 4609 | - LayerAdapter(LayerAdapter const&) = delete; |
| 4610 | - LayerAdapter& operator=(LayerAdapter const&) = delete; |
| 4611 | + LayerAdapter(LayerAdapter const&) = delete; |
| 4612 | + LayerAdapter& operator=(LayerAdapter const&) = delete; |
| 4613 | }; |
| 4614 | |
| 4615 | //HWC 1.0 has int sourceCrop and no fbtarget |
| 4616 | @@ -100,7 +100,7 @@ |
| 4617 | |
| 4618 | HWCLayer& operator=(HWCLayer const& layer) = delete; |
| 4619 | HWCLayer(HWCLayer const& layer) = delete; |
| 4620 | - |
| 4621 | + |
| 4622 | bool setup_layer( |
| 4623 | LayerType type, |
| 4624 | geometry::Rectangle const& position, |
| 4625 | |
| 4626 | === modified file 'src/platforms/android/server/hwc_loggers.cpp' |
| 4627 | --- src/platforms/android/server/hwc_loggers.cpp 2016-04-14 06:59:49 +0000 |
| 4628 | +++ src/platforms/android/server/hwc_loggers.cpp 2016-10-27 03:52:22 +0000 |
| 4629 | @@ -76,9 +76,9 @@ |
| 4630 | case 0: |
| 4631 | return str << std::string{"NONE"}; |
| 4632 | case HWC_TRANSFORM_ROT_90: |
| 4633 | - return str << std::string{"ROT_90"}; |
| 4634 | + return str << std::string{"ROT_90"}; |
| 4635 | case HWC_TRANSFORM_ROT_180: |
| 4636 | - return str << std::string{"ROT_180"}; |
| 4637 | + return str << std::string{"ROT_180"}; |
| 4638 | case HWC_TRANSFORM_ROT_270: |
| 4639 | return str << std::string{"ROT_270"}; |
| 4640 | default: |
| 4641 | @@ -124,10 +124,10 @@ |
| 4642 | } |
| 4643 | |
| 4644 | struct HwcRectMember { int member; }; |
| 4645 | -std::ostream& operator<<(std::ostream& str, HwcRectMember rect) |
| 4646 | +std::ostream& operator<<(std::ostream& str, HwcRectMember rect) |
| 4647 | { |
| 4648 | StreamFormatter stream_format(str, rect_entry_column_size, std::ios_base::right); |
| 4649 | - return str << rect.member; |
| 4650 | + return str << rect.member; |
| 4651 | } |
| 4652 | |
| 4653 | struct HwcRect { hwc_rect_t const& rect; }; |
| 4654 | @@ -165,7 +165,7 @@ |
| 4655 | return str << "OFF"; |
| 4656 | } |
| 4657 | |
| 4658 | -std::ostream& operator<<(std::ostream& str, mga::HwcVersion version) |
| 4659 | +std::ostream& operator<<(std::ostream& str, mga::HwcVersion version) |
| 4660 | { |
| 4661 | switch (version) |
| 4662 | { |
| 4663 | |
| 4664 | === modified file 'src/platforms/android/server/hwc_wrapper.h' |
| 4665 | --- src/platforms/android/server/hwc_wrapper.h 2016-09-02 08:19:31 +0000 |
| 4666 | +++ src/platforms/android/server/hwc_wrapper.h 2016-10-27 03:52:22 +0000 |
| 4667 | @@ -48,7 +48,7 @@ |
| 4668 | virtual void prepare(std::array<hwc_display_contents_1*, HWC_NUM_DISPLAY_TYPES> const&) const = 0; |
| 4669 | virtual void set(std::array<hwc_display_contents_1*, HWC_NUM_DISPLAY_TYPES> const&) const = 0; |
| 4670 | //receive vsync, invalidate, and hotplug events from the driver. |
| 4671 | - //As with the HWC api, these events MUST NOT call-back to the other functions in HwcWrapper. |
| 4672 | + //As with the HWC api, these events MUST NOT call-back to the other functions in HwcWrapper. |
| 4673 | virtual void subscribe_to_events( |
| 4674 | void const* subscriber, |
| 4675 | std::function<void(DisplayName, graphics::Frame::Timestamp)> const& vsync_callback, |
| 4676 | |
| 4677 | === modified file 'src/platforms/android/server/real_hwc_wrapper.cpp' |
| 4678 | --- src/platforms/android/server/real_hwc_wrapper.cpp 2016-09-19 09:53:06 +0000 |
| 4679 | +++ src/platforms/android/server/real_hwc_wrapper.cpp 2016-10-27 03:52:22 +0000 |
| 4680 | @@ -32,7 +32,7 @@ |
| 4681 | { |
| 4682 | int num_displays(std::array<hwc_display_contents_1_t*, HWC_NUM_DISPLAY_TYPES> const& displays) |
| 4683 | { |
| 4684 | - return std::distance(displays.begin(), |
| 4685 | + return std::distance(displays.begin(), |
| 4686 | std::find_if(displays.begin(), displays.end(), |
| 4687 | [](hwc_display_contents_1_t* d){ return d == nullptr; })); |
| 4688 | } |
| 4689 | |
| 4690 | === modified file 'src/platforms/android/server/resource_factory.cpp' |
| 4691 | --- src/platforms/android/server/resource_factory.cpp 2016-07-18 07:38:38 +0000 |
| 4692 | +++ src/platforms/android/server/resource_factory.cpp 2016-10-27 03:52:22 +0000 |
| 4693 | @@ -83,7 +83,7 @@ |
| 4694 | case HWC_DEVICE_API_VERSION_1_5: version = mga::HwcVersion::hwc15; break; |
| 4695 | default: version = mga::HwcVersion::unknown; break; |
| 4696 | } |
| 4697 | - |
| 4698 | + |
| 4699 | return std::make_tuple( |
| 4700 | std::make_shared<mga::RealHwcWrapper>(hwc_native, hwc_report), |
| 4701 | version); |
| 4702 | |
| 4703 | === modified file 'src/platforms/android/utils/test_android_hardware_sanity.cpp' |
| 4704 | --- src/platforms/android/utils/test_android_hardware_sanity.cpp 2016-10-12 06:56:27 +0000 |
| 4705 | +++ src/platforms/android/utils/test_android_hardware_sanity.cpp 2016-10-27 03:52:22 +0000 |
| 4706 | @@ -87,7 +87,7 @@ |
| 4707 | char const* argv = "./aa"; |
| 4708 | NoCompositingServer config{1, &argv}; |
| 4709 | }; |
| 4710 | - |
| 4711 | + |
| 4712 | struct AndroidMirDiagnostics : testing::Test |
| 4713 | { |
| 4714 | static void SetUpTestCase() |
| 4715 | @@ -302,7 +302,7 @@ |
| 4716 | bool valid_content = false; |
| 4717 | std::vector<unsigned char> px( |
| 4718 | buffer->size().height.as_int() * |
| 4719 | - buffer->size().width.as_int() * |
| 4720 | + buffer->size().width.as_int() * |
| 4721 | MIR_BYTES_PER_PIXEL(buffer->pixel_format())); |
| 4722 | uint32_t green{0x00FF00FF}; |
| 4723 | mt::DrawPatternSolid green_pattern(green); |
| 4724 | |
| 4725 | === modified file 'src/platforms/common/server/kms-utils/kms_connector.cpp' |
| 4726 | --- src/platforms/common/server/kms-utils/kms_connector.cpp 2016-09-20 04:32:25 +0000 |
| 4727 | +++ src/platforms/common/server/kms-utils/kms_connector.cpp 2016-10-27 03:52:22 +0000 |
| 4728 | @@ -187,7 +187,7 @@ |
| 4729 | { |
| 4730 | std::tie(crtc, crtc_index) = find_crtc_and_index_for_connector(resources, connector); |
| 4731 | } |
| 4732 | - |
| 4733 | + |
| 4734 | mgk::PlaneResources plane_res{drm_fd}; |
| 4735 | |
| 4736 | for (auto& plane : plane_res.planes()) |
| 4737 | |
| 4738 | === modified file 'src/platforms/eglstream-kms/client/client_platform.cpp' |
| 4739 | --- src/platforms/eglstream-kms/client/client_platform.cpp 2016-10-12 06:03:15 +0000 |
| 4740 | +++ src/platforms/eglstream-kms/client/client_platform.cpp 2016-10-27 03:52:22 +0000 |
| 4741 | @@ -71,7 +71,7 @@ |
| 4742 | { |
| 4743 | if (auto native = dynamic_cast<mir::graphics::eglstream::NativeBuffer*>(buf)) |
| 4744 | return native; |
| 4745 | - BOOST_THROW_EXCEPTION(std::invalid_argument("could not convert to NativeBuffer")); |
| 4746 | + BOOST_THROW_EXCEPTION(std::invalid_argument("could not convert to NativeBuffer")); |
| 4747 | } |
| 4748 | |
| 4749 | |
| 4750 | |
| 4751 | === modified file 'src/platforms/evdev/CMakeLists.txt' |
| 4752 | --- src/platforms/evdev/CMakeLists.txt 2016-08-10 07:57:05 +0000 |
| 4753 | +++ src/platforms/evdev/CMakeLists.txt 2016-10-27 03:52:22 +0000 |
| 4754 | @@ -7,7 +7,7 @@ |
| 4755 | endif () |
| 4756 | |
| 4757 | include_directories( |
| 4758 | - ${LIBINPUT_CFLAGS} |
| 4759 | + ${LIBINPUT_CFLAGS} |
| 4760 | ${PROJECT_SOURCE_DIR}/include/platform |
| 4761 | ${PROJECT_SOURCE_DIR}/src/include/platform # udev Context |
| 4762 | ${PROJECT_SOURCE_DIR}/src/include/common # raii.h |
| 4763 | |
| 4764 | === modified file 'src/platforms/mesa/server/buffer_allocator.cpp' |
| 4765 | --- src/platforms/mesa/server/buffer_allocator.cpp 2016-10-11 07:12:33 +0000 |
| 4766 | +++ src/platforms/mesa/server/buffer_allocator.cpp 2016-10-27 03:52:22 +0000 |
| 4767 | @@ -284,7 +284,7 @@ |
| 4768 | auto const stride = geom::Stride{ |
| 4769 | MIR_BYTES_PER_PIXEL(buffer_properties.format) * |
| 4770 | buffer_properties.size.width.as_uint32_t()}; |
| 4771 | - size_t const size_in_bytes = |
| 4772 | + size_t const size_in_bytes = |
| 4773 | stride.as_int() * buffer_properties.size.height.as_int(); |
| 4774 | auto shm_file = |
| 4775 | std::make_unique<mgc::AnonymousShmFile>(size_in_bytes); |
| 4776 | @@ -331,7 +331,7 @@ |
| 4777 | gbm_import_fd_data data; |
| 4778 | data.fd = package->fd[0]; |
| 4779 | data.width = package->width; |
| 4780 | - data.height = package->height; |
| 4781 | + data.height = package->height; |
| 4782 | data.stride = package->stride; |
| 4783 | data.format = format; |
| 4784 | |
| 4785 | |
| 4786 | === modified file 'src/platforms/mesa/server/kms/cursor.cpp' |
| 4787 | --- src/platforms/mesa/server/kms/cursor.cpp 2016-08-05 07:33:22 +0000 |
| 4788 | +++ src/platforms/mesa/server/kms/cursor.cpp 2016-10-27 03:52:22 +0000 |
| 4789 | @@ -71,7 +71,7 @@ |
| 4790 | { |
| 4791 | // on some older hardware drm incorrectly reports the cursor size |
| 4792 | bool const force_64x64_cursor = getenv(mir_drm_cursor_64x64); |
| 4793 | - |
| 4794 | + |
| 4795 | uint64_t height = fallback_cursor_size; |
| 4796 | if (!force_64x64_cursor) |
| 4797 | drmGetCap(fd, DRM_CAP_CURSOR_HEIGHT, &height); |
| 4798 | @@ -82,7 +82,7 @@ |
| 4799 | { |
| 4800 | // on some older hardware drm incorrectly reports the cursor size |
| 4801 | bool const force_64x64_cursor = getenv(mir_drm_cursor_64x64); |
| 4802 | - |
| 4803 | + |
| 4804 | uint64_t width = fallback_cursor_size; |
| 4805 | if (!force_64x64_cursor) |
| 4806 | drmGetCap(fd, DRM_CAP_CURSOR_WIDTH, &width); |
| 4807 | @@ -149,7 +149,7 @@ |
| 4808 | { |
| 4809 | BOOST_THROW_EXCEPTION(std::logic_error("Image is too big for GBM cursor buffer")); |
| 4810 | } |
| 4811 | - |
| 4812 | + |
| 4813 | size_t buffer_stride = gbm_bo_get_stride(buffer); // in bytes |
| 4814 | size_t padded_size = buffer_stride * buffer_height; |
| 4815 | auto padded = std::unique_ptr<uint8_t[]>(new uint8_t[padded_size]); |
| 4816 | @@ -198,7 +198,7 @@ |
| 4817 | write_buffer_data_locked(lg, cursor_image.as_argb_8888(), count); |
| 4818 | } |
| 4819 | hotspot = cursor_image.hotspot(); |
| 4820 | - |
| 4821 | + |
| 4822 | // The hotspot may have changed so we need to call drmModeSetCursor again if the cursor was already visible. |
| 4823 | if (visible) |
| 4824 | place_cursor_at_locked(lg, current_position, ForceState); |
| 4825 | @@ -280,7 +280,7 @@ |
| 4826 | if (output_rect.contains(position)) |
| 4827 | { |
| 4828 | auto dp = transform(output_rect, position - output_rect.top_left, orientation); |
| 4829 | - |
| 4830 | + |
| 4831 | // It's a little strange that we implement hotspot this way as there is |
| 4832 | // drmModeSetCursor2 with hotspot support. However it appears to not actually |
| 4833 | // work on radeon and intel. There also seems to be precedent in weston for |
| 4834 | |
| 4835 | === modified file 'src/platforms/mesa/server/kms/cursor.h' |
| 4836 | --- src/platforms/mesa/server/kms/cursor.h 2016-08-05 07:33:22 +0000 |
| 4837 | +++ src/platforms/mesa/server/kms/cursor.h 2016-10-27 03:52:22 +0000 |
| 4838 | @@ -89,7 +89,7 @@ |
| 4839 | void place_cursor_at_locked(std::lock_guard<std::mutex> const&, geometry::Point position, ForceCursorState force_state); |
| 4840 | void write_buffer_data_locked(std::lock_guard<std::mutex> const&, void const* data, size_t count); |
| 4841 | void pad_and_write_image_data_locked(std::lock_guard<std::mutex> const&, CursorImage const& image); |
| 4842 | - |
| 4843 | + |
| 4844 | std::mutex guard; |
| 4845 | |
| 4846 | KMSOutputContainer& output_container; |
| 4847 | |
| 4848 | === modified file 'src/platforms/mesa/server/kms/display_buffer.cpp' |
| 4849 | --- src/platforms/mesa/server/kms/display_buffer.cpp 2016-10-12 06:03:15 +0000 |
| 4850 | +++ src/platforms/mesa/server/kms/display_buffer.cpp 2016-10-27 03:52:22 +0000 |
| 4851 | @@ -441,7 +441,7 @@ |
| 4852 | |
| 4853 | visible_bypass_frame = scheduled_bypass_frame; |
| 4854 | scheduled_bypass_frame = nullptr; |
| 4855 | - |
| 4856 | + |
| 4857 | if (visible_composite_frame) |
| 4858 | visible_composite_frame->release(); |
| 4859 | visible_composite_frame = scheduled_composite_frame; |
| 4860 | |
| 4861 | === modified file 'src/platforms/mesa/server/kms/guest_platform.h' |
| 4862 | --- src/platforms/mesa/server/kms/guest_platform.h 2016-07-20 04:54:07 +0000 |
| 4863 | +++ src/platforms/mesa/server/kms/guest_platform.h 2016-10-27 03:52:22 +0000 |
| 4864 | @@ -31,7 +31,7 @@ |
| 4865 | { |
| 4866 | namespace mesa |
| 4867 | { |
| 4868 | -class InternalNativeDisplay; |
| 4869 | +class InternalNativeDisplay; |
| 4870 | |
| 4871 | class GuestPlatform : public graphics::Platform |
| 4872 | { |
| 4873 | |
| 4874 | === modified file 'src/platforms/mesa/server/x11/graphics/display.cpp' |
| 4875 | --- src/platforms/mesa/server/x11/graphics/display.cpp 2016-10-12 06:03:15 +0000 |
| 4876 | +++ src/platforms/mesa/server/x11/graphics/display.cpp 2016-10-27 03:52:22 +0000 |
| 4877 | @@ -203,7 +203,7 @@ |
| 4878 | XMapWindow(x_dpy, win); |
| 4879 | |
| 4880 | XEvent xev; |
| 4881 | - do |
| 4882 | + do |
| 4883 | { |
| 4884 | XNextEvent(x_dpy, &xev); |
| 4885 | } |
| 4886 | |
| 4887 | === modified file 'src/platforms/mesa/server/x11/symbols.map.in' |
| 4888 | --- src/platforms/mesa/server/x11/symbols.map.in 2016-01-29 08:18:22 +0000 |
| 4889 | +++ src/platforms/mesa/server/x11/symbols.map.in 2016-10-27 03:52:22 +0000 |
| 4890 | @@ -1,5 +1,5 @@ |
| 4891 | @MIR_SERVER_GRAPHICS_PLATFORM_VERSION@ { |
| 4892 | - global: |
| 4893 | + global: |
| 4894 | add_graphics_platform_options; |
| 4895 | probe_graphics_platform; |
| 4896 | create_host_platform; |
| 4897 | @@ -9,7 +9,7 @@ |
| 4898 | }; |
| 4899 | |
| 4900 | @MIR_SERVER_INPUT_PLATFORM_VERSION@ { |
| 4901 | - global: |
| 4902 | + global: |
| 4903 | add_input_platform_options; |
| 4904 | create_input_platform; |
| 4905 | probe_input_platform; |
| 4906 | |
| 4907 | === modified file 'src/protobuf/mir_protobuf.proto' |
| 4908 | --- src/protobuf/mir_protobuf.proto 2016-10-12 06:03:15 +0000 |
| 4909 | +++ src/protobuf/mir_protobuf.proto 2016-10-27 03:52:22 +0000 |
| 4910 | @@ -29,7 +29,7 @@ |
| 4911 | optional int32 state = 8; |
| 4912 | optional int32 pref_orientation = 9; |
| 4913 | optional int32 parent_id = 10; |
| 4914 | - |
| 4915 | + |
| 4916 | optional Rectangle aux_rect = 11; |
| 4917 | optional int32 edge_attachment = 12; |
| 4918 | |
| 4919 | @@ -45,7 +45,7 @@ |
| 4920 | optional PersistentSurfaceId parent_persistent_id = 21; |
| 4921 | repeated Rectangle input_shape = 22; |
| 4922 | optional int32 shell_chrome = 24; |
| 4923 | - repeated StreamConfiguration stream = 25; |
| 4924 | + repeated StreamConfiguration stream = 25; |
| 4925 | optional int32 confine_pointer = 26; |
| 4926 | |
| 4927 | optional int32 placement_hints = 27; |
| 4928 | @@ -87,7 +87,7 @@ |
| 4929 | optional SurfaceAspectRatio min_aspect = 19; |
| 4930 | optional SurfaceAspectRatio max_aspect = 20; |
| 4931 | |
| 4932 | - repeated StreamConfiguration stream = 21; |
| 4933 | + repeated StreamConfiguration stream = 21; |
| 4934 | |
| 4935 | optional PersistentSurfaceId parent_persistent_id = 22; |
| 4936 | repeated Rectangle input_shape = 23; |
| 4937 | @@ -145,11 +145,11 @@ |
| 4938 | |
| 4939 | message BufferAllocation { |
| 4940 | optional BufferStreamId id = 1; |
| 4941 | - repeated BufferStreamParameters buffer_requests = 2; |
| 4942 | + repeated BufferStreamParameters buffer_requests = 2; |
| 4943 | }; |
| 4944 | |
| 4945 | message BufferRelease { |
| 4946 | - repeated Buffer buffers = 1; |
| 4947 | + repeated Buffer buffers = 1; |
| 4948 | optional BufferStreamId id = 2; |
| 4949 | }; |
| 4950 | |
| 4951 | @@ -254,7 +254,7 @@ |
| 4952 | optional int32 pixel_format = 2; |
| 4953 | optional int32 buffer_usage = 3; |
| 4954 | optional Buffer buffer = 4; |
| 4955 | - |
| 4956 | + |
| 4957 | optional string error = 127; |
| 4958 | optional StructuredError structured_error = 128; |
| 4959 | } |
| 4960 | @@ -269,9 +269,9 @@ |
| 4961 | |
| 4962 | repeated sint32 fd = 7; |
| 4963 | optional int32 fds_on_side_channel = 8; |
| 4964 | - |
| 4965 | + |
| 4966 | repeated SurfaceSetting attributes = 9; |
| 4967 | - |
| 4968 | + |
| 4969 | optional BufferStream buffer_stream = 10; |
| 4970 | |
| 4971 | optional string error = 127; |
| 4972 | |
| 4973 | === modified file 'src/server/compositor/CMakeLists.txt' |
| 4974 | --- src/server/compositor/CMakeLists.txt 2016-10-21 07:53:23 +0000 |
| 4975 | +++ src/server/compositor/CMakeLists.txt 2016-10-27 03:52:22 +0000 |
| 4976 | @@ -1,7 +1,7 @@ |
| 4977 | include_directories( |
| 4978 | ${PROJECT_SOURCE_DIR}/include/renderers/gl/ |
| 4979 | # TODO: This is a temporary dependency until renderers become proper plugins |
| 4980 | - ${PROJECT_SOURCE_DIR}/src/renderers/ |
| 4981 | + ${PROJECT_SOURCE_DIR}/src/renderers/ |
| 4982 | ) |
| 4983 | |
| 4984 | set( |
| 4985 | |
| 4986 | === modified file 'src/server/compositor/buffer_map.cpp' |
| 4987 | --- src/server/compositor/buffer_map.cpp 2016-10-11 07:12:33 +0000 |
| 4988 | +++ src/server/compositor/buffer_map.cpp 2016-10-27 03:52:22 +0000 |
| 4989 | @@ -70,7 +70,7 @@ |
| 4990 | auto it = checked_buffers_find(id, lk); |
| 4991 | if (auto s = sink.lock()) |
| 4992 | s->remove_buffer(*it->second.buffer); |
| 4993 | - buffers.erase(it); |
| 4994 | + buffers.erase(it); |
| 4995 | } |
| 4996 | |
| 4997 | void mc::BufferMap::send_buffer(mg::BufferID id) |
| 4998 | |
| 4999 | === modified file 'src/server/compositor/buffer_map.h' |
| 5000 | --- src/server/compositor/buffer_map.h 2016-10-11 07:12:33 +0000 |
FAILED: Continuous integration, rev:3641
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/