blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

layer-shell: move NULL buffer check to role precommit handler 

This will allow compositor to access the current buffer before
unmapping.
This commit is contained in:
Kirill Primak 2021-10-06 10:55:23 +03:00 committed by Simon Ser
parent 28248dd83b
commit cdaab82020
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
types/wlr_layer_shell_v1.c
View File

@ -339,15 +339,28 @@ static void layer_surface_role_commit(struct wlr_surface *wlr_surface) {
surface->mapped = true; surface->mapped = true;
wlr_signal_emit_safe(&surface->events.map, surface); wlr_signal_emit_safe(&surface->events.map, surface);
} }
if (surface->configured && !wlr_surface_has_buffer(surface->surface) && }
surface->mapped) {
layer_surface_unmap(surface); static void layer_surface_role_precommit(struct wlr_surface *wlr_surface) {
struct wlr_layer_surface_v1 *surface =
wlr_layer_surface_v1_from_wlr_surface(wlr_surface);
if (surface == NULL) {
return;
}
if (wlr_surface->pending.committed & WLR_SURFACE_STATE_BUFFER &&
wlr_surface->pending.buffer == NULL) {
// This is a NULL commit
if (surface->configured && surface->mapped) {
layer_surface_unmap(surface);
}
} }
} }
static const struct wlr_surface_role layer_surface_role = { static const struct wlr_surface_role layer_surface_role = {
.name = "zwlr_layer_surface_v1", .name = "zwlr_layer_surface_v1",
.commit = layer_surface_role_commit, .commit = layer_surface_role_commit,
.precommit = layer_surface_role_precommit,
}; };
static void handle_surface_destroyed(struct wl_listener *listener, static void handle_surface_destroyed(struct wl_listener *listener,