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

xwayland: Base Xwayland surface role object on the actor role

Browse Source 
The Xwayland role uses a MetaSurfaceActorWayland just so lets share
logic related to it. As a side effect, wl_surface.enter/leave starts
working for Xwayland surfaces.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/5
https://bugzilla.gnome.org/show_bug.cgi?id=791938
This commit is contained in:
Jonas Ådahl 2017-12-20 19:07:40 +08:00
parent 704b73b041
commit 7e17dd0098
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/wayland/meta-xwayland.c
View File

@ -33,6 +33,7 @@
#include <sys/un.h> #include <sys/un.h>
#include "compositor/meta-surface-actor-wayland.h" #include "compositor/meta-surface-actor-wayland.h"
#include "wayland/meta-wayland-actor-surface.h"
enum { enum {
XWAYLAND_SURFACE_WINDOW_ASSOCIATED, XWAYLAND_SURFACE_WINDOW_ASSOCIATED,
@ -46,16 +47,16 @@ guint xwayland_surface_signals[XWAYLAND_SURFACE_LAST_SIGNAL];
G_DECLARE_FINAL_TYPE (MetaWaylandSurfaceRoleXWayland, G_DECLARE_FINAL_TYPE (MetaWaylandSurfaceRoleXWayland,
meta_wayland_surface_role_xwayland, meta_wayland_surface_role_xwayland,
META, WAYLAND_SURFACE_ROLE_XWAYLAND, META, WAYLAND_SURFACE_ROLE_XWAYLAND,
MetaWaylandSurfaceRole); MetaWaylandActorSurface)
struct _MetaWaylandSurfaceRoleXWayland struct _MetaWaylandSurfaceRoleXWayland
{ {
MetaWaylandSurfaceRole parent; MetaWaylandActorSurface parent;
}; };
G_DEFINE_TYPE (MetaWaylandSurfaceRoleXWayland, G_DEFINE_TYPE (MetaWaylandSurfaceRoleXWayland,
meta_wayland_surface_role_xwayland, meta_wayland_surface_role_xwayland,
META_TYPE_WAYLAND_SURFACE_ROLE); META_TYPE_WAYLAND_ACTOR_SURFACE)
static void static void
associate_window_with_surface (MetaWindow *window, associate_window_with_surface (MetaWindow *window,
@ -638,6 +639,8 @@ xwayland_surface_assigned (MetaWaylandSurfaceRole *surface_role)
{ {
MetaWaylandSurface *surface = MetaWaylandSurface *surface =
meta_wayland_surface_role_get_surface (surface_role); meta_wayland_surface_role_get_surface (surface_role);
MetaWaylandSurfaceRoleClass *surface_role_class =
META_WAYLAND_SURFACE_ROLE_CLASS (meta_wayland_surface_role_xwayland_parent_class);
/* See comment in xwayland_surface_commit for why we reply even though the /* See comment in xwayland_surface_commit for why we reply even though the
* surface may not be drawn the next frame. * surface may not be drawn the next frame.
@ -645,6 +648,8 @@ xwayland_surface_assigned (MetaWaylandSurfaceRole *surface_role)
wl_list_insert_list (&surface->compositor->frame_callbacks, wl_list_insert_list (&surface->compositor->frame_callbacks,
&surface->pending_frame_callback_list); &surface->pending_frame_callback_list);
wl_list_init (&surface->pending_frame_callback_list); wl_list_init (&surface->pending_frame_callback_list);
surface_role_class->assigned (surface_role);
} }
static void static void
@ -653,6 +658,8 @@ xwayland_surface_commit (MetaWaylandSurfaceRole *surface_role,
{ {
MetaWaylandSurface *surface = MetaWaylandSurface *surface =
meta_wayland_surface_role_get_surface (surface_role); meta_wayland_surface_role_get_surface (surface_role);
MetaWaylandSurfaceRoleClass *surface_role_class =
META_WAYLAND_SURFACE_ROLE_CLASS (meta_wayland_surface_role_xwayland_parent_class);
/* For Xwayland windows, throttling frames when the window isn't actually /* For Xwayland windows, throttling frames when the window isn't actually
* drawn is less useful, because Xwayland still has to do the drawing sent * drawn is less useful, because Xwayland still has to do the drawing sent
@ -666,6 +673,8 @@ xwayland_surface_commit (MetaWaylandSurfaceRole *surface_role,
* user the initial black frame from when the window is mapped empty. * user the initial black frame from when the window is mapped empty.
*/ */
meta_wayland_surface_queue_pending_state_frame_callbacks (surface, pending); meta_wayland_surface_queue_pending_state_frame_callbacks (surface, pending);
surface_role_class->commit (surface_role, pending);
} }
static MetaWaylandSurface * static MetaWaylandSurface *