window-actor: Split into two subclasses of MetaSurfaceActor
The rendering logic before was somewhat complex. We had three independent
cases to take into account when doing rendering:
* X11 compositor. In this case, we're a traditional X11 compositor,
not a Wayland compositor. We use XCompositeNameWindowPixmap to get
the backing pixmap for the window, and deal with the COMPOSITE
extension messiness.
In this case, meta_is_wayland_compositor() is FALSE.
* Wayland clients. In this case, we're a Wayland compositor managing
Wayland surfaces. The rendering for this is fairly straightforward,
as Cogl handles most of the complexity with EGL and SHM buffers...
Wayland clients give us the input and opaque regions through
wl_surface.
In this case, meta_is_wayland_compositor() is TRUE and
priv->window->client_type == META_WINDOW_CLIENT_TYPE_WAYLAND.
* XWayland clients. In this case, we're a Wayland compositor, like
above, and XWayland hands us Wayland surfaces. XWayland handles
the COMPOSITE extension messiness for us, and hands us a buffer
like any other Wayland client. We have to fetch the input and
opaque regions from the X11 window ourselves.
In this case, meta_is_wayland_compositor() is TRUE and
priv->window->client_type == META_WINDOW_CLIENT_TYPE_X11.
We now split the rendering logic into two subclasses, which are:
* MetaSurfaceActorX11, which handles the X11 compositor case, in that
it uses XCompositeNameWindowPixmap to get the backing pixmap, and
deal with all the COMPOSITE extension messiness.
* MetaSurfaceActorWayland, which handles the Wayland compositor case
for both native Wayland clients and XWayland clients. XWayland handles
COMPOSITE for us, and handles pushing a surface over through the
xf86-video-wayland DDX.
Frame sync is still in MetaWindowActor, as it needs to work for both the
X11 compositor and XWayland client cases. When Wayland's video display
protocol lands, this will need to be significantly overhauled, as it would
have to work for any wl_surface, including subsurfaces, so we would need
surface-level discretion.
https://bugzilla.gnome.org/show_bug.cgi?id=720631
2014-02-01 17:21:11 -05:00
|
|
|
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Copyright (C) 2013 Red Hat
|
|
|
|
*
|
|
|
|
* 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.
|
|
|
|
*
|
|
|
|
* Written by:
|
|
|
|
* Jasper St. Pierre <jstpierre@mecheye.net>
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "config.h"
|
|
|
|
|
|
|
|
#include "meta-surface-actor-wayland.h"
|
|
|
|
|
|
|
|
#include <cogl/cogl-wayland-server.h>
|
|
|
|
#include "meta-shaped-texture-private.h"
|
|
|
|
|
|
|
|
struct _MetaSurfaceActorWaylandPrivate
|
|
|
|
{
|
|
|
|
MetaWaylandSurface *surface;
|
|
|
|
MetaWaylandBuffer *buffer;
|
|
|
|
};
|
|
|
|
typedef struct _MetaSurfaceActorWaylandPrivate MetaSurfaceActorWaylandPrivate;
|
|
|
|
|
|
|
|
G_DEFINE_TYPE_WITH_PRIVATE (MetaSurfaceActorWayland, meta_surface_actor_wayland, META_TYPE_SURFACE_ACTOR)
|
|
|
|
|
|
|
|
static void
|
|
|
|
meta_surface_actor_wayland_process_damage (MetaSurfaceActor *actor,
|
|
|
|
int x, int y, int width, int height)
|
|
|
|
{
|
|
|
|
MetaSurfaceActorWayland *self = META_SURFACE_ACTOR_WAYLAND (actor);
|
|
|
|
MetaSurfaceActorWaylandPrivate *priv = meta_surface_actor_wayland_get_instance_private (self);
|
|
|
|
|
|
|
|
struct wl_resource *resource = priv->buffer->resource;
|
|
|
|
struct wl_shm_buffer *shm_buffer = wl_shm_buffer_get (resource);
|
|
|
|
|
|
|
|
if (shm_buffer)
|
|
|
|
{
|
|
|
|
CoglTexture2D *texture = COGL_TEXTURE_2D (priv->buffer->texture);
|
|
|
|
cogl_wayland_texture_set_region_from_shm_buffer (texture, x, y, width, height, shm_buffer, x, y, 0, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
meta_surface_actor_update_area (META_SURFACE_ACTOR (self), x, y, width, height);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
meta_surface_actor_wayland_pre_paint (MetaSurfaceActor *actor)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
|
|
|
meta_surface_actor_wayland_is_argb32 (MetaSurfaceActor *actor)
|
|
|
|
{
|
|
|
|
/* XXX -- look at the SHM buffer format. */
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
|
|
|
meta_surface_actor_wayland_is_visible (MetaSurfaceActor *actor)
|
|
|
|
{
|
|
|
|
/* TODO: ensure that the buffer isn't NULL, implement
|
|
|
|
* wayland mapping semantics */
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
|
|
|
meta_surface_actor_wayland_should_unredirect (MetaSurfaceActor *actor)
|
|
|
|
{
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
meta_surface_actor_wayland_set_unredirected (MetaSurfaceActor *actor,
|
|
|
|
gboolean unredirected)
|
|
|
|
{
|
|
|
|
/* Do nothing. In the future, we'll use KMS to set this
|
|
|
|
* up as a hardware overlay or something. */
|
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
|
|
|
meta_surface_actor_wayland_is_unredirected (MetaSurfaceActor *actor)
|
|
|
|
{
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
2014-02-26 20:21:51 -05:00
|
|
|
static MetaWindow *
|
|
|
|
meta_surface_actor_wayland_get_window (MetaSurfaceActor *actor)
|
|
|
|
{
|
|
|
|
MetaSurfaceActorWaylandPrivate *priv = meta_surface_actor_wayland_get_instance_private (META_SURFACE_ACTOR_WAYLAND (actor));
|
|
|
|
|
|
|
|
return priv->surface->window;
|
|
|
|
}
|
|
|
|
|
window-actor: Split into two subclasses of MetaSurfaceActor
The rendering logic before was somewhat complex. We had three independent
cases to take into account when doing rendering:
* X11 compositor. In this case, we're a traditional X11 compositor,
not a Wayland compositor. We use XCompositeNameWindowPixmap to get
the backing pixmap for the window, and deal with the COMPOSITE
extension messiness.
In this case, meta_is_wayland_compositor() is FALSE.
* Wayland clients. In this case, we're a Wayland compositor managing
Wayland surfaces. The rendering for this is fairly straightforward,
as Cogl handles most of the complexity with EGL and SHM buffers...
Wayland clients give us the input and opaque regions through
wl_surface.
In this case, meta_is_wayland_compositor() is TRUE and
priv->window->client_type == META_WINDOW_CLIENT_TYPE_WAYLAND.
* XWayland clients. In this case, we're a Wayland compositor, like
above, and XWayland hands us Wayland surfaces. XWayland handles
the COMPOSITE extension messiness for us, and hands us a buffer
like any other Wayland client. We have to fetch the input and
opaque regions from the X11 window ourselves.
In this case, meta_is_wayland_compositor() is TRUE and
priv->window->client_type == META_WINDOW_CLIENT_TYPE_X11.
We now split the rendering logic into two subclasses, which are:
* MetaSurfaceActorX11, which handles the X11 compositor case, in that
it uses XCompositeNameWindowPixmap to get the backing pixmap, and
deal with all the COMPOSITE extension messiness.
* MetaSurfaceActorWayland, which handles the Wayland compositor case
for both native Wayland clients and XWayland clients. XWayland handles
COMPOSITE for us, and handles pushing a surface over through the
xf86-video-wayland DDX.
Frame sync is still in MetaWindowActor, as it needs to work for both the
X11 compositor and XWayland client cases. When Wayland's video display
protocol lands, this will need to be significantly overhauled, as it would
have to work for any wl_surface, including subsurfaces, so we would need
surface-level discretion.
https://bugzilla.gnome.org/show_bug.cgi?id=720631
2014-02-01 17:21:11 -05:00
|
|
|
static void
|
|
|
|
meta_surface_actor_wayland_class_init (MetaSurfaceActorWaylandClass *klass)
|
|
|
|
{
|
|
|
|
MetaSurfaceActorClass *surface_actor_class = META_SURFACE_ACTOR_CLASS (klass);
|
|
|
|
|
|
|
|
surface_actor_class->process_damage = meta_surface_actor_wayland_process_damage;
|
|
|
|
surface_actor_class->pre_paint = meta_surface_actor_wayland_pre_paint;
|
|
|
|
surface_actor_class->is_argb32 = meta_surface_actor_wayland_is_argb32;
|
|
|
|
surface_actor_class->is_visible = meta_surface_actor_wayland_is_visible;
|
|
|
|
|
|
|
|
surface_actor_class->should_unredirect = meta_surface_actor_wayland_should_unredirect;
|
|
|
|
surface_actor_class->set_unredirected = meta_surface_actor_wayland_set_unredirected;
|
|
|
|
surface_actor_class->is_unredirected = meta_surface_actor_wayland_is_unredirected;
|
2014-02-26 20:21:51 -05:00
|
|
|
|
|
|
|
surface_actor_class->get_window = meta_surface_actor_wayland_get_window;
|
window-actor: Split into two subclasses of MetaSurfaceActor
The rendering logic before was somewhat complex. We had three independent
cases to take into account when doing rendering:
* X11 compositor. In this case, we're a traditional X11 compositor,
not a Wayland compositor. We use XCompositeNameWindowPixmap to get
the backing pixmap for the window, and deal with the COMPOSITE
extension messiness.
In this case, meta_is_wayland_compositor() is FALSE.
* Wayland clients. In this case, we're a Wayland compositor managing
Wayland surfaces. The rendering for this is fairly straightforward,
as Cogl handles most of the complexity with EGL and SHM buffers...
Wayland clients give us the input and opaque regions through
wl_surface.
In this case, meta_is_wayland_compositor() is TRUE and
priv->window->client_type == META_WINDOW_CLIENT_TYPE_WAYLAND.
* XWayland clients. In this case, we're a Wayland compositor, like
above, and XWayland hands us Wayland surfaces. XWayland handles
the COMPOSITE extension messiness for us, and hands us a buffer
like any other Wayland client. We have to fetch the input and
opaque regions from the X11 window ourselves.
In this case, meta_is_wayland_compositor() is TRUE and
priv->window->client_type == META_WINDOW_CLIENT_TYPE_X11.
We now split the rendering logic into two subclasses, which are:
* MetaSurfaceActorX11, which handles the X11 compositor case, in that
it uses XCompositeNameWindowPixmap to get the backing pixmap, and
deal with all the COMPOSITE extension messiness.
* MetaSurfaceActorWayland, which handles the Wayland compositor case
for both native Wayland clients and XWayland clients. XWayland handles
COMPOSITE for us, and handles pushing a surface over through the
xf86-video-wayland DDX.
Frame sync is still in MetaWindowActor, as it needs to work for both the
X11 compositor and XWayland client cases. When Wayland's video display
protocol lands, this will need to be significantly overhauled, as it would
have to work for any wl_surface, including subsurfaces, so we would need
surface-level discretion.
https://bugzilla.gnome.org/show_bug.cgi?id=720631
2014-02-01 17:21:11 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
meta_surface_actor_wayland_init (MetaSurfaceActorWayland *self)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
MetaSurfaceActor *
|
|
|
|
meta_surface_actor_wayland_new (MetaWaylandSurface *surface)
|
|
|
|
{
|
|
|
|
MetaSurfaceActorWayland *self = g_object_new (META_TYPE_SURFACE_ACTOR_WAYLAND, NULL);
|
|
|
|
MetaSurfaceActorWaylandPrivate *priv = meta_surface_actor_wayland_get_instance_private (self);
|
|
|
|
|
|
|
|
g_assert (meta_is_wayland_compositor ());
|
|
|
|
|
|
|
|
priv->surface = surface;
|
|
|
|
|
|
|
|
return META_SURFACE_ACTOR (self);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
meta_surface_actor_wayland_set_buffer (MetaSurfaceActorWayland *self,
|
|
|
|
MetaWaylandBuffer *buffer)
|
|
|
|
{
|
|
|
|
MetaSurfaceActorWaylandPrivate *priv = meta_surface_actor_wayland_get_instance_private (self);
|
|
|
|
MetaShapedTexture *stex = meta_surface_actor_get_texture (META_SURFACE_ACTOR (self));
|
|
|
|
|
|
|
|
priv->buffer = buffer;
|
|
|
|
|
|
|
|
if (buffer)
|
|
|
|
meta_shaped_texture_set_texture (stex, buffer->texture);
|
|
|
|
else
|
|
|
|
meta_shaped_texture_set_texture (stex, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
MetaWaylandSurface *
|
|
|
|
meta_surface_actor_wayland_get_surface (MetaSurfaceActorWayland *self)
|
|
|
|
{
|
|
|
|
MetaSurfaceActorWaylandPrivate *priv = meta_surface_actor_wayland_get_instance_private (self);
|
|
|
|
return priv->surface;
|
|
|
|
}
|