~vanvugt/mir/frontend-server

« back to all changes in this revision

Viewing changes to src/server/input/default_configuration.cpp

Committer: Daniel van Vugt
Date: 2014-03-06 03:18:55 UTC
mfrom: (1416.1.37 development-branch)
Revision ID: daniel.van.vugt@canonical.com-20140306031855-pjar7q2m3ghjwly5

Merge latest development-branch.

files modified:
CMakeLists.txt

examples/eglplasma.c

examples/render_overlays.cpp

examples/render_surfaces.cpp

include/platform/mir/graphics/renderable.h

include/platform/mir/options/configuration.h

include/server/mir/compositor/buffer_stream.h

include/server/mir/compositor/display_buffer_compositor.h

include/test/mir_test_doubles/fake_renderable.h

include/test/mir_test_doubles/mock_buffer_bundle.h

include/test/mir_test_doubles/mock_buffer_stream.h

include/test/mir_test_doubles/mock_renderable.h

include/test/mir_test_doubles/stub_buffer_stream.h

include/test/mir_test_doubles/stub_renderable.h

src/platform/options/default_configuration.cpp

src/server/compositor/buffer_bundle.h

src/server/compositor/buffer_stream_surfaces.cpp

src/server/compositor/buffer_stream_surfaces.h

src/server/compositor/default_display_buffer_compositor.cpp

src/server/compositor/default_display_buffer_compositor.h

src/server/compositor/multi_threaded_compositor.cpp

src/server/compositor/multi_threaded_compositor.h

src/server/compositor/rendering_operator.cpp

src/server/compositor/rendering_operator.h

src/server/compositor/switching_bundle.cpp

src/server/compositor/switching_bundle.h

src/server/graphics/default_configuration.cpp

src/server/input/default_configuration.cpp

src/server/scene/basic_surface.cpp

src/server/scene/basic_surface.h

src/server/scene/surface_stack.cpp

tests/integration-tests/test_swapinterval.cpp

tests/unit-tests/compositor/test_compositing_screencast.cpp

tests/unit-tests/compositor/test_default_display_buffer_compositor.cpp

tests/unit-tests/compositor/test_gl_renderer.cpp

tests/unit-tests/compositor/test_multi_threaded_compositor.cpp

tests/unit-tests/compositor/test_rendering_operator.cpp

tests/unit-tests/scene/test_surface_stack.cpp

tools/install_on_android.sh

Show diffs side-by-side

added added

removed removed

src/server/input/default_configuration.cpp

{

return std::make_shared<mi::NullInputConfiguration>();

}

// TODO (default-nested): don't fallback to standalone if host socket is unset in 14.04

else if (options->is_set(options::standalone_opt) || !options->is_set(options::host_socket_opt))

else if (!options->is_set(options::host_socket_opt))

{

// fallback to standalone if host socket is unset

return std::make_shared<mia::DefaultInputConfiguration>(

the_composite_event_filter(),

the_input_region(),

Older »