~ubuntu-branches/ubuntu/vivid/mir/vivid

« back to all changes in this revision

Viewing changes to src/server/frontend/session_mediator.cpp

Committer: Package Import Robot
Author(s): Ubuntu daily release
Date: 2014-08-11 19:52:06 UTC
mto: This revision was merged to the branch mainline in revision 77.
Revision ID: package-import@ubuntu.com-20140811195206-05ee991qbzvdbmel

Tags: upstream-0.6.0+14.10.20140811

Import upstream version 0.6.0+14.10.20140811

files added:
client-ABI-sha1sums

examples/cursors_demo_client.c

examples/demo-shell/demo_compositor.cpp

examples/demo-shell/demo_compositor.h

examples/release_at_exit.c

examples/testdraw

examples/testdraw/CMakeLists.txt

examples/testdraw/android_graphics_region_factory.cpp

examples/testdraw/draw_pattern_checkered-inl.h

examples/testdraw/graphics_region_factory.h

examples/testdraw/mesa_graphics_region_factory.cpp

examples/testdraw/patterns.cpp

examples/testdraw/patterns.h

include/platform/mir/fatal.h

include/server/mir/input/touch_visualizer.h

include/server/mir/shell/host_lifecycle_event_listener.h

include/shared/mir/fd.h

include/shared/mir/udev

include/shared/mir/udev/wrapper.h

include/shared/mir_toolkit/cursors.h

include/test/mir_test_doubles/stub_touch_visualizer.h

include/test/mir_test_framework/executable_path.h

server-ABI-sha1sums

src/client/android/symbols.map

src/client/mesa/symbols.map

src/client/rpc/mir_protobuf_rpc_channel.cpp

src/client/rpc/mir_protobuf_rpc_channel.h

src/client/rpc/stream_socket_transport.cpp

src/client/rpc/stream_socket_transport.h

src/client/rpc/stream_transport.h

src/client/symbols.map

src/platform/fatal

src/platform/fatal/CMakeLists.txt

src/platform/fatal/fatal.cpp

src/platform/graphics/symbols.map

src/platform/mirplatform.pc.in

src/server/shell/default_placement_strategy.cpp

src/server/shell/default_placement_strategy.h

src/server/shell/null_host_lifecycle_event_listener.h

src/shared/fd

src/shared/fd/CMakeLists.txt

src/shared/fd/fd.cpp

src/shared/input/udev_wrapper.cpp

tests/acceptance-tests/test_command_line_handling.cpp

tests/acceptance-tests/test_macros.cpp

tests/acceptance-tests/test_server_without_active_outputs.cpp

tests/acceptance-tests/test_stale_frames.cpp

tests/acceptance-tests/test_symbols_required_by_mesa.cpp

tests/acceptance-tests/test_touchspot_visualization.cpp

tests/mir_test_framework/executable_path.cpp

tests/mir_test_framework/testing-cursor-theme

tests/mir_test_framework/testing-cursor-theme/default

tests/mir_test_framework/testing-cursor-theme/default/cursors

tests/mir_test_framework/testing-cursor-theme/default/cursors/arrow

tests/mir_test_framework/testing-cursor-theme/default/cursors/arrow.in

tests/mir_test_framework/testing-cursor-theme/default/cursors/arrow.png

tests/mir_test_framework/testing-cursor-theme/default/cursors/blue

tests/mir_test_framework/testing-cursor-theme/default/cursors/blue.in

tests/mir_test_framework/testing-cursor-theme/default/cursors/blue.png

tests/mir_test_framework/testing-cursor-theme/default/cursors/generate-theme.sh

tests/mir_test_framework/testing-cursor-theme/default/cursors/green

tests/mir_test_framework/testing-cursor-theme/default/cursors/green.in

tests/mir_test_framework/testing-cursor-theme/default/cursors/green.png

tests/mir_test_framework/testing-cursor-theme/default/cursors/red

tests/mir_test_framework/testing-cursor-theme/default/cursors/red.in

tests/mir_test_framework/testing-cursor-theme/default/cursors/red.png

tests/unit-tests/client/test_protobuf_rpc_channel.cpp

tests/unit-tests/client/test_stream_transport.cpp

tests/unit-tests/shell/test_default_placement_strategy.cpp

tests/unit-tests/test_fatal.cpp

tests/unit-tests/test_fd.cpp

tools/update-client-sha1sums.sh

tools/update-server-sha1sums.sh

