New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add a "--display-config static=<filename>" option #551
Merged
Merged
Changes from 21 commits
Commits
Show all changes
34 commits
Select commit
Hold shift + click to select a range
f7c02b7
Introduce StaticDisplayConfigurationPolicy
AlanGriffiths c26c954
Add parsing (pass one)
AlanGriffiths 9b300d8
More robust parsing and rudimentary error reporting
AlanGriffiths 22098ae
Make things a bit more readable
AlanGriffiths d0d4dad
Fix FTBFS on Ubuntu 16.04
AlanGriffiths 57b71ef
Rename "size" to "mode"
AlanGriffiths 7b11c41
Add optional refresh rate to mode
AlanGriffiths 7bf8562
Add optional "scale" property
AlanGriffiths 3d9791e
Remove support for "scale" (as it doesn't work)
AlanGriffiths bffc762
Add "orientation" property
AlanGriffiths fa7eb54
Fix FTBFS with clang
AlanGriffiths 48875d5
Split StaticDisplayConfig into its own files
AlanGriffiths 59a7de9
Move implementation out of header
AlanGriffiths 077d61e
First cut at parsing YAML
AlanGriffiths 7fd0329
Fixup
AlanGriffiths 3f38bb4
Dump layout as yaml
AlanGriffiths b550205
Dump layout as yaml
AlanGriffiths 9837cdb
Rudimentary error handling
AlanGriffiths 6e82253
Number ports within output type
AlanGriffiths 1491daa
Eliminate port index within card
AlanGriffiths 817d31c
Change "displays" tag to more intuitive "cards"
AlanGriffiths aed3c7d
Fix Fedora dependencies
AlanGriffiths 1a1e8c2
Fix clang FTBFS
AlanGriffiths dac7b34
Review comments
AlanGriffiths b70fcad
Add facility to disable outputs
AlanGriffiths 884874f
Add a constructor that can be used to supply test input.
AlanGriffiths bded7b0
DRY
AlanGriffiths a20397b
Use the 'default' layout
AlanGriffiths f7e169f
Local functions should be in anon namespace
AlanGriffiths e9d4c50
Tidy code
AlanGriffiths f25c5b9
StaticDisplayConfig test fixture. (And fix some linker options.)
AlanGriffiths 8627b49
Reasonable set of tests
AlanGriffiths b50bdfe
Drop the logic for using layout not called "default"
AlanGriffiths 8f0e7e5
Test demonstrating using an alias
AlanGriffiths File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,15 +9,20 @@ set(MIRAL_ABI 3) | |
set(symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols.map) | ||
set(miral_include ${PROJECT_SOURCE_DIR}/include/miral) | ||
|
||
pkg_check_modules(YAML REQUIRED yaml-cpp) | ||
|
||
add_library(mirclientcpp INTERFACE) | ||
|
||
add_definitions(-DMIR_LOG_COMPONENT_FALLBACK="miral") | ||
|
||
add_library(miral-internal STATIC | ||
active_outputs.cpp active_outputs.h | ||
basic_window_manager.cpp basic_window_manager.h window_manager_tools_implementation.h | ||
coordinate_translator.cpp coordinate_translator.h | ||
display_configuration_listeners.cpp display_configuration_listeners.h | ||
launch_app.cpp launch_app.h | ||
mru_window_list.cpp mru_window_list.h | ||
static_display_config.cpp static_display_config.h | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Indentation nitpick There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. What are you seeing that I don't? |
||
window_management_trace.cpp window_management_trace.h | ||
xcursor_loader.cpp xcursor_loader.h | ||
xcursor.c xcursor.h | ||
|
@@ -95,6 +100,7 @@ target_link_libraries(miral | |
miral-internal | ||
mirserver | ||
${WAYLAND_CLIENT_LDFLAGS} ${WAYLAND_CLIENT_LIBRARIES} | ||
${YAML_LIBRARIES} | ||
) | ||
|
||
set_target_properties(miral | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is there any way to make this optional?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why?