hyprwm/wlroots-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/wlroots-hyprland.git synced 2024-11-25 22:25:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

surface: introduce events.client_commit

Browse source 
wlr_surface.events.client_commit is fired when wl_surface.commit
request is received.
This commit is contained in:
Kirill Primak 2022-01-13 11:55:09 +03:00 committed by Simon Ser
parent b6f43ab2e1
commit 4ec683ad1c
2 changed files with 27 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -140,6 +140,7 @@ struct wlr_surface {
void *role_data; // role-specific data void *role_data; // role-specific data
struct { struct {
struct wl_signal client_commit;
struct wl_signal commit; struct wl_signal commit;
struct wl_signal new_subsurface; struct wl_signal new_subsurface;
struct wl_signal destroy; struct wl_signal destroy;
@ -188,6 +189,7 @@ struct wlr_subsurface {
bool added; bool added;
struct wl_listener surface_destroy; struct wl_listener surface_destroy;
struct wl_listener surface_client_commit;
struct wl_listener parent_destroy; struct wl_listener parent_destroy;
struct { struct {

46
types/wlr_surface.c
View file

@ -520,32 +520,13 @@ static void subsurface_parent_commit(struct wlr_subsurface *subsurface) {
} }
} }
static void subsurface_commit(struct wlr_subsurface *subsurface) {
struct wlr_surface *surface = subsurface->surface;
if (subsurface_is_synchronized(subsurface)) {
if (subsurface->has_cache) {
// We already lock a previous commit. The prevents any future
// commit to be applied before we release the previous commit.
return;
}
subsurface->has_cache = true;
subsurface->cached_seq = wlr_surface_lock_pending(surface);
}
}
static void surface_handle_commit(struct wl_client *client, static void surface_handle_commit(struct wl_client *client,
struct wl_resource *resource) { struct wl_resource *resource) {
struct wlr_surface *surface = wlr_surface_from_resource(resource); struct wlr_surface *surface = wlr_surface_from_resource(resource);
struct wlr_subsurface *subsurface = wlr_surface_is_subsurface(surface) ?
wlr_subsurface_from_wlr_surface(surface) : NULL;
if (subsurface != NULL) {
subsurface_commit(subsurface);
}
surface_finalize_pending(surface); surface_finalize_pending(surface);
wlr_signal_emit_safe(&surface->events.client_commit, NULL);
if (surface->role && surface->role->precommit) { if (surface->role && surface->role->precommit) {
surface->role->precommit(surface); surface->role->precommit(surface);
} }
@ -668,6 +649,7 @@ static void subsurface_destroy(struct wlr_subsurface *subsurface) {
wlr_signal_emit_safe(&subsurface->events.destroy, subsurface); wlr_signal_emit_safe(&subsurface->events.destroy, subsurface);
wl_list_remove(&subsurface->surface_destroy.link); wl_list_remove(&subsurface->surface_destroy.link);
wl_list_remove(&subsurface->surface_client_commit.link);
if (subsurface->parent) { if (subsurface->parent) {
wl_list_remove(&subsurface->current.link); wl_list_remove(&subsurface->current.link);
@ -747,6 +729,7 @@ struct wlr_surface *surface_create(struct wl_client *client,
surface_state_init(&surface->pending); surface_state_init(&surface->pending);
surface->pending.seq = 1; surface->pending.seq = 1;
wl_signal_init(&surface->events.client_commit);
wl_signal_init(&surface->events.commit); wl_signal_init(&surface->events.commit);
wl_signal_init(&surface->events.destroy); wl_signal_init(&surface->events.destroy);
wl_signal_init(&surface->events.new_subsurface); wl_signal_init(&surface->events.new_subsurface);
@ -1108,6 +1091,23 @@ static void subsurface_handle_surface_destroy(struct wl_listener *listener,
subsurface_destroy(subsurface); subsurface_destroy(subsurface);
} }
static void subsurface_handle_surface_client_commit(
struct wl_listener *listener, void *data) {
struct wlr_subsurface *subsurface =
wl_container_of(listener, subsurface, surface_client_commit);
struct wlr_surface *surface = subsurface->surface;
if (subsurface_is_synchronized(subsurface)) {
if (subsurface->has_cache) {
// We already lock a previous commit. The prevents any future
// commit to be applied before we release the previous commit.
return;
}
subsurface->has_cache = true;
subsurface->cached_seq = wlr_surface_lock_pending(surface);
}
}
struct wlr_subsurface *subsurface_create(struct wlr_surface *surface, struct wlr_subsurface *subsurface_create(struct wlr_surface *surface,
struct wlr_surface *parent, uint32_t version, uint32_t id) { struct wlr_surface *parent, uint32_t version, uint32_t id) {
struct wl_client *client = wl_resource_get_client(surface->resource); struct wl_client *client = wl_resource_get_client(surface->resource);
@ -1136,6 +1136,10 @@ struct wlr_subsurface *subsurface_create(struct wlr_surface *surface,
wl_signal_add(&surface->events.destroy, &subsurface->surface_destroy); wl_signal_add(&surface->events.destroy, &subsurface->surface_destroy);
subsurface->surface_destroy.notify = subsurface_handle_surface_destroy; subsurface->surface_destroy.notify = subsurface_handle_surface_destroy;
wl_signal_add(&surface->events.client_commit,
&subsurface->surface_client_commit);
subsurface->surface_client_commit.notify =
subsurface_handle_surface_client_commit;
// link parent // link parent
subsurface->parent = parent; subsurface->parent = parent;