← Back to branch summary

~kdub/mir/devel-to-0.1.7

~kdub/mir/devel-to-0.1.7

« back to all changes in this revision

Viewing changes to src/server/graphics/offscreen/display_configuration.cpp

Committer: Tarmac
Author(s): Daniel van Vugt
Date: 2014-02-28 13:51:43 UTC
mfrom: (1331.2.48 eliminate-configure-output)
Revision ID: tarmac-20140228135143-tfadyqqhiqpeqxcm

Eliminate "configure_output()" and its long parameter list that has caused us
so much grief recently.

Replaced by a mutable version of for_each_output(), where you can observe
and modify fields of each DisplayConfigurationOutput directly.
This not only eliminates the coupling problem, but simplifies typical
display config changes that only touch a small number of fields (as
demonstrated in examples/*).

Validation checking that used to exist in some configure_output()
implementations has been reimplemented as common to all platforms now, and
moved to the Display::configure() stage.

Approved by PS Jenkins bot, Alberto Aguirre.

files modified:
examples/demo-shell/window_manager.cpp

examples/pixel_format_selector.cpp

examples/server_configuration.cpp

include/platform/mir/graphics/display_configuration.h

include/test/mir_test_doubles/null_display_configuration.h

include/test/mir_test_doubles/stub_display_configuration.h

src/platform/graphics/android/android_display.cpp

src/platform/graphics/android/android_display_configuration.cpp

src/platform/graphics/android/android_display_configuration.h

src/platform/graphics/display_configuration.cpp

src/platform/graphics/mesa/display.cpp

src/platform/graphics/mesa/real_kms_display_configuration.cpp

src/platform/graphics/mesa/real_kms_display_configuration.h

src/server/frontend/session_mediator.cpp

src/server/graphics/default_display_configuration_policy.cpp

src/server/graphics/nested/nested_display.cpp

src/server/graphics/nested/nested_display_configuration.cpp

src/server/graphics/nested/nested_display_configuration.h

src/server/graphics/offscreen/display.cpp

src/server/graphics/offscreen/display_configuration.cpp

src/server/graphics/offscreen/display_configuration.h

src/server/scene/mediating_display_changer.cpp

tests/mir_test/display_config_matchers.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

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

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

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

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

tests/unit-tests/graphics/nested/test_nested_display_configuration.cpp

tests/unit-tests/graphics/test_default_display_configuration_policy.cpp

tests/unit-tests/graphics/test_display.cpp

tests/unit-tests/graphics/test_display_configuration.cpp

Show diffs side-by-side

added added

removed removed

src/server/graphics/offscreen/display_configuration.cpp

69

69

f(output);

70

70

}

71

71

72

void mgo::DisplayConfiguration::configure_output(

73

mg::DisplayConfigurationOutputId, bool, geom::Point, size_t,

74

MirPixelFormat, MirPowerMode, MirOrientation)

72

void mgo::DisplayConfiguration::for_each_output(

73

std::function<void(mg::UserDisplayConfigurationOutput&)> f)

75

74

{

75

mg::UserDisplayConfigurationOutput user(output);

76

f(user);

76

77

}

78

Older »