mirror of
https://github.com/brl/mutter.git
synced 2024-11-27 10:30:47 -05:00
05efcb4b21
Move the use count from a separate MetaWaylandBufferRef struct to the MetaWaylandBuffer class, and remove the former. The buffer use count is now incremented already in meta_wayland_surface_commit, since the Wayland protocol defines the buffer to be in use by the compositor at that point. If the buffer attachment ends up being dropped again before it is applied to the surface state (e.g. because another buffer is committed to a synchronized sub-surface before the parent surface is committed), the use count is now decremented, and a buffer release event is sent if the use count drops to 0. Buffer release events were previously incorrectly not sent under these circumstances. Test case: Run the weston-subsurfaces demo with the -r1 and/or -t1 command line parameter. Resize the window. Before this change, weston-subsurfaces would freeze or abort after a few resize operations, because mutter failed to send release events and the client ran out of usable buffers. v2: * Handle NULL priv->buffer_ref in meta_wayland_cursor_surface_apply_state. v3: * Remove MetaWaylandBufferRef altogether, move the use count tracking to MetaWaylandBuffer itself. Much simpler, and doesn't run into lifetime issues when mutter shuts down. v4: * Warn if use count isn't 0 in meta_wayland_buffer_finalize. * Keep pending_buffer_resource_destroyed for attached but not yet committed buffers. If the client attaches a buffer and then destroys it before commit, we ignore the buffer attachement, same as before this MR. v5: * Rebase on top of new commit which splits up surface->texture. * MetaWaylandSurfaceState::buffer can only be non-NULL if ::newly_attached is TRUE, simplify accordingly. Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1880>
262 lines
8.2 KiB
C
262 lines
8.2 KiB
C
/*
|
|
* Copyright (C) 2013 Intel Corporation
|
|
* Copyright (C) 2013-2019 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-xwayland-surface.h"
|
|
|
|
#include "compositor/meta-surface-actor-wayland.h"
|
|
#include "compositor/meta-window-actor-private.h"
|
|
#include "wayland/meta-wayland-actor-surface.h"
|
|
#include "wayland/meta-window-xwayland.h"
|
|
#include "wayland/meta-xwayland-private.h"
|
|
|
|
enum
|
|
{
|
|
WINDOW_ASSOCIATED,
|
|
|
|
N_SIGNALS
|
|
};
|
|
|
|
static guint signals[N_SIGNALS];
|
|
|
|
struct _MetaXwaylandSurface
|
|
{
|
|
MetaWaylandActorSurface parent;
|
|
|
|
MetaWindow *window;
|
|
|
|
gulong unmanaging_handler_id;
|
|
};
|
|
|
|
G_DEFINE_TYPE (MetaXwaylandSurface,
|
|
meta_xwayland_surface,
|
|
META_TYPE_WAYLAND_ACTOR_SURFACE)
|
|
|
|
static void
|
|
clear_window (MetaXwaylandSurface *xwayland_surface)
|
|
{
|
|
MetaWaylandSurfaceRole *surface_role =
|
|
META_WAYLAND_SURFACE_ROLE (xwayland_surface);
|
|
MetaWaylandSurface *surface =
|
|
meta_wayland_surface_role_get_surface (surface_role);
|
|
MetaSurfaceActor *surface_actor;
|
|
MetaWindowXwayland *xwayland_window;
|
|
|
|
if (!xwayland_surface->window)
|
|
return;
|
|
|
|
g_clear_signal_handler (&xwayland_surface->unmanaging_handler_id,
|
|
xwayland_surface->window);
|
|
xwayland_window = META_WINDOW_XWAYLAND (xwayland_surface->window);
|
|
meta_window_xwayland_set_surface (xwayland_window, NULL);
|
|
xwayland_surface->window = NULL;
|
|
|
|
surface_actor = meta_wayland_surface_get_actor (surface);
|
|
if (surface_actor)
|
|
clutter_actor_set_reactive (CLUTTER_ACTOR (surface_actor), FALSE);
|
|
|
|
meta_wayland_surface_notify_unmapped (surface);
|
|
}
|
|
|
|
static void
|
|
window_unmanaging (MetaWindow *window,
|
|
MetaXwaylandSurface *xwayland_surface)
|
|
{
|
|
clear_window (xwayland_surface);
|
|
}
|
|
|
|
void
|
|
meta_xwayland_surface_associate_with_window (MetaXwaylandSurface *xwayland_surface,
|
|
MetaWindow *window)
|
|
{
|
|
MetaWaylandSurfaceRole *surface_role =
|
|
META_WAYLAND_SURFACE_ROLE (xwayland_surface);
|
|
MetaWaylandSurface *surface =
|
|
meta_wayland_surface_role_get_surface (surface_role);
|
|
MetaWindowXwayland *xwayland_window = META_WINDOW_XWAYLAND (window);
|
|
MetaWaylandSurface *window_surface = meta_window_get_wayland_surface (window);
|
|
MetaSurfaceActor *surface_actor;
|
|
MetaWindowActor *window_actor;
|
|
|
|
/*
|
|
* If the window has an existing surface, like if we're undecorating or
|
|
* decorating the window, then we need to detach the window from its old
|
|
* surface.
|
|
*/
|
|
if (window_surface)
|
|
{
|
|
MetaXwaylandSurface *other_xwayland_surface;
|
|
|
|
other_xwayland_surface = META_XWAYLAND_SURFACE (window_surface->role);
|
|
clear_window (other_xwayland_surface);
|
|
}
|
|
|
|
meta_window_xwayland_set_surface (xwayland_window, surface);
|
|
xwayland_surface->window = window;
|
|
|
|
surface_actor = meta_wayland_surface_get_actor (surface);
|
|
if (surface_actor)
|
|
clutter_actor_set_reactive (CLUTTER_ACTOR (surface_actor), TRUE);
|
|
|
|
xwayland_surface->unmanaging_handler_id =
|
|
g_signal_connect (window,
|
|
"unmanaging",
|
|
G_CALLBACK (window_unmanaging),
|
|
xwayland_surface);
|
|
|
|
g_signal_emit (xwayland_surface, signals[WINDOW_ASSOCIATED], 0);
|
|
|
|
window_actor = meta_window_actor_from_window (window);
|
|
if (window_actor)
|
|
meta_window_actor_assign_surface_actor (window_actor, surface_actor);
|
|
}
|
|
|
|
static void
|
|
meta_xwayland_surface_assigned (MetaWaylandSurfaceRole *surface_role)
|
|
{
|
|
MetaWaylandSurface *surface =
|
|
meta_wayland_surface_role_get_surface (surface_role);
|
|
MetaWaylandSurfaceRoleClass *surface_role_class =
|
|
META_WAYLAND_SURFACE_ROLE_CLASS (meta_xwayland_surface_parent_class);
|
|
|
|
surface->dnd.funcs = meta_xwayland_selection_get_drag_dest_funcs ();
|
|
|
|
surface_role_class->assigned (surface_role);
|
|
}
|
|
|
|
static void
|
|
meta_xwayland_surface_pre_apply_state (MetaWaylandSurfaceRole *surface_role,
|
|
MetaWaylandSurfaceState *pending)
|
|
{
|
|
MetaWaylandSurface *surface =
|
|
meta_wayland_surface_role_get_surface (surface_role);
|
|
MetaXwaylandSurface *xwayland_surface = META_XWAYLAND_SURFACE (surface_role);
|
|
|
|
if (pending->newly_attached &&
|
|
!surface->buffer &&
|
|
xwayland_surface->window)
|
|
meta_window_queue (xwayland_surface->window, META_QUEUE_CALC_SHOWING);
|
|
}
|
|
|
|
static void
|
|
meta_xwayland_surface_get_relative_coordinates (MetaWaylandSurfaceRole *surface_role,
|
|
float abs_x,
|
|
float abs_y,
|
|
float *out_sx,
|
|
float *out_sy)
|
|
{
|
|
MetaXwaylandSurface *xwayland_surface = META_XWAYLAND_SURFACE (surface_role);
|
|
MetaRectangle window_rect = { 0 };
|
|
|
|
if (xwayland_surface->window)
|
|
meta_window_get_buffer_rect (xwayland_surface->window, &window_rect);
|
|
|
|
*out_sx = abs_x - window_rect.x;
|
|
*out_sy = abs_y - window_rect.y;
|
|
}
|
|
|
|
static MetaWaylandSurface *
|
|
meta_xwayland_surface_get_toplevel (MetaWaylandSurfaceRole *surface_role)
|
|
{
|
|
return meta_wayland_surface_role_get_surface (surface_role);
|
|
}
|
|
|
|
static MetaWindow *
|
|
meta_xwayland_surface_get_window (MetaWaylandSurfaceRole *surface_role)
|
|
{
|
|
MetaXwaylandSurface *xwayland_surface = META_XWAYLAND_SURFACE (surface_role);
|
|
|
|
return xwayland_surface->window;
|
|
}
|
|
|
|
static int
|
|
meta_xwayland_surface_get_geometry_scale (MetaWaylandActorSurface *actor_surface)
|
|
{
|
|
return 1;
|
|
}
|
|
|
|
static void
|
|
meta_xwayland_surface_sync_actor_state (MetaWaylandActorSurface *actor_surface)
|
|
{
|
|
MetaXwaylandSurface *xwayland_surface = META_XWAYLAND_SURFACE (actor_surface);
|
|
MetaWaylandActorSurfaceClass *actor_surface_class =
|
|
META_WAYLAND_ACTOR_SURFACE_CLASS (meta_xwayland_surface_parent_class);
|
|
|
|
if (xwayland_surface->window)
|
|
{
|
|
MetaWindowActor *window_actor =
|
|
meta_window_actor_from_window (xwayland_surface->window);
|
|
|
|
actor_surface_class->sync_actor_state (actor_surface);
|
|
meta_window_actor_update_regions (window_actor);
|
|
}
|
|
}
|
|
|
|
static void
|
|
meta_xwayland_surface_finalize (GObject *object)
|
|
{
|
|
MetaXwaylandSurface *xwayland_surface = META_XWAYLAND_SURFACE (object);
|
|
GObjectClass *parent_object_class =
|
|
G_OBJECT_CLASS (meta_xwayland_surface_parent_class);
|
|
|
|
clear_window (xwayland_surface);
|
|
|
|
parent_object_class->finalize (object);
|
|
}
|
|
|
|
static void
|
|
meta_xwayland_surface_init (MetaXwaylandSurface *xwayland_surface)
|
|
{
|
|
}
|
|
|
|
static void
|
|
meta_xwayland_surface_class_init (MetaXwaylandSurfaceClass *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_xwayland_surface_finalize;
|
|
|
|
surface_role_class->assigned = meta_xwayland_surface_assigned;
|
|
surface_role_class->pre_apply_state = meta_xwayland_surface_pre_apply_state;
|
|
surface_role_class->get_relative_coordinates =
|
|
meta_xwayland_surface_get_relative_coordinates;
|
|
surface_role_class->get_toplevel = meta_xwayland_surface_get_toplevel;
|
|
surface_role_class->get_window = meta_xwayland_surface_get_window;
|
|
|
|
actor_surface_class->get_geometry_scale =
|
|
meta_xwayland_surface_get_geometry_scale;
|
|
actor_surface_class->sync_actor_state =
|
|
meta_xwayland_surface_sync_actor_state;
|
|
|
|
signals[WINDOW_ASSOCIATED] =
|
|
g_signal_new ("window-associated",
|
|
G_TYPE_FROM_CLASS (klass),
|
|
G_SIGNAL_RUN_LAST,
|
|
0, NULL, NULL,
|
|
g_cclosure_marshal_VOID__VOID,
|
|
G_TYPE_NONE, 0);
|
|
}
|