output: Tie the output to the monitor it's part of

Outputs correspond to active connectors, that we translate into
monitors. Make this association more real by adding a pointer back to
the monitor from the output.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1488>
This commit is contained in:
Jonas Ådahl
2020-10-08 17:34:57 +02:00
committed by Marge Bot
parent 5edc118d62
commit 7215b0d88c
4 changed files with 35 additions and 0 deletions

View File

@ -675,6 +675,8 @@ meta_monitor_normal_new (MetaGpu *gpu,
monitor_priv->gpu = gpu;
monitor_priv->outputs = g_list_append (NULL, g_object_ref (output));
meta_output_set_monitor (output, monitor);
monitor_priv->winsys_id = meta_output_get_id (output);
meta_monitor_generate_spec (monitor);
@ -802,6 +804,8 @@ add_tiled_monitor_outputs (MetaGpu *gpu,
monitor_priv->outputs = g_list_append (monitor_priv->outputs,
g_object_ref (output));
meta_output_set_monitor (output, META_MONITOR (monitor_tiled));
}
}