files removed:
include/platform/mir/udev/wrapper.h

include/shared/testdraw

include/shared/testdraw/draw_pattern_checkered-inl.h

include/shared/testdraw/graphics_region_factory.h

include/shared/testdraw/patterns.h

src/client/rpc/mir_socket_rpc_channel.cpp

src/client/rpc/mir_socket_rpc_channel.h

src/platform/udev_wrapper.cpp

src/server/shell/consuming_placement_strategy.cpp

src/server/shell/consuming_placement_strategy.h

src/shared/mircommon.pc.in

src/shared/testdraw

src/shared/testdraw/CMakeLists.txt

src/shared/testdraw/android_graphics_region_factory.cpp

src/shared/testdraw/mesa_graphics_region_factory.cpp

src/shared/testdraw/patterns.cpp

tests/unit-tests/input/testing-cursor-theme

tests/unit-tests/input/testing-cursor-theme/default

tests/unit-tests/input/testing-cursor-theme/default/cursors

tests/unit-tests/input/testing-cursor-theme/default/cursors/arrow

tests/unit-tests/input/testing-cursor-theme/default/cursors/arrow.in

tests/unit-tests/input/testing-cursor-theme/default/cursors/arrow.png

tests/unit-tests/input/testing-cursor-theme/default/cursors/blue

tests/unit-tests/input/testing-cursor-theme/default/cursors/blue.in

tests/unit-tests/input/testing-cursor-theme/default/cursors/blue.png

tests/unit-tests/input/testing-cursor-theme/default/cursors/generate-theme.sh

tests/unit-tests/input/testing-cursor-theme/default/cursors/green

tests/unit-tests/input/testing-cursor-theme/default/cursors/green.in

tests/unit-tests/input/testing-cursor-theme/default/cursors/green.png

tests/unit-tests/input/testing-cursor-theme/default/cursors/red

tests/unit-tests/input/testing-cursor-theme/default/cursors/red.in

tests/unit-tests/input/testing-cursor-theme/default/cursors/red.png

tests/unit-tests/shell/test_consuming_placement_strategy.cpp

files modified:
3rd_party/android-deps/std/Log.h

3rd_party/android-input/CMakeLists.txt

3rd_party/android-input/android/CMakeLists.txt

3rd_party/android-input/android/frameworks/base/services/input/MirLog.cpp

CMakeLists.txt

cmake/PrePush.cmake

cmake/src/mir/mir_discover_gtest_tests.cpp

examples/CMakeLists.txt

examples/demo-shell/CMakeLists.txt

examples/demo-shell/demo_renderer.cpp

examples/demo-shell/demo_shell.cpp

examples/demo-shell/window_manager.cpp

examples/fingerpaint.c

include/client/mir_toolkit/mir_client_library_debug.h

include/client/mir_toolkit/mir_cursor_configuration.h

include/client/mir_toolkit/mir_surface.h

include/platform/mir/graphics/gl_primitive.h

include/platform/mir/options/configuration.h

include/platform/mir/options/default_configuration.h

include/platform/mir/options/program_option.h

include/server/mir/compositor/buffer_stream.h

include/server/mir/compositor/gl_renderer.h

include/server/mir/default_server_configuration.h

include/server/mir/frontend/fd_sets.h

include/server/mir/frontend/surface.h

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

include/server/mir/server_configuration.h

include/shared/mir/graphics/android/fence.h

include/shared/mir/graphics/android/sync_fence.h

include/shared/mir_toolkit/common.h

include/test/mir_test/auto_unblock_thread.h

include/test/mir_test/event_factory.h

include/test/mir_test/fake_event_hub_input_configuration.h

include/test/mir_test_doubles/mock_buffer_bundle.h

include/test/mir_test_doubles/mock_buffer_registrar.h

include/test/mir_test_doubles/mock_buffer_stream.h

include/test/mir_test_doubles/mock_frontend_surface.h

include/test/mir_test_doubles/mock_rpc_report.h

include/test/mir_test_doubles/stub_buffer_stream.h

include/test/mir_test_doubles/stub_scene_surface.h

include/test/mir_test_framework/input_testing_server_configuration.h

include/test/mir_test_framework/udev_environment.h

src/client/CMakeLists.txt

src/client/android/CMakeLists.txt

src/client/android/android_client_buffer_factory.cpp

src/client/android/android_native_display_container.cpp

src/client/android/buffer.cpp

src/client/android/buffer.h

