isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-08-10 18:34:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

monitor-config-store: Make parsing a bit more forgiving

Browse Source 
Allow unknown XML elements inside <monitors>. This makes extending in
the future easier.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2030>
This commit is contained in:
Jonas Ådahl
2021-09-30 08:59:03 +02:00
committed by Marge Bot
parent 2d7a8c3ce9
commit b74e99b10b
3 changed files with 133 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/tests/monitor-configs/unknown-elements.xml Normal file
View File

@@ -0,0 +1,31 @@
<monitors version="2">
<unknownundermonitors>
<anotherlevel>text</anotherlevel>
</unknownundermonitors>
<configuration>
<unknownunderconfiguration>
<anotherlevel>text</anotherlevel>
</unknownunderconfiguration>
<logicalmonitor>
<unknownunderlogicalmonitor>
<anotherlevel>text</anotherlevel>
</unknownunderlogicalmonitor>
<x>0</x>
<y>0</y>
<primary>yes</primary>
<monitor>
<monitorspec>
<connector>DP-1</connector>
<vendor>MetaProduct&apos;s Inc.</vendor>
<product>MetaMonitor</product>
<serial>0x123456</serial>
</monitorspec>
<mode>
<width>1920</width>
<height>1080</height>
<rate>60.000495910644531</rate>
</mode>
</monitor>
</logicalmonitor>
</configuration>
</monitors>

56
src/tests/monitor-store-unit-tests.c
View File

@@ -836,6 +836,60 @@ meta_test_monitor_store_interlaced (void)
check_monitor_store_configurations (&expect);
}
static void
meta_test_monitor_store_unknown_elements (void)
{
MonitorStoreTestExpect expect = {
.configurations = {
{
.logical_monitors = {
{
.layout = {
.x = 0,
.y = 0,
.width = 1920,
.height = 1080
},
.scale = 1,
.is_primary = TRUE,
.is_presentation = FALSE,
.monitors = {
{
.connector = "DP-1",
.vendor = "MetaProduct's Inc.",
.product = "MetaMonitor",
.serial = "0x123456",
.mode = {
.width = 1920,
.height = 1080,
.refresh_rate = 60.000495910644531
}
}
},
.n_monitors = 1,
}
},
.n_logical_monitors = 1
}
},
.n_configurations = 1
};
g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING,
"Unknown element <unknownundermonitors> "
"under <monitors>, ignoring");
g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING,
"Unknown element <unknownunderconfiguration> "
"under <configuration>, ignoring");
g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING,
"Unknown element <unknownunderlogicalmonitor> "
"under <logicalmonitor>, ignoring");
set_custom_monitor_config ("unknown-elements.xml");
g_test_assert_expected_messages ();
check_monitor_store_configurations (&expect);
}
void
init_monitor_store_tests (void)
{
@@ -861,4 +915,6 @@ init_monitor_store_tests (void)
meta_test_monitor_store_second_rotated);
g_test_add_func ("/backends/monitor-store/interlaced",
meta_test_monitor_store_interlaced);
g_test_add_func ("/backends/monitor-store/unknown-elements",
meta_test_monitor_store_unknown_elements);
}