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

subcompositor: use surface transactions

Browse source
This commit is contained in:
Kirill Primak 2024-01-09 21:07:20 +03:00
parent 8fa8df47e5
commit f8030ef5ae
2 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/wlr/types/wlr_subcompositor.h
View file

@ -39,6 +39,7 @@ struct wlr_subsurface {
bool added; bool added;
struct wl_listener surface_client_commit; struct wl_listener surface_client_commit;
struct wl_listener parent_client_commit;
struct wl_listener parent_destroy; struct wl_listener parent_destroy;
struct { struct {

18
types/wlr_subcompositor.c
View file

@ -34,6 +34,7 @@ static void subsurface_destroy(struct wlr_subsurface *subsurface) {
wlr_surface_synced_finish(&subsurface->parent_synced); wlr_surface_synced_finish(&subsurface->parent_synced);
wl_list_remove(&subsurface->surface_client_commit.link); wl_list_remove(&subsurface->surface_client_commit.link);
wl_list_remove(&subsurface->parent_client_commit.link);
wl_list_remove(&subsurface->parent_destroy.link); wl_list_remove(&subsurface->parent_destroy.link);
wl_resource_set_user_data(subsurface->resource, NULL); wl_resource_set_user_data(subsurface->resource, NULL);
@ -243,10 +244,19 @@ static struct wlr_surface_synced_impl surface_synced_impl = {
.move_state = surface_synced_move_state, .move_state = surface_synced_move_state,
}; };
static void subsurface_handle_parent_destroy(struct wl_listener *listener, static void subsurface_handle_parent_client_commit(struct wl_listener *listener, void *data) {
void *data) {
struct wlr_subsurface *subsurface = struct wlr_subsurface *subsurface =
wl_container_of(listener, subsurface, parent_destroy); wl_container_of(listener, subsurface, parent_client_commit);
struct wlr_surface_client_commit_event *event = data;
if (wlr_surface_state_lock_locked(&subsurface->cached_lock)) {
if (!wlr_surface_transaction_add_lock(event->transaction, &subsurface->cached_lock)) {
wl_resource_post_no_memory(subsurface->resource);
}
}
}
static void subsurface_handle_parent_destroy(struct wl_listener *listener, void *data) {
struct wlr_subsurface *subsurface = wl_container_of(listener, subsurface, parent_destroy);
// Once the parent is destroyed, the client has no way to use the // Once the parent is destroyed, the client has no way to use the
// wl_subsurface object anymore, so we can destroy it. // wl_subsurface object anymore, so we can destroy it.
subsurface_destroy(subsurface); subsurface_destroy(subsurface);
@ -367,6 +377,8 @@ static void subcompositor_handle_get_subsurface(struct wl_client *client,
// link parent // link parent
subsurface->parent = parent; subsurface->parent = parent;
wl_signal_add(&parent->events.client_commit, &subsurface->parent_client_commit);
subsurface->parent_client_commit.notify = subsurface_handle_parent_client_commit;
wl_signal_add(&parent->events.destroy, &subsurface->parent_destroy); wl_signal_add(&parent->events.destroy, &subsurface->parent_destroy);
subsurface->parent_destroy.notify = subsurface_handle_parent_destroy; subsurface->parent_destroy.notify = subsurface_handle_parent_destroy;