From bf7c34507dbfc787d3d1b76d4ca75583e47a832c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Fri, 5 Feb 2021 17:22:30 +0100 Subject: 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: --- src/wayland/meta-wayland.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/wayland/meta-wayland.c') 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 -- cgit v1.2.1