brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wayland/outputs: Return a monitor instead of a logical monitor

Browse Source 
Going from the monitor to a logical monitor is possible but going from a
logical monitor to a monitor is ambiguous.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3930>
This commit is contained in:
Sebastian Wick 2024-07-16 17:31:23 +02:00 committed by Marge Bot
parent dcaa57c2c8
commit af83233be3
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/wayland/meta-wayland-outputs.c
View File

@ -80,10 +80,10 @@ meta_wayland_output_get_resources (MetaWaylandOutput *wayland_output)
return wayland_output->resources; return wayland_output->resources;
} }
MetaLogicalMonitor * MetaMonitor *
meta_wayland_output_get_logical_monitor (MetaWaylandOutput *wayland_output) meta_wayland_output_get_monitor (MetaWaylandOutput *wayland_output)
{ {
return meta_monitor_get_logical_monitor (wayland_output->monitor); return wayland_output->monitor;
} }
static void static void

2
src/wayland/meta-wayland-outputs.h
View File

@ -31,7 +31,7 @@ G_DECLARE_FINAL_TYPE (MetaWaylandOutput, meta_wayland_output,
const GList * meta_wayland_output_get_resources (MetaWaylandOutput *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); void meta_wayland_outputs_finalize (MetaWaylandCompositor *compositor);

4
src/wayland/meta-wayland-surface.c
View File

@ -1480,12 +1480,14 @@ update_surface_output_state (gpointer key, gpointer value, gpointer user_data)
{ {
MetaWaylandOutput *wayland_output = value; MetaWaylandOutput *wayland_output = value;
MetaWaylandSurface *surface = user_data; MetaWaylandSurface *surface = user_data;
MetaMonitor *monitor;
MetaLogicalMonitor *logical_monitor; MetaLogicalMonitor *logical_monitor;
gboolean is_on_logical_monitor; gboolean is_on_logical_monitor;
g_assert (surface->role); 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) if (!logical_monitor)
{ {
set_surface_is_on_output (surface, wayland_output, FALSE); set_surface_is_on_output (surface, wayland_output, FALSE);

4
src/wayland/meta-wayland-xdg-shell.c
View File

@ -508,10 +508,12 @@ xdg_toplevel_set_fullscreen (struct wl_client *client,
wayland_output = wl_resource_get_user_data (output_resource); wayland_output = wl_resource_get_user_data (output_resource);
if (wayland_output) if (wayland_output)
{ {
MetaMonitor *monitor;
MetaLogicalMonitor *logical_monitor; MetaLogicalMonitor *logical_monitor;
monitor = meta_wayland_output_get_monitor (wayland_output);
logical_monitor = 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); meta_window_move_to_monitor (window, logical_monitor->number);
} }
} }