diff options
| author | Jonas Ådahl <jadahl@gmail.com> | 2021-02-05 17:22:30 +0100 |
|---|---|---|
| committer | Marge Bot <marge-bot@gnome.org> | 2021-08-22 16:40:42 +0000 |
| commit | bf7c34507dbfc787d3d1b76d4ca75583e47a832c (patch) | |
| tree | 4d486c7c24ced31b9c80151ea3a5e67d6fe4e378 /src/wayland/meta-wayland.c | |
| parent | 4615da2122d9fcfa4bc87dee0994ec9213330486 (diff) | |
| download | mutter-bf7c34507dbfc787d3d1b76d4ca75583e47a832c.tar.gz | |
wayland/output: Make each wl_output correspond to one monitor
This is more in line with the protocol, and allows us to remove some
awkward code that tries to "combine" different metadata from different
monitors into one, which sometimes meant picking an arbitrary "main"
monitor, or "and" metadata together to find a common ground.
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1712>
Diffstat (limited to 'src/wayland/meta-wayland.c')
| -rw-r--r-- | src/wayland/meta-wayland.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/wayland/meta-wayland.c b/src/wayland/meta-wayland.c index e2832bbc4..089b2d502 100644 --- a/src/wayland/meta-wayland.c +++ b/src/wayland/meta-wayland.c @@ -240,7 +240,6 @@ get_output_for_stage_view (MetaWaylandCompositor *compositor, MetaCrtc *crtc; MetaOutput *output; MetaMonitor *monitor; - MetaLogicalMonitor *logical_monitor; crtc = meta_renderer_view_get_crtc (META_RENDERER_VIEW (stage_view)); @@ -251,8 +250,8 @@ get_output_for_stage_view (MetaWaylandCompositor *compositor, output = meta_crtc_get_outputs (crtc)->data; monitor = meta_output_get_monitor (output); - logical_monitor = meta_monitor_get_logical_monitor (monitor); - return g_hash_table_lookup (compositor->outputs, &logical_monitor->winsys_id); + return g_hash_table_lookup (compositor->outputs, + meta_monitor_get_spec (monitor)); } static void |