~robertcarr/mir/client-focus-notifications

« back to all changes in this revision

Viewing changes to examples/demo-shell/demo_shell.cpp

Committer: Robert Carr
Date: 2013-08-01 22:01:20 UTC
mfrom: (706.2.208 trunk)
Revision ID: robert.carr@canonical.com-20130801220120-6m230b3g6x0xflzd

Merge trunk

files added:
examples/server_configuration.cpp

examples/server_configuration.h

include/server/mir/input/input_reception_mode.h

include/test/mir_test/display_config_matchers.h

include/test/mir_test_doubles/mock_frontend_surface.h

include/test/mir_test_doubles/null_display_configuration.h

include/test/mir_test_doubles/null_event_sink.h

src/server/frontend/event_sender.h

src/server/frontend/message_receiver.h

src/server/frontend/message_sender.h

src/server/frontend/socket_messenger.cpp

src/server/frontend/socket_messenger.h

tests/unit-tests/frontend/test_socket_session.cpp

files removed:
include/shared/mir/events

src/server/frontend/event_pipe.h

tests/unit-tests/frontend/test_event_pipe.cpp

files renamed:
include/shared/mir/events/event_sink.h => include/server/mir/frontend/event_sink.h

include/server/mir/compositor/buffer_ipc_packer.h => include/server/mir/graphics/buffer_ipc_packer.h

include/server/mir/compositor/buffer_properties.h => include/server/mir/graphics/buffer_properties.h

include/server/mir/compositor/graphic_buffer_allocator.h => include/server/mir/graphics/graphic_buffer_allocator.h

src/server/frontend/event_pipe.cpp => src/server/frontend/event_sender.cpp

tests/unit-tests/compositor/test_buffer_id.cpp => tests/unit-tests/graphics/test_buffer_id.cpp

tests/unit-tests/compositor/test_buffer_properties.cpp => tests/unit-tests/graphics/test_buffer_properties.cpp

files modified:
3rd_party/android-input/android/frameworks/base/services/input/InputDispatcher.cpp

debian/changelog

examples/CMakeLists.txt

examples/demo-inprocess-surface-client/inprocess_egl_client.cpp

examples/demo-shell/CMakeLists.txt

examples/demo-shell/demo_shell.cpp

examples/demo_input_filter.cpp

examples/demo_server.cpp

examples/eglapp.c

examples/fingerpaint.c

examples/render_surfaces.cpp

include/server/mir/compositor/buffer_allocation_strategy.h

include/server/mir/compositor/buffer_stream_factory.h

include/server/mir/compositor/buffer_stream_surfaces.h

include/server/mir/compositor/swapper_factory.h

include/server/mir/default_server_configuration.h

include/server/mir/frontend/protobuf_ipc_factory.h

include/server/mir/frontend/session_mediator.h

include/server/mir/frontend/shell.h

include/server/mir/graphics/nested/nested_platform.h

include/server/mir/graphics/platform.h

include/server/mir/shell/application_session.h

include/server/mir/shell/organising_surface_factory.h

include/server/mir/shell/session_manager.h

include/server/mir/shell/surface.h

include/server/mir/shell/surface_creation_parameters.h

include/server/mir/shell/surface_factory.h

include/server/mir/shell/surface_source.h

include/server/mir/surfaces/buffer_stream_factory.h

include/server/mir/surfaces/input_registrar.h

include/server/mir/surfaces/surface.h

include/test/mir_test_doubles/mock_buffer_bundle.h

include/test/mir_test_doubles/mock_buffer_packer.h

include/test/mir_test_doubles/mock_display.h

include/test/mir_test_doubles/mock_input_registrar.h

include/test/mir_test_doubles/mock_shell.h

include/test/mir_test_doubles/mock_surface.h

include/test/mir_test_doubles/mock_surface_factory.h

include/test/mir_test_doubles/mock_swapper_factory.h

include/test/mir_test_doubles/null_display.h

include/test/mir_test_doubles/null_platform.h

include/test/mir_test_doubles/stub_buffer.h

include/test/mir_test_doubles/stub_buffer_allocator.h

include/test/mir_test_doubles/stub_input_registrar.h

include/test/mir_test_doubles/stub_ipc_factory.h

include/test/mir_test_doubles/stub_session.h

include/test/mir_test_doubles/stub_shell.h

src/client/mir_connection.h

src/client/rpc/mir_basic_rpc_channel.h

src/client/rpc/mir_socket_rpc_channel.cpp

src/server/compositor/buffer_bundle.h

src/server/compositor/buffer_stream_factory.cpp

src/server/compositor/buffer_stream_surfaces.cpp

src/server/compositor/swapper_factory.cpp

src/server/compositor/switching_bundle.cpp

src/server/compositor/switching_bundle.h

src/server/default_server_configuration.cpp

src/server/frontend/CMakeLists.txt

src/server/frontend/message_processor.h

src/server/frontend/protobuf_buffer_packer.h

src/server/frontend/protobuf_message_processor.cpp

src/server/frontend/protobuf_message_processor.h

src/server/frontend/protobuf_socket_communicator.cpp

src/server/frontend/protobuf_socket_communicator.h

src/server/frontend/session_mediator.cpp

src/server/frontend/socket_session.cpp

src/server/frontend/socket_session.h