src/client/android/buffer_registrar.h

src/client/android/client_surface_interpreter.cpp

src/client/android/gralloc_registrar.cpp

src/client/android/gralloc_registrar.h

src/client/connection_configuration.h

src/client/default_connection_configuration.cpp

src/client/logging/rpc_report.cpp

src/client/logging/rpc_report.h

src/client/lttng/CMakeLists.txt

src/client/lttng/rpc_report.cpp

src/client/lttng/rpc_report.h

src/client/mesa/CMakeLists.txt

src/client/mesa/mesa_native_display_container.cpp

src/client/mesa/native_surface.cpp

src/client/mir_connection.cpp

src/client/mir_connection.h

src/client/mir_cursor_api.cpp

src/client/mir_surface.cpp

src/client/mir_surface.h

src/client/mir_surface_api.cpp

src/client/mirclient.pc.in

src/client/rpc/CMakeLists.txt

src/client/rpc/make_socket_rpc_channel.cpp

src/client/rpc/mir_basic_rpc_channel.h

src/client/rpc/null_rpc_report.cpp

src/client/rpc/null_rpc_report.h

src/client/rpc/rpc_report.h

src/platform/CMakeLists.txt

src/platform/graphics/CMakeLists.txt

src/platform/graphics/android/CMakeLists.txt

src/platform/graphics/android/android_alloc_adaptor.cpp

src/platform/graphics/android/display_buffer.h

src/platform/graphics/android/gl_context.h

src/platform/graphics/android/hwc_common_device.cpp

src/platform/graphics/android/hwc_common_device.h

src/platform/graphics/android/hwc_device.cpp

src/platform/graphics/android/hwc_device.h

src/platform/graphics/android/hwc_fallback_gl_renderer.cpp

src/platform/graphics/mesa/CMakeLists.txt

src/platform/graphics/mesa/display.cpp

src/platform/graphics/mesa/display_buffer.cpp

src/platform/graphics/mesa/real_kms_output.cpp

src/platform/graphics/tessellation_helpers.cpp

src/platform/options/CMakeLists.txt

src/platform/options/default_configuration.cpp

src/platform/options/program_option.cpp

src/server/CMakeLists.txt

src/server/compositor/CMakeLists.txt

src/server/compositor/buffer_bundle.h

src/server/compositor/buffer_queue.cpp

src/server/compositor/buffer_queue.h

src/server/compositor/buffer_stream_surfaces.cpp

src/server/compositor/buffer_stream_surfaces.h

src/server/compositor/gl_renderer.cpp

src/server/default_server_configuration.cpp

src/server/display_server.cpp

src/server/frontend/CMakeLists.txt

src/server/frontend/default_configuration.cpp

src/server/frontend/protobuf_message_processor.cpp

src/server/frontend/session_mediator.cpp

src/server/frontend/socket_messenger.cpp

src/server/frontend/socket_messenger.h

src/server/graphics/CMakeLists.txt

src/server/graphics/default_configuration.cpp

src/server/graphics/nested/CMakeLists.txt

src/server/graphics/nested/mir_client_host_connection.cpp

src/server/graphics/nested/mir_client_host_connection.h

src/server/graphics/offscreen/CMakeLists.txt

src/server/input/CMakeLists.txt

src/server/input/android/android_input_reader_policy.cpp

src/server/input/android/android_input_reader_policy.h

src/server/input/android/android_pointer_controller.cpp

src/server/input/android/android_pointer_controller.h

src/server/input/android/default_android_input_configuration.cpp

src/server/input/default_configuration.cpp

src/server/input/xcursor_loader.cpp

src/server/logging/CMakeLists.txt

src/server/mirserver.pc.in

src/server/report/CMakeLists.txt

src/server/report/logging/CMakeLists.txt

src/server/report/lttng/CMakeLists.txt

src/server/report/null/CMakeLists.txt

src/server/run_mir.cpp

src/server/scene/CMakeLists.txt

src/server/scene/basic_surface.cpp

src/server/scene/basic_surface.h

src/server/shell/CMakeLists.txt

src/server/shell/default_configuration.cpp

src/server/time/CMakeLists.txt

src/shared/CMakeLists.txt

src/shared/env/CMakeLists.txt

src/shared/geometry/CMakeLists.txt

src/shared/graphics/android/CMakeLists.txt

src/shared/graphics/android/mir_native_window.cpp

src/shared/graphics/android/syncfence.cpp

src/shared/input/CMakeLists.txt

