mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-03-09 05:34:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

layer-shell: sync with surface state flow

Browse source
This commit is contained in:
Kirill Primak 2022-02-04 16:24:02 +03:00
parent e7109daac8
commit d663fb4f63
2 changed files with 73 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/wlr/types/wlr_layer_shell_v1.h
View file

@ -66,6 +66,8 @@ struct wlr_layer_surface_v1_state {
uint32_t configure_serial; uint32_t configure_serial;
uint32_t actual_width, actual_height; uint32_t actual_width, actual_height;
struct wlr_surface_synced_state synced_state;
}; };
struct wlr_layer_surface_v1_configure { struct wlr_layer_surface_v1_configure {
@ -89,7 +91,7 @@ struct wlr_layer_surface_v1 {
struct wlr_layer_surface_v1_state current, pending; struct wlr_layer_surface_v1_state current, pending;
struct wl_listener surface_destroy; struct wlr_surface_synced synced;
struct { struct {
/** /**

83
types/wlr_layer_shell_v1.c
View file

@ -278,10 +278,10 @@ static void layer_surface_destroy(struct wlr_layer_surface_v1 *surface) {
if (surface->configured && surface->mapped) { if (surface->configured && surface->mapped) {
layer_surface_unmap(surface); layer_surface_unmap(surface);
} }
wlr_surface_synced_finish(&surface->synced);
wlr_signal_emit_safe(&surface->events.destroy, surface); wlr_signal_emit_safe(&surface->events.destroy, surface);
wl_resource_set_user_data(surface->resource, NULL); wl_resource_set_user_data(surface->resource, NULL);
surface->surface->role_data = NULL; surface->surface->role_data = NULL;
wl_list_remove(&surface->surface_destroy.link);
free(surface->namespace); free(surface->namespace);
free(surface); free(surface);
} }
@ -346,9 +346,6 @@ static void layer_surface_role_commit(struct wlr_surface *wlr_surface) {
return; return;
} }
surface->current = surface->pending;
surface->pending.committed = 0;
if (wlr_surface_has_buffer(surface->surface) && !surface->configured) { if (wlr_surface_has_buffer(surface->surface) && !surface->configured) {
wl_resource_post_error(surface->resource, wl_resource_post_error(surface->resource,
ZWLR_LAYER_SHELL_V1_ERROR_ALREADY_CONSTRUCTED, ZWLR_LAYER_SHELL_V1_ERROR_ALREADY_CONSTRUCTED,
@ -395,13 +392,67 @@ static const struct wlr_surface_role layer_surface_role = {
.precommit = layer_surface_role_precommit, .precommit = layer_surface_role_precommit,
}; };
static void handle_surface_destroyed(struct wl_listener *listener, static void layer_surface_synced_destroy(struct wlr_surface_synced *synced) {
void *data) { struct wlr_layer_surface_v1 *surface =
struct wlr_layer_surface_v1 *layer_surface = wl_container_of(synced, surface, synced);
wl_container_of(listener, layer_surface, surface_destroy); layer_surface_destroy(surface);
layer_surface_destroy(layer_surface);
} }
static void layer_surface_synced_squash_state(
struct wlr_surface_synced_state *synced_dst,
struct wlr_surface_synced_state *synced_src) {
struct wlr_layer_surface_v1_state *dst =
wl_container_of(synced_dst, dst, synced_state);
struct wlr_layer_surface_v1_state *src =
wl_container_of(synced_src, src, synced_state);
dst->committed |= src->committed;
src->committed = 0;
dst->anchor = src->anchor;
dst->exclusive_zone = src->exclusive_zone;
dst->margin = src->margin;
dst->keyboard_interactive = src->keyboard_interactive;
dst->desired_width = src->desired_width;
dst->desired_height = src->desired_height;
dst->layer = src->layer;
dst->configure_serial = src->configure_serial;
dst->actual_width = src->actual_width;
dst->actual_height = src->actual_height;
}
static struct wlr_surface_synced_state *layer_surface_synced_create_state(void) {
struct wlr_layer_surface_v1_state *state = calloc(1, sizeof(*state));
if (!state) {
return NULL;
}
return &state->synced_state;
}
static void layer_surface_synced_destroy_state(
struct wlr_surface_synced_state *synced_state) {
struct wlr_layer_surface_v1_state *state =
wl_container_of(synced_state, state, synced_state);
free(state);
}
static void layer_surface_synced_precommit(struct wlr_surface_synced *synced,
struct wlr_surface_synced_state *synced_state) {
struct wlr_layer_surface_v1 *surface =
wl_container_of(synced, surface, synced);
surface->current.committed = 0;
}
static const struct wlr_surface_synced_interface layer_surface_synced_impl = {
.name = "wlr_layer_surface_v1",
.destroy = layer_surface_synced_destroy,
.squash_state = layer_surface_synced_squash_state,
.create_state = layer_surface_synced_create_state,
.destroy_state = layer_surface_synced_destroy_state,
.precommit = layer_surface_synced_precommit,
};
static void layer_shell_handle_get_layer_surface(struct wl_client *wl_client, static void layer_shell_handle_get_layer_surface(struct wl_client *wl_client,
struct wl_resource *client_resource, uint32_t id, struct wl_resource *client_resource, uint32_t id,
struct wl_resource *surface_resource, struct wl_resource *surface_resource,
@ -444,11 +495,21 @@ static void layer_shell_handle_get_layer_surface(struct wl_client *wl_client,
wl_client_post_no_memory(wl_client); wl_client_post_no_memory(wl_client);
return; return;
} }
if (!wlr_surface_synced_init(&surface->synced,
&layer_surface_synced_impl, wlr_surface,
&surface->current.synced_state,
&surface->pending.synced_state)) {
free(surface->namespace);
free(surface);
wl_client_post_no_memory(wl_client);
return;
}
surface->resource = wl_resource_create(wl_client, surface->resource = wl_resource_create(wl_client,
&zwlr_layer_surface_v1_interface, &zwlr_layer_surface_v1_interface,
wl_resource_get_version(client_resource), wl_resource_get_version(client_resource),
id); id);
if (surface->resource == NULL) { if (surface->resource == NULL) {
wlr_surface_synced_finish(&surface->synced);
free(surface->namespace); free(surface->namespace);
free(surface); free(surface);
wl_client_post_no_memory(wl_client); wl_client_post_no_memory(wl_client);
@ -463,10 +524,6 @@ static void layer_shell_handle_get_layer_surface(struct wl_client *wl_client,
wl_signal_init(&surface->events.unmap); wl_signal_init(&surface->events.unmap);
wl_signal_init(&surface->events.new_popup); wl_signal_init(&surface->events.new_popup);
wl_signal_add(&surface->surface->events.destroy,
&surface->surface_destroy);
surface->surface_destroy.notify = handle_surface_destroyed;
wlr_log(WLR_DEBUG, "new layer_surface %p (res %p)", wlr_log(WLR_DEBUG, "new layer_surface %p (res %p)",
surface, surface->resource); surface, surface->resource);
wl_resource_set_implementation(surface->resource, wl_resource_set_implementation(surface->resource,