b5f50028f2
For the most part, a MetaWindow is expected to live roughly as long as the associated wl_surface, give or take asynchronous API discrepancies. The exception to this rule is handling of reparenting when decorating or undecorating a window, when a MetaWindow on X11 is made to survive the unmap/map cycle. The fact that this didn't hold on Wayland caused various issues, such as a feedback loop where the X11 window kept being remapped. By making the MetaWindow lifetime for Xwayland windows being the same as they are on plain X11, we remove the different semantics here, which seem to lower the risk of hitting the race condition causing the feedback loop mentioned above. What this commit do is separate MetaWindow lifetime handling between native Wayland windows and Xwayland windows. Wayland windows are handled just as they were, i.e. unmanaged together as part of the wl_surface destruction; while during the Xwayland wl_surface destruction, the MetaWindow <-> MetaWaylandSurface association is simply broken. Related: https://gitlab.freedesktop.org/xorg/xserver/issues/740 Fixes: https://gitlab.gnome.org/GNOME/mutter/issues/762 https://gitlab.gnome.org/GNOME/mutter/merge_requests/774
269 lines
8.9 KiB
C
269 lines
8.9 KiB
C
/*
|
|
* Copyright (C) 2012,2013 Intel Corporation
|
|
* Copyright (C) 2013-2017 Red Hat, Inc.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation; either version 2 of the
|
|
* License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
|
* 02111-1307, USA.
|
|
*
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include "wayland/meta-wayland-shell-surface.h"
|
|
|
|
#include "compositor/meta-surface-actor-wayland.h"
|
|
#include "wayland/meta-wayland-actor-surface.h"
|
|
#include "wayland/meta-wayland-buffer.h"
|
|
#include "wayland/meta-wayland-subsurface.h"
|
|
#include "wayland/meta-wayland-surface.h"
|
|
#include "wayland/meta-window-wayland.h"
|
|
|
|
G_DEFINE_ABSTRACT_TYPE (MetaWaylandShellSurface,
|
|
meta_wayland_shell_surface,
|
|
META_TYPE_WAYLAND_ACTOR_SURFACE)
|
|
|
|
void
|
|
meta_wayland_shell_surface_calculate_geometry (MetaWaylandShellSurface *shell_surface,
|
|
MetaRectangle *out_geometry)
|
|
{
|
|
MetaWaylandSurfaceRole *surface_role =
|
|
META_WAYLAND_SURFACE_ROLE (shell_surface);
|
|
MetaWaylandSurface *surface =
|
|
meta_wayland_surface_role_get_surface (surface_role);
|
|
MetaRectangle geometry;
|
|
GNode *n;
|
|
|
|
geometry = (MetaRectangle) {
|
|
.width = meta_wayland_surface_get_width (surface),
|
|
.height = meta_wayland_surface_get_height (surface),
|
|
};
|
|
|
|
for (n = g_node_first_child (surface->subsurface_branch_node);
|
|
n;
|
|
n = g_node_next_sibling (n))
|
|
{
|
|
MetaWaylandSurface *subsurface_surface = n->data;
|
|
MetaWaylandSubsurface *subsurface;
|
|
|
|
if (G_NODE_IS_LEAF (n))
|
|
continue;
|
|
|
|
subsurface = META_WAYLAND_SUBSURFACE (subsurface_surface->role);
|
|
meta_wayland_subsurface_union_geometry (subsurface,
|
|
0, 0,
|
|
&geometry);
|
|
}
|
|
|
|
*out_geometry = geometry;
|
|
}
|
|
|
|
void
|
|
meta_wayland_shell_surface_determine_geometry (MetaWaylandShellSurface *shell_surface,
|
|
MetaRectangle *set_geometry,
|
|
MetaRectangle *out_geometry)
|
|
{
|
|
MetaRectangle bounding_geometry = { 0 };
|
|
MetaRectangle intersected_geometry = { 0 };
|
|
|
|
meta_wayland_shell_surface_calculate_geometry (shell_surface,
|
|
&bounding_geometry);
|
|
|
|
meta_rectangle_intersect (set_geometry, &bounding_geometry,
|
|
&intersected_geometry);
|
|
|
|
*out_geometry = intersected_geometry;
|
|
}
|
|
|
|
void
|
|
meta_wayland_shell_surface_set_window (MetaWaylandShellSurface *shell_surface,
|
|
MetaWindow *window)
|
|
{
|
|
MetaWaylandSurfaceRole *surface_role =
|
|
META_WAYLAND_SURFACE_ROLE (shell_surface);
|
|
MetaWaylandSurface *surface =
|
|
meta_wayland_surface_role_get_surface (surface_role);
|
|
|
|
meta_wayland_surface_set_window (surface, window);
|
|
meta_window_update_monitor (window, META_WINDOW_UPDATE_MONITOR_FLAGS_NONE);
|
|
}
|
|
|
|
void
|
|
meta_wayland_shell_surface_configure (MetaWaylandShellSurface *shell_surface,
|
|
int new_x,
|
|
int new_y,
|
|
int new_width,
|
|
int new_height,
|
|
MetaWaylandSerial *sent_serial)
|
|
{
|
|
MetaWaylandShellSurfaceClass *shell_surface_class =
|
|
META_WAYLAND_SHELL_SURFACE_GET_CLASS (shell_surface);
|
|
|
|
shell_surface_class->configure (shell_surface,
|
|
new_x,
|
|
new_y,
|
|
new_width,
|
|
new_height,
|
|
sent_serial);
|
|
}
|
|
|
|
void
|
|
meta_wayland_shell_surface_ping (MetaWaylandShellSurface *shell_surface,
|
|
uint32_t serial)
|
|
{
|
|
MetaWaylandShellSurfaceClass *shell_surface_class =
|
|
META_WAYLAND_SHELL_SURFACE_GET_CLASS (shell_surface);
|
|
|
|
shell_surface_class->ping (shell_surface, serial);
|
|
}
|
|
|
|
void
|
|
meta_wayland_shell_surface_close (MetaWaylandShellSurface *shell_surface)
|
|
{
|
|
MetaWaylandShellSurfaceClass *shell_surface_class =
|
|
META_WAYLAND_SHELL_SURFACE_GET_CLASS (shell_surface);
|
|
|
|
shell_surface_class->close (shell_surface);
|
|
}
|
|
|
|
void
|
|
meta_wayland_shell_surface_managed (MetaWaylandShellSurface *shell_surface,
|
|
MetaWindow *window)
|
|
{
|
|
MetaWaylandShellSurfaceClass *shell_surface_class =
|
|
META_WAYLAND_SHELL_SURFACE_GET_CLASS (shell_surface);
|
|
|
|
shell_surface_class->managed (shell_surface, window);
|
|
}
|
|
|
|
static void
|
|
meta_wayland_shell_surface_surface_commit (MetaWaylandSurfaceRole *surface_role,
|
|
MetaWaylandPendingState *pending)
|
|
{
|
|
MetaWaylandActorSurface *actor_surface =
|
|
META_WAYLAND_ACTOR_SURFACE (surface_role);
|
|
MetaWaylandSurface *surface =
|
|
meta_wayland_surface_role_get_surface (surface_role);
|
|
MetaWaylandSurfaceRoleClass *surface_role_class;
|
|
MetaWindow *window;
|
|
MetaWaylandBuffer *buffer;
|
|
double geometry_scale;
|
|
|
|
surface_role_class =
|
|
META_WAYLAND_SURFACE_ROLE_CLASS (meta_wayland_shell_surface_parent_class);
|
|
surface_role_class->commit (surface_role, pending);
|
|
|
|
buffer = surface->buffer_ref.buffer;
|
|
if (!buffer)
|
|
return;
|
|
|
|
window = surface->window;
|
|
if (!window)
|
|
return;
|
|
|
|
geometry_scale = meta_wayland_actor_surface_get_geometry_scale (actor_surface);
|
|
|
|
window->buffer_rect.width =
|
|
meta_wayland_surface_get_width (surface) * geometry_scale;
|
|
window->buffer_rect.height =
|
|
meta_wayland_surface_get_height (surface) * geometry_scale;
|
|
}
|
|
|
|
static double
|
|
meta_wayland_shell_surface_get_geometry_scale (MetaWaylandActorSurface *actor_surface)
|
|
{
|
|
MetaWaylandSurfaceRole *surface_role =
|
|
META_WAYLAND_SURFACE_ROLE (actor_surface);
|
|
MetaWaylandSurface *surface =
|
|
meta_wayland_surface_role_get_surface (surface_role);
|
|
MetaWindow *toplevel_window;
|
|
|
|
toplevel_window = meta_wayland_surface_get_toplevel_window (surface);
|
|
if (meta_is_stage_views_scaled () || !toplevel_window)
|
|
return 1;
|
|
else
|
|
return meta_window_wayland_get_geometry_scale (toplevel_window);
|
|
}
|
|
|
|
static void
|
|
meta_wayland_shell_surface_sync_actor_state (MetaWaylandActorSurface *actor_surface)
|
|
{
|
|
MetaWaylandSurfaceRole *surface_role =
|
|
META_WAYLAND_SURFACE_ROLE (actor_surface);
|
|
MetaWaylandSurface *surface =
|
|
meta_wayland_surface_role_get_surface (surface_role);
|
|
MetaWaylandActorSurfaceClass *actor_surface_class =
|
|
META_WAYLAND_ACTOR_SURFACE_CLASS (meta_wayland_shell_surface_parent_class);
|
|
MetaWaylandSurface *toplevel_surface;
|
|
|
|
toplevel_surface = meta_wayland_surface_get_toplevel (surface);
|
|
if (toplevel_surface && toplevel_surface->window)
|
|
actor_surface_class->sync_actor_state (actor_surface);
|
|
}
|
|
|
|
void
|
|
meta_wayland_shell_surface_destroy_window (MetaWaylandShellSurface *shell_surface)
|
|
{
|
|
MetaWaylandSurfaceRole *surface_role =
|
|
META_WAYLAND_SURFACE_ROLE (shell_surface);
|
|
MetaWaylandSurface *surface =
|
|
meta_wayland_surface_role_get_surface (surface_role);
|
|
MetaWindow *window;
|
|
MetaDisplay *display;
|
|
uint32_t timestamp;
|
|
|
|
window = surface->window;
|
|
if (!window)
|
|
return;
|
|
|
|
display = meta_window_get_display (window);
|
|
timestamp = meta_display_get_current_time_roundtrip (display);
|
|
meta_window_unmanage (surface->window, timestamp);
|
|
g_assert (!surface->window);
|
|
}
|
|
|
|
static void
|
|
meta_wayland_shell_surface_finalize (GObject *object)
|
|
{
|
|
MetaWaylandShellSurface *shell_surface = META_WAYLAND_SHELL_SURFACE (object);
|
|
|
|
meta_wayland_shell_surface_destroy_window (shell_surface);
|
|
|
|
G_OBJECT_CLASS (meta_wayland_shell_surface_parent_class)->finalize (object);
|
|
}
|
|
|
|
static void
|
|
meta_wayland_shell_surface_init (MetaWaylandShellSurface *role)
|
|
{
|
|
}
|
|
|
|
static void
|
|
meta_wayland_shell_surface_class_init (MetaWaylandShellSurfaceClass *klass)
|
|
{
|
|
GObjectClass *object_class = G_OBJECT_CLASS (klass);
|
|
MetaWaylandSurfaceRoleClass *surface_role_class =
|
|
META_WAYLAND_SURFACE_ROLE_CLASS (klass);
|
|
MetaWaylandActorSurfaceClass *actor_surface_class =
|
|
META_WAYLAND_ACTOR_SURFACE_CLASS (klass);
|
|
|
|
object_class->finalize = meta_wayland_shell_surface_finalize;
|
|
|
|
surface_role_class->commit = meta_wayland_shell_surface_surface_commit;
|
|
|
|
actor_surface_class->get_geometry_scale =
|
|
meta_wayland_shell_surface_get_geometry_scale;
|
|
actor_surface_class->sync_actor_state =
|
|
meta_wayland_shell_surface_sync_actor_state;
|
|
}
|