mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

shell: Explicitly use solid weston_buffers

Browse Source 
Rather than punching through to set the surface as a solid colour,
attach an actual weston_buffer to it instead.

This becomes the first user of attaching non-client-generated buffers
to a weston_surface. As a result, it is necessary to introduce a
function which will allow compositors and shells to attach a buffer to a
surface. weston_surface_attach_solid() is therefore introduced as a
special-purpose helper which will attach a solid buffer to a
weston_surface.

It is not intended as a general-purpose mechanism to allow compositors
to attach client-generated buffers to surfaces, as doing so would have
unknown effects on this core part of the compositor itself.

Signed-off-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
Daniel Stone
2022-01-17 14:48:19 +00:00
parent 82b646728c
commit 4d426ab6b1
4 changed files with 64 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shell-utils/shell-utils.c
+18 -14
View File
@@ -144,6 +144,7 @@ weston_curtain_create(struct weston_compositor *compositor,
{
struct weston_curtain *curtain;
struct weston_surface *surface = NULL;
struct weston_buffer_reference *buffer_ref;
struct weston_view *view;
curtain = zalloc(sizeof(*curtain));
@@ -158,22 +159,23 @@ weston_curtain_create(struct weston_compositor *compositor,
if (view == NULL)
goto err_surface;
buffer_ref = weston_buffer_create_solid_rgba(compositor,
params->r,
params->g,
params->b,
params->a);
if (buffer_ref == NULL)
goto err_view;
curtain->view = view;
curtain->buffer_ref = buffer_ref;
weston_surface_set_label_func(surface, params->get_label);
surface->committed = params->surface_committed;
surface->committed_private = params->surface_private;
curtain->view = view;
weston_surface_set_color(surface,
params->r, params->g, params->b, params->a);
weston_surface_set_label_func(surface, params->get_label);
pixman_region32_fini(&surface->opaque);
if (params->a == 1.0) {
pixman_region32_init_rect(&surface->opaque, 0, 0,
params->width, params->height);
} else {
pixman_region32_init(&surface->opaque);
}
weston_surface_attach_solid(surface, buffer_ref, params->width,
params->height);
pixman_region32_fini(&surface->input);
if (params->capture_input) {
@@ -183,11 +185,12 @@ weston_curtain_create(struct weston_compositor *compositor,
pixman_region32_init(&surface->input);
}
weston_surface_set_size(surface, params->width, params->height);
weston_view_set_position(view, params->x, params->y);
return curtain;
err_view:
weston_view_destroy(view);
err_surface:
weston_surface_destroy(surface);
err_curtain:
@@ -204,5 +207,6 @@ weston_curtain_destroy(struct weston_curtain *curtain)
weston_view_destroy(curtain->view);
weston_surface_destroy(surface);
weston_buffer_destroy_solid(curtain->buffer_ref);
free(curtain);
}
shell-utils/shell-utils.h
+1
View File
@@ -38,6 +38,7 @@ struct weston_curtain_params {
struct weston_curtain {
struct weston_view *view;
struct weston_buffer_reference *buffer_ref;
};
struct weston_output *