src/shared/input/android/CMakeLists.txt

src/shared/logging/CMakeLists.txt

src/shared/protobuf/CMakeLists.txt

src/shared/protobuf/mir_protobuf.proto

src/shared/report/lttng/CMakeLists.txt

src/shared/sharedlibrary/CMakeLists.txt

src/shared/thread/CMakeLists.txt

tests/acceptance-tests/CMakeLists.txt

tests/acceptance-tests/test_client_input.cpp

tests/acceptance-tests/test_client_library.cpp

tests/acceptance-tests/test_client_surface_visibility.cpp

tests/acceptance-tests/test_focus_selection.cpp

tests/acceptance-tests/test_nested_mir.cpp

tests/acceptance-tests/test_server_shutdown.cpp

tests/integration-tests/CMakeLists.txt

tests/integration-tests/client/test_client_render.cpp

tests/integration-tests/client/test_screencast.cpp

tests/integration-tests/graphics/android/CMakeLists.txt

tests/integration-tests/graphics/android/test_buffer_integration.cpp

tests/integration-tests/graphics/mesa/CMakeLists.txt

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

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

tests/integration-tests/session_management.cpp

tests/integration-tests/shell/test_session_lifecycle_event.cpp

tests/integration-tests/test_swapinterval.cpp

tests/mir_test/CMakeLists.txt

tests/mir_test_doubles/event_factory.cpp

tests/mir_test_doubles/fake_event_hub.cpp

tests/mir_test_doubles/fake_event_hub_input_configuration.cpp

tests/mir_test_framework/CMakeLists.txt

tests/mir_test_framework/input_testing_server_options.cpp

tests/mir_test_framework/stubbed_server_configuration.cpp

tests/mir_test_framework/udev_environment.cpp

tests/mir_test_framework/using_stub_client_platform.cpp

tests/performance-tests/CMakeLists.txt

tests/performance-tests/test_glmark2-es2-mir.cpp

tests/unit-tests/CMakeLists.txt

tests/unit-tests/android_input/test_eventhub.cpp

tests/unit-tests/client/CMakeLists.txt

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

tests/unit-tests/client/android/test_android_native_window.cpp

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

tests/unit-tests/client/android/test_gralloc_registrar.cpp

tests/unit-tests/client/mesa/CMakeLists.txt

tests/unit-tests/client/mesa/test_native_surface.cpp

tests/unit-tests/client/test_client_mir_surface.cpp

tests/unit-tests/compositor/test_buffer_queue.cpp

tests/unit-tests/compositor/test_gl_renderer.cpp

tests/unit-tests/draw/test_draw_patterns.cpp

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

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

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

tests/unit-tests/graphics/mesa/CMakeLists.txt

tests/unit-tests/graphics/mesa/test_buffer_allocator.cpp

tests/unit-tests/graphics/mesa/test_display.cpp

tests/unit-tests/graphics/mesa/test_display_buffer.cpp

tests/unit-tests/graphics/mesa/test_display_configuration.cpp

tests/unit-tests/graphics/mesa/test_display_multi_monitor.cpp

tests/unit-tests/graphics/mesa/test_drm_helper.cpp

tests/unit-tests/graphics/mesa/test_gbm_buffer.cpp

tests/unit-tests/graphics/mesa/test_platform.cpp

tests/unit-tests/graphics/test_display.cpp

tests/unit-tests/graphics/test_graphics_platform.cpp

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

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

tests/unit-tests/input/test_xcursor_loader.cpp

tests/unit-tests/options/test_program_option.cpp

tests/unit-tests/scene/test_basic_surface.cpp

tests/unit-tests/scene/test_surface_impl.cpp

tests/unit-tests/shell/CMakeLists.txt

tests/unit-tests/test_udev_wrapper.cpp

Show diffs side-by-side

added added

removed removed

src/server/frontend/session_mediator.cpp

196

197

if (surface->supports_input())

198

response->add_fd(surface->client_input_fd());

199

200

for (unsigned int i = 0; i < mir_surface_attribs; i++)

201

{

202

auto setting = response->add_attributes();

203

204

setting->mutable_surfaceid()->set_value(surf_id.as_value());

205

setting->set_attrib(i);

206

setting->set_ivalue(surface->query(static_cast<MirSurfaceAttrib>(i)));

207

}

199

208

200

209

advance_buffer(surf_id, *surface,

201

210

[lock, this, response, done, session]

Older »