~andreas-pokorny/mir/example-configure-input-devices

« back to all changes in this revision

Viewing changes to src/platforms/mesa/server/x11/graphics/graphics.cpp

Committer: Andreas Pokorny
Date: 2015-11-26 08:54:54 UTC
mfrom: (3103.2.25 development-branch)
Revision ID: andreas.pokorny@canonical.com-20151126085454-4qrc2k03lbnqn2h7

update to lp:mir

files added:
include/common/mir/assert_module_entry_point.h

src/include/server/mir/input/input_probe.h

src/server/input/input_probe.cpp

tests/unit-tests/input/test_input_platform_probing.cpp

files renamed:
debian/libmirserver35.install => debian/libmirserver36.install

src/server/frontend/unsupported_coordinate_translator.cpp => src/server/scene/unsupported_coordinate_translator.cpp

src/server/frontend/unsupported_coordinate_translator.h => src/server/scene/unsupported_coordinate_translator.h

tests/mir_test_framework/stub_input_platform.h => tests/include/mir_test_framework/stub_input_platform.h

files modified:
3rd_party/android-input/CMakeLists.txt

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

3rd_party/android-input/android/frameworks/base/services/input/EventHub.h

3rd_party/android-input/android/frameworks/native/libs/utils/Timers.cpp

benchmarks/frame-uniformity/touch_producing_server.cpp

debian/changelog

debian/control

include/client/mir/events/event_builders.h

include/client/mir_toolkit/mir_buffer_stream.h

include/platform/mir/input/event_builder.h

include/platform/mir/input/input_sink.h

include/platform/mir/input/platform.h

include/server/mir/server.h

include/test/mir/test/doubles/stub_display_configuration.h

include/test/mir_test_framework/async_server_runner.h

include/test/mir_test_framework/executable_path.h

src/client/buffer_stream.cpp

src/client/buffer_vault.cpp

src/client/buffer_vault.h

src/client/events/event_builders.cpp

src/client/rpc/CMakeLists.txt

src/client/symbols.map

src/common/dispatch/threaded_dispatcher.cpp

src/common/logging/input_timestamp.cpp

src/include/server/mir/default_server_configuration.h

src/platform/graphics/platform_probe.cpp

src/platforms/android/client/client_platform_factory.cpp

src/platforms/android/server/android_buffer_allocator.cpp

src/platforms/android/server/device_quirks.cpp

src/platforms/android/server/device_quirks.h

src/platforms/android/server/display.cpp

src/platforms/android/server/display_configuration.cpp

src/platforms/android/server/display_name.h

src/platforms/android/server/fb_device.cpp

src/platforms/android/server/hwc_blanking_control.cpp

src/platforms/android/server/platform.cpp

src/platforms/android/server/platform.h

src/platforms/android/server/real_hwc_wrapper.cpp

src/platforms/evdev/evdev_device_detection.cpp

src/platforms/evdev/libinput_device.cpp

src/platforms/evdev/libinput_device_ptr.cpp

src/platforms/evdev/libinput_device_ptr.h

src/platforms/evdev/libinput_ptr.cpp

src/platforms/evdev/platform.cpp

src/platforms/evdev/platform_factory.cpp

src/platforms/mesa/client/client_platform_factory.cpp

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

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

src/platforms/mesa/server/x11/input/input.cpp

src/platforms/mesa/server/x11/input/input_device.h

src/platforms/mesa/server/x11/input/input_platform.cpp

src/server/CMakeLists.txt

src/server/frontend/CMakeLists.txt

src/server/frontend/default_configuration.cpp

src/server/graphics/nested/display.cpp

src/server/input/CMakeLists.txt

src/server/input/default_configuration.cpp

src/server/input/default_event_builder.cpp

src/server/input/default_event_builder.h

src/server/input/default_input_device_hub.cpp

src/server/input/default_input_device_hub.h

src/server/input/key_repeat_dispatcher.cpp

src/server/input/seat.cpp

src/server/input/seat.h

src/server/report/logging/shell_report.cpp

src/server/scene/CMakeLists.txt

src/server/scene/default_configuration.cpp

src/server/server.cpp

src/server/symbols.map

tests/acceptance-tests/test_debug_api.cpp

tests/acceptance-tests/test_nested_mir.cpp

tests/acceptance-tests/test_surface_raise.cpp

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

tests/integration-tests/test_buffer_scheduling.cpp

tests/mir_test_framework/CMakeLists.txt

tests/mir_test_framework/async_server_runner.cpp

tests/mir_test_framework/executable_path.cpp

tests/mir_test_framework/fake_input_device_impl.cpp

tests/mir_test_framework/fake_input_server_configuration.cpp

tests/mir_test_framework/input_testing_server_options.cpp

tests/mir_test_framework/platform_graphics_dummy.cpp

tests/mir_test_framework/stub_input.cpp

tests/mir_test_framework/stub_input_platform.cpp

tests/mir_test_framework/stubbed_graphics_platform.cpp

tests/umock-acceptance-tests/test_libinput.cpp

tests/unit-tests/client/test_buffer_vault.cpp

tests/unit-tests/client/test_client_buffer_stream.cpp

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

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

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

tests/unit-tests/graphics/test_platform_prober.cpp

tests/unit-tests/input/CMakeLists.txt

tests/unit-tests/input/evdev/test_evdev_device_detection.cpp

tests/unit-tests/input/evdev/test_libinput_device.cpp

tests/unit-tests/input/test_default_input_device_hub.cpp

Show diffs side-by-side

added added

removed removed

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

#include "../X11_resources.h"

#include <boost/throw_exception.hpp>

#include "mir/module_deleter.h"

#include "mir/assert_module_entry_point.h"

namespace mo = mir::options;

namespace mg = mir::graphics;

std::shared_ptr<mir::EmergencyCleanupRegistry> const& /*emergency_cleanup_registry*/,

std::shared_ptr<mg::DisplayReport> const& /*report*/)

{

mir::assert_entry_point_signature<mg::CreateHostPlatform>(&create_host_platform);

if (!x11_resources.get_conn())

BOOST_THROW_EXCEPTION(std::runtime_error("Need valid x11 display"));

std::shared_ptr<mg::DisplayReport> const& /*report*/,

std::shared_ptr<mg::NestedContext> const& nested_context)

{

mir::assert_entry_point_signature<mg::CreateGuestPlatform>(&create_guest_platform);

return mir::make_module_ptr<mgx::GuestPlatform>(nested_context);

}

void add_graphics_platform_options(boost::program_options::options_description& config)

{

mir::assert_entry_point_signature<mg::AddPlatformOptions>(&add_graphics_platform_options);

config.add_options()

(x11_displays_option_name,

boost::program_options::value<std::string>()->default_value("1280x1024"),

mg::PlatformPriority probe_graphics_platform(mo::ProgramOption const& /*options*/)

{

mir::assert_entry_point_signature<mg::PlatformProbe>(&probe_graphics_platform);

auto dpy = XOpenDisplay(nullptr);

if (dpy)

{

100

105

101

106

mir::ModuleProperties const* describe_graphics_module()

102

107

{

108

mir::assert_entry_point_signature<mg::DescribeModule>(&describe_graphics_module);

103

109

return &description;

104

110

}

Older »