brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

logical-monitor: Don't duplicate output list

Browse Source 
Just use the monitor list and the output lists of each monitor.

https://bugzilla.gnome.org/show_bug.cgi?id=777732
This commit is contained in:
Jonas Ådahl
2016-12-13 21:44:16 +08:00
parent 310064601c
commit ff633f295e
5 changed files with 82 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/tests/monitor-unit-tests.c
View File

@ -305,7 +305,8 @@ check_monitor_configuration (MonitorTestCase *test_case)
MetaLogicalMonitor *logical_monitor = l->data;
MonitorTestCaseLogicalMonitor *test_logical_monitor =
&test_case->expect.logical_monitors[i];
int j;
GList *monitors;
GList *l_monitor;
g_assert (logical_monitor->rect.x == test_logical_monitor->layout.x);
g_assert (logical_monitor->rect.y == test_logical_monitor->layout.y);
@ -315,11 +316,20 @@ check_monitor_configuration (MonitorTestCase *test_case)
test_logical_monitor->layout.height);
g_assert (logical_monitor->scale == test_logical_monitor->scale);
for (j = 0; j < logical_monitor->n_outputs; j++)
monitors = meta_logical_monitor_get_monitors (logical_monitor);
for (l_monitor = monitors; l_monitor; l_monitor = l_monitor->next)
{
MetaOutput *output = logical_monitor->outputs[j];
MetaMonitor *monitor = l_monitor->data;
GList *outputs;
GList *l_output;
g_assert (output->crtc->logical_monitor == logical_monitor);
outputs = meta_monitor_get_outputs (monitor);
for (l_output = outputs; l_output; l_output = l_output->next)
{
MetaOutput *output = l_output->data;
g_assert (output->crtc->logical_monitor == logical_monitor);
}
}
}
g_assert (n_logical_monitors == i);