src/server/graphics/android/android_buffer_allocator.cpp

src/server/graphics/android/android_display.cpp

src/server/graphics/android/android_graphic_buffer_allocator.h

src/server/graphics/android/android_platform.cpp

src/server/graphics/android/android_platform.h

src/server/graphics/gbm/gbm_buffer_allocator.cpp

src/server/graphics/gbm/gbm_buffer_allocator.h

src/server/graphics/gbm/gbm_display.cpp

src/server/graphics/gbm/gbm_display_helpers.cpp

src/server/graphics/gbm/gbm_platform.cpp

src/server/graphics/gbm/gbm_platform.h

src/server/graphics/nested/nested_platform.cpp

src/server/input/android/android_input_registrar.cpp

src/server/input/android/android_input_registrar.h

src/server/input/null_input_configuration.cpp

src/server/shell/application_session.cpp

src/server/shell/organising_surface_factory.cpp

src/server/shell/session_manager.cpp

src/server/shell/surface.cpp

src/server/shell/surface_creation_parameters.cpp

src/server/shell/surface_source.cpp

src/server/surfaces/surface_allocator.cpp

src/server/surfaces/surface_stack.cpp

tests/acceptance-tests/test_client_input.cpp

tests/acceptance-tests/test_client_library.cpp

tests/integration-tests/client/test_client_render.cpp

tests/integration-tests/compositor/test_buffer_stream.cpp

tests/integration-tests/compositor/test_swapping_swappers.cpp

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

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

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

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

tests/integration-tests/shell/test_session.cpp

tests/integration-tests/shell/test_session_manager.cpp

tests/integration-tests/test_display_info.cpp

tests/integration-tests/test_drm_auth_magic.cpp

tests/integration-tests/test_error_reporting.cpp

tests/integration-tests/test_surfaceloop.cpp

tests/integration-tests/test_swapinterval.cpp

tests/mir_test_framework/input_testing_server_options.cpp

tests/mir_test_framework/testing_server_options.cpp

tests/unit-tests/client/test_mir_connection.cpp

tests/unit-tests/compositor/CMakeLists.txt

tests/unit-tests/compositor/test_buffer_stream.cpp

tests/unit-tests/compositor/test_swapper_factory.cpp

tests/unit-tests/compositor/test_switching_bundle.cpp

tests/unit-tests/frontend/CMakeLists.txt

tests/unit-tests/frontend/test_protobuf_buffer_packer.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

tests/unit-tests/frontend/test_session_mediator_android.cpp

tests/unit-tests/frontend/test_session_mediator_gbm.cpp

tests/unit-tests/graphics/CMakeLists.txt

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

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

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

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

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

tests/unit-tests/graphics/gbm/test_gbm_buffer_allocator.cpp

tests/unit-tests/graphics/gbm/test_gbm_display.cpp

tests/unit-tests/graphics/gbm/test_internal_native_surface.cpp

tests/unit-tests/graphics/test_graphics_platform.cpp

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

tests/unit-tests/shell/test_application_session.cpp

tests/unit-tests/shell/test_organising_surface_factory.cpp

tests/unit-tests/shell/test_registration_order_focus_sequence.cpp

tests/unit-tests/shell/test_session_manager.cpp

tests/unit-tests/shell/test_surface.cpp

tests/unit-tests/shell/test_the_session_container_implementation.cpp

tests/unit-tests/shell/test_threaded_snapshot_strategy.cpp

tests/unit-tests/surfaces/test_surface.cpp

tests/unit-tests/surfaces/test_surface_stack.cpp

tools/install_on_android.sh

Show diffs side-by-side

added added

removed removed

examples/demo-shell/demo_shell.cpp

#include "window_manager.h"

#include "fullscreen_placement_strategy.h"

#include "../server_configuration.h"

#include "mir/run_mir.h"

#include "mir/report_exception.h"

#include "mir/default_server_configuration.h"

#include "mir/shell/session_manager.h"

#include "mir/shell/registration_order_focus_sequence.h"

#include "mir/shell/single_visibility_focus_mechanism.h"

namespace examples

{

struct DemoServerConfiguration : mir::DefaultServerConfiguration

struct DemoServerConfiguration : mir::examples::ServerConfiguration

{

DemoServerConfiguration(int argc, char const* argv[],

std::initializer_list<std::shared_ptr<mi::EventFilter> const> const& filter_list)

: DefaultServerConfiguration(argc, argv),

: ServerConfiguration(argc, argv),

filter_list(filter_list)

{

namespace po = boost::program_options;

add_options()

("fullscreen-surfaces", po::value<bool>(),

"Make all surfaces fullscreen [bool:default=false]");

}

std::shared_ptr<msh::PlacementStrategy> the_shell_placement_strategy()

std::shared_ptr<msh::PlacementStrategy> the_shell_placement_strategy() override

{

return shell_placement_strategy(

[this]

[this]() -> std::shared_ptr<msh::PlacementStrategy>

{

return std::make_shared<me::FullscreenPlacementStrategy>(the_shell_display_layout());

if (the_options()->is_set("fullscreen-surfaces"))

return std::make_shared<me::FullscreenPlacementStrategy>(the_shell_display_layout());

else

return DefaultServerConfiguration::the_shell_placement_strategy();

});

}

Older »