From af83233be392a8ea30d06bea58ac9c1f8404c699 Mon Sep 17 00:00:00 2001 From: Sebastian Wick Date: Tue, 16 Jul 2024 17:31:23 +0200 Subject: [PATCH] wayland/outputs: Return a monitor instead of a logical monitor Going from the monitor to a logical monitor is possible but going from a logical monitor to a monitor is ambiguous. Part-of: --- src/wayland/meta-wayland-outputs.c | 6 +++--- src/wayland/meta-wayland-outputs.h | 2 +- src/wayland/meta-wayland-surface.c | 4 +++- src/wayland/meta-wayland-xdg-shell.c | 4 +++- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/wayland/meta-wayland-outputs.c b/src/wayland/meta-wayland-outputs.c index 971f7bea6..e062d25cc 100644 --- a/src/wayland/meta-wayland-outputs.c +++ b/src/wayland/meta-wayland-outputs.c @@ -80,10 +80,10 @@ meta_wayland_output_get_resources (MetaWaylandOutput *wayland_output) return wayland_output->resources; } -MetaLogicalMonitor * -meta_wayland_output_get_logical_monitor (MetaWaylandOutput *wayland_output) +MetaMonitor * +meta_wayland_output_get_monitor (MetaWaylandOutput *wayland_output) { - return meta_monitor_get_logical_monitor (wayland_output->monitor); + return wayland_output->monitor; } static void diff --git a/src/wayland/meta-wayland-outputs.h b/src/wayland/meta-wayland-outputs.h index 66f68da62..f28b59122 100644 --- a/src/wayland/meta-wayland-outputs.h +++ b/src/wayland/meta-wayland-outputs.h @@ -31,7 +31,7 @@ G_DECLARE_FINAL_TYPE (MetaWaylandOutput, meta_wayland_output, const GList * meta_wayland_output_get_resources (MetaWaylandOutput *wayland_output); -MetaLogicalMonitor * meta_wayland_output_get_logical_monitor (MetaWaylandOutput *wayland_output); +MetaMonitor * meta_wayland_output_get_monitor (MetaWaylandOutput *wayland_output); void meta_wayland_outputs_finalize (MetaWaylandCompositor *compositor); diff --git a/src/wayland/meta-wayland-surface.c b/src/wayland/meta-wayland-surface.c index 54c05115c..0f57739af 100644 --- a/src/wayland/meta-wayland-surface.c +++ b/src/wayland/meta-wayland-surface.c @@ -1480,12 +1480,14 @@ update_surface_output_state (gpointer key, gpointer value, gpointer user_data) { MetaWaylandOutput *wayland_output = value; MetaWaylandSurface *surface = user_data; + MetaMonitor *monitor; MetaLogicalMonitor *logical_monitor; gboolean is_on_logical_monitor; g_assert (surface->role); - logical_monitor = meta_wayland_output_get_logical_monitor (wayland_output); + monitor = meta_wayland_output_get_monitor (wayland_output); + logical_monitor = meta_monitor_get_logical_monitor (monitor); if (!logical_monitor) { set_surface_is_on_output (surface, wayland_output, FALSE); diff --git a/src/wayland/meta-wayland-xdg-shell.c b/src/wayland/meta-wayland-xdg-shell.c index 523f0900c..0e5048b00 100644 --- a/src/wayland/meta-wayland-xdg-shell.c +++ b/src/wayland/meta-wayland-xdg-shell.c @@ -508,10 +508,12 @@ xdg_toplevel_set_fullscreen (struct wl_client *client, wayland_output = wl_resource_get_user_data (output_resource); if (wayland_output) { + MetaMonitor *monitor; MetaLogicalMonitor *logical_monitor; + monitor = meta_wayland_output_get_monitor (wayland_output); logical_monitor = - meta_wayland_output_get_logical_monitor (wayland_output); + meta_monitor_get_logical_monitor (monitor); meta_window_move_to_monitor (window, logical_monitor->number); } }