isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-03-25 04:33:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

monitor: Add foreach output helper and fix foreach crtc helper

Browse Source 
The foreach CRTC monitor mode helper incorrectly iterated over outputs
without CRTC when non-tiled modes were set on tiled monitors. This was
not expected by callers, so fix the helper to only iterate over active
outputs (that has or should have a CRTC).

The test cases uses the incorrect behaviour of the foreach CRTC helper
to check that the disabled outputs mode are set to NULL, so add a
foreach output helper and change the tests to use that instead.

https://bugzilla.gnome.org/show_bug.cgi?id=730551
This commit is contained in:
Jonas Ådahl 2017-08-18 14:04:02 +08:00
parent be11c32815
commit 522eec00cd
3 changed files with 40 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/backends/meta-monitor.c
View File

@ -1594,6 +1594,32 @@ meta_monitor_mode_foreach_crtc (MetaMonitor *monitor,
GList *l; GList *l;
int i; int i;
for (l = monitor_priv->outputs, i = 0; l; l = l->next, i++)
{
MetaMonitorCrtcMode *monitor_crtc_mode = &mode->crtc_modes[i];
if (!monitor_crtc_mode->crtc_mode)
continue;
if (!func (monitor, mode, monitor_crtc_mode, user_data, error))
return FALSE;
}
return TRUE;
}
gboolean
meta_monitor_mode_foreach_output (MetaMonitor *monitor,
MetaMonitorMode *mode,
MetaMonitorModeFunc func,
gpointer user_data,
GError **error)
{
MetaMonitorPrivate *monitor_priv =
meta_monitor_get_instance_private (monitor);
GList *l;
int i;
for (l = monitor_priv->outputs, i = 0; l; l = l->next, i++) for (l = monitor_priv->outputs, i = 0; l; l = l->next, i++)
{ {
MetaMonitorCrtcMode *monitor_crtc_mode = &mode->crtc_modes[i]; MetaMonitorCrtcMode *monitor_crtc_mode = &mode->crtc_modes[i];

6
src/backends/meta-monitor.h
View File

@ -197,6 +197,12 @@ gboolean meta_monitor_mode_foreach_crtc (MetaMonitor *monitor,
gpointer user_data, gpointer user_data,
GError **error); GError **error);
gboolean meta_monitor_mode_foreach_output (MetaMonitor *monitor,
MetaMonitorMode *mode,
MetaMonitorModeFunc func,
gpointer user_data,
GError **error);
MetaMonitorSpec * meta_monitor_spec_clone (MetaMonitorSpec *monitor_id); MetaMonitorSpec * meta_monitor_spec_clone (MetaMonitorSpec *monitor_id);
gboolean meta_monitor_spec_equals (MetaMonitorSpec *monitor_id, gboolean meta_monitor_spec_equals (MetaMonitorSpec *monitor_id,

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

@ -659,10 +659,10 @@ check_monitor_configuration (MonitorTestCase *test_case)
.expect_crtc_mode_iter = .expect_crtc_mode_iter =
test_case->expect.monitors[i].modes[j].crtc_modes test_case->expect.monitors[i].modes[j].crtc_modes
}; };
meta_monitor_mode_foreach_crtc (monitor, mode, meta_monitor_mode_foreach_output (monitor, mode,
check_monitor_mode, check_monitor_mode,
&data, &data,
NULL); NULL);
} }
current_mode = meta_monitor_get_current_mode (monitor); current_mode = meta_monitor_get_current_mode (monitor);
@ -688,10 +688,10 @@ check_monitor_configuration (MonitorTestCase *test_case)
.expect_crtc_mode_iter = .expect_crtc_mode_iter =
test_case->expect.monitors[i].modes[expected_current_mode_index].crtc_modes test_case->expect.monitors[i].modes[expected_current_mode_index].crtc_modes
}; };
meta_monitor_mode_foreach_crtc (monitor, expected_current_mode, meta_monitor_mode_foreach_output (monitor, expected_current_mode,
check_current_monitor_mode, check_current_monitor_mode,
&data, &data,
NULL); NULL);
} }
meta_monitor_derive_current_mode (monitor); meta_monitor_derive_current_mode (monitor);