← Back to branch summary

~kdub/mir/hwc-integration

~kdub/mir/hwc-integration

« back to all changes in this revision

Viewing changes to src/server/shell/session_manager.cpp

Committer: Kevin DuBois
Date: 2013-03-29 22:52:10 UTC
mfrom: (531.1.16 trunk)
Revision ID: kevin.dubois@canonical.com-20130329225210-nhi93ayk3w6ij42h

merge lp:mir (7 conflicts resolved)

files modified:
examples/demo_client_unaccelerated.c

examples/render_surfaces.cpp

include/server/mir/input/input_channel.h

include/server/mir/input/input_channel_factory.h

include/server/mir/input/input_manager.h

include/server/mir/input/session_target.h

include/server/mir/input/surface_target.h

include/server/mir/shell/input_focus_selector.h

include/server/mir/shell/session.h

include/server/mir/shell/session_manager.h

include/test/mir_test/fake_event_hub_input_configuration.h

include/test/mir_test/hw_mock.h

include/test/mir_test_cucumber/session_management_context.h

include/test/mir_test_doubles/mock_input_manager.h

include/test/mir_test_doubles/mock_session.h

include/test/mir_test_doubles/mock_surface.h

include/test/mir_test_doubles/stub_surface.h

include/test/mir_test_doubles/stub_surface_target.h

src/client/android/android_native_display_container.cpp

src/client/android/android_native_display_container.h

src/client/android/client_surface_interpreter.h

src/client/client_buffer_factory.h

src/client/egl_native_display_container.h

src/client/gbm/mesa_native_display_container.cpp

src/client/gbm/mesa_native_display_container.h

src/client/mir_connection.h

src/client/mir_surface.cpp

src/client/mir_wait_handle.h

src/server/compositor/buffer_swapper_multi.cpp

src/server/compositor/temporary_buffers.cpp

src/server/compositor/temporary_buffers.h

src/server/graphics/android/android_buffer_allocator.cpp

src/server/graphics/android/android_framebuffer_window.cpp

src/server/graphics/android/hwc11_device.cpp

src/server/graphics/android/hwc11_device.h

src/server/graphics/android/hwc_device.h

src/server/graphics/android/hwc_display.h

src/server/input/android/android_input_channel.h

src/server/input/android/android_input_configuration.h

src/server/input/android/android_input_manager.h

src/server/input/android/android_input_window_handle.cpp

src/server/input/android/default_android_input_configuration.cpp

src/server/input/android/default_android_input_configuration.h

src/server/input/dummy_input_manager.cpp

src/server/shell/consuming_placement_strategy.cpp

src/server/shell/session_manager.cpp

tests/acceptance-tests/test_focus_selection.cpp

tests/behavior-tests/session_management_context.cpp

tests/behavior-tests/session_manager_steps.cpp

tests/draw/android_graphics.cpp

tests/integration-tests/client/test_client_render.cpp

tests/integration-tests/cucumber/test_session_management_context.cpp

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

tests/mir_test_doubles/fake_event_hub.cpp

tests/mir_test_framework/testing_server_options.cpp

tests/unit-tests/android_input/sorted_vector.cpp

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

tests/unit-tests/client/gbm/test_mesa_native_display_container.cpp

tests/unit-tests/client/test_aging_buffer.cpp

tests/unit-tests/client/test_client_buffer_depository.cpp

tests/unit-tests/compositor/test_buffer_id.cpp

tests/unit-tests/compositor/test_buffer_swapper.cpp

tests/unit-tests/compositor/test_buffer_swapper_double.cpp

tests/unit-tests/compositor/test_buffer_swapper_triple.cpp

tests/unit-tests/compositor/test_rendering_operator.cpp

tests/unit-tests/compositor/test_swapper_factory.cpp

tests/unit-tests/compositor/test_temporary_buffers.cpp

tests/unit-tests/draw/test_draw_patterns.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

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

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

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

tests/unit-tests/graphics/egl_mock/hw_mock.cpp

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

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

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

tests/unit-tests/shell/test_application_session.cpp

tests/unit-tests/shell/test_consuming_placement_strategy.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_single_visibility_focus_mechanism.cpp

tests/unit-tests/shell/test_surface.cpp

tests/unit-tests/surfaces/test_surface.cpp

tests/unit-tests/surfaces/test_surface_stack.cpp

Show diffs side-by-side

added added

removed removed

src/server/shell/session_manager.cpp

62

62

focus_application = new_session;

63

63

}

64

64

focus_setter->set_focus_to(new_session);

65

65

66

66

return new_session;

67

67

}

68

68

Older »