mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-04-19 06:47:02 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

compositor: implement wl_surface.get_release

Browse source 
References: https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/137
This commit is contained in:
Simon Ser 2022-08-22 15:18:25 +02:00
parent ebd4c83cd6
commit 226d1cf81c
3 changed files with 98 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/wlr/types/wlr_compositor.h
View file

@ -29,6 +29,7 @@ enum wlr_surface_state_field {
WLR_SURFACE_STATE_FRAME_CALLBACK_LIST = 1 << 7,
WLR_SURFACE_STATE_VIEWPORT = 1 << 8,
WLR_SURFACE_STATE_OFFSET = 1 << 9,
WLR_SURFACE_STATE_RELEASE_CALLBACK_LIST = 1 << 10,
};
struct wlr_surface_state {
@ -44,6 +45,7 @@ struct wlr_surface_state {
enum wl_output_transform transform;
int32_t scale;
struct wl_list frame_callback_list; // wl_resource
struct wl_list release_callback_list; // wl_resource
int width, height; // in surface-local coordinates
int buffer_width, buffer_height;

2
meson.build
View file

@ -101,7 +101,7 @@ internal_features = {
wayland_project_options = ['tests=false', 'documentation=false']
wayland_server = dependency('wayland-server',
version: '>=1.21',
version: '>=1.21.90',
fallback: 'wayland',
default_options: wayland_project_options,
)

96
types/wlr_compositor.c
View file

@ -15,7 +15,7 @@
#include "types/wlr_subcompositor.h"
#include "util/time.h"
#define COMPOSITOR_VERSION 5
#define COMPOSITOR_VERSION 6
#define CALLBACK_VERSION 1
static int min(int fst, int snd) {
@ -330,6 +330,11 @@ static void surface_state_move(struct wlr_surface_state *state,
&next->frame_callback_list);
wl_list_init(&next->frame_callback_list);
}
if (next->committed & WLR_SURFACE_STATE_RELEASE_CALLBACK_LIST) {
wl_list_insert_list(&state->release_callback_list,
&next->release_callback_list);
wl_list_init(&next->release_callback_list);
}
state->committed |= next->committed;
next->committed = 0;
@ -404,6 +409,69 @@ static void surface_update_input_region(struct wlr_surface *surface) {
0, 0, surface->current.width, surface->current.height);
}
struct buffer_release_callback {
struct wl_resource *resource;
struct wl_listener buffer_release;
struct wl_listener resource_destroy;
};
static void buffer_release_callback_handle_buffer_release(
struct wl_listener *listener, void *data) {
struct buffer_release_callback *callback =
wl_container_of(listener, callback, buffer_release);
wl_callback_send_done(callback->resource, 0);
wl_resource_destroy(callback->resource);
}
static void buffer_release_callback_handle_resource_destroy(
struct wl_listener *listener, void *data) {
struct buffer_release_callback *callback =
wl_container_of(listener, callback, resource_destroy);
wl_list_remove(&callback->buffer_release.link);
free(callback);
}
static struct buffer_release_callback *buffer_release_callback_create(
struct wlr_buffer *buffer, struct wl_resource *resource) {
assert(buffer->n_locks > 0); // ensure we'll get a release signal
struct buffer_release_callback *callback = calloc(1, sizeof(*callback));
if (callback == NULL) {
return NULL;
}
callback->buffer_release.notify = buffer_release_callback_handle_buffer_release;
wl_signal_add(&buffer->events.release, &callback->buffer_release);
callback->resource_destroy.notify = buffer_release_callback_handle_resource_destroy;
wl_resource_add_destroy_listener(resource, &callback->resource_destroy);
struct wl_list *link = wl_resource_get_link(resource);
wl_list_remove(link);
wl_list_init(link);
return callback;
}
static void surface_update_release_callback_list(struct wlr_surface *surface) {
if (surface->buffer == NULL) {
wl_resource_post_error(surface->resource, WL_SURFACE_ERROR_NO_ATTACH,
"wl_surface.get_release without a buffer attached");
return;
}
struct wlr_buffer *buffer = &surface->buffer->base;
struct wl_resource *resource, *tmp;
wl_resource_for_each_safe(resource, tmp,
&surface->current.release_callback_list) {
if (buffer_release_callback_create(buffer, resource) == NULL) {
wl_resource_post_no_memory(surface->resource);
return;
}
}
}
static void surface_state_init(struct wlr_surface_state *state);
static void surface_cache_pending(struct wlr_surface *surface) {
@ -458,6 +526,7 @@ static void surface_commit_state(struct wlr_surface *surface,
}
surface_update_opaque_region(surface);
surface_update_input_region(surface);
surface_update_release_callback_list(surface);
// commit subsurface order
struct wlr_subsurface *subsurface;
@ -553,6 +622,25 @@ static void surface_handle_offset(struct wl_client *client,
surface->pending.dy = y;
}
static void surface_handle_get_release(struct wl_client *client,
struct wl_resource *resource, uint32_t new_id) {
struct wlr_surface *surface = wlr_surface_from_resource(resource);
struct wl_resource *callback_resource = wl_resource_create(client,
&wl_callback_interface, CALLBACK_VERSION, new_id);
if (callback_resource == NULL) {
wl_resource_post_no_memory(resource);
return;
}
wl_resource_set_implementation(callback_resource, NULL, NULL,
callback_handle_resource_destroy);
wl_list_insert(surface->pending.release_callback_list.prev,
wl_resource_get_link(callback_resource));
surface->pending.committed |= WLR_SURFACE_STATE_RELEASE_CALLBACK_LIST;
}
static const struct wl_surface_interface surface_implementation = {
.destroy = surface_handle_destroy,
.attach = surface_handle_attach,
@ -565,6 +653,7 @@ static const struct wl_surface_interface surface_implementation = {
.set_buffer_scale = surface_handle_set_buffer_scale,
.damage_buffer = surface_handle_damage_buffer,
.offset = surface_handle_offset,
.get_release = surface_handle_get_release,
};
struct wlr_surface *wlr_surface_from_resource(struct wl_resource *resource) {
@ -583,6 +672,7 @@ static void surface_state_init(struct wlr_surface_state *state) {
wl_list_init(&state->subsurfaces_below);
wl_list_init(&state->frame_callback_list);
wl_list_init(&state->release_callback_list);
pixman_region32_init(&state->surface_damage);
pixman_region32_init(&state->buffer_damage);
@ -599,6 +689,10 @@ static void surface_state_finish(struct wlr_surface_state *state) {
wl_resource_destroy(resource);
}
wl_resource_for_each_safe(resource, tmp, &state->release_callback_list) {
wl_resource_destroy(resource);
}
pixman_region32_fini(&state->surface_damage);
pixman_region32_fini(&state->buffer_damage);
pixman_region32_fini(&state->opaque);