alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

layer-shell: chase wlr layer surface refactor

Browse source
This commit is contained in:
Kirill Primak 2021-09-18 11:29:03 +03:00 committed by Simon Ser
parent b7b96399e1
commit b7b3ef6dcf
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
sway/desktop/layer_shell.c
View file

@ -598,14 +598,14 @@ void handle_layer_shell_surface(struct wl_listener *listener, void *data) {
sway_log(SWAY_DEBUG, "new layer surface: namespace %s layer %d anchor %" PRIu32 sway_log(SWAY_DEBUG, "new layer surface: namespace %s layer %d anchor %" PRIu32
" size %" PRIu32 "x%" PRIu32 " margin %" PRIu32 ",%" PRIu32 ",%" PRIu32 ",%" PRIu32 ",", " size %" PRIu32 "x%" PRIu32 " margin %" PRIu32 ",%" PRIu32 ",%" PRIu32 ",%" PRIu32 ",",
layer_surface->namespace, layer_surface->namespace,
layer_surface->client_pending.layer, layer_surface->pending.layer,
layer_surface->client_pending.anchor, layer_surface->pending.anchor,
layer_surface->client_pending.desired_width, layer_surface->pending.desired_width,
layer_surface->client_pending.desired_height, layer_surface->pending.desired_height,
layer_surface->client_pending.margin.top, layer_surface->pending.margin.top,
layer_surface->client_pending.margin.right, layer_surface->pending.margin.right,
layer_surface->client_pending.margin.bottom, layer_surface->pending.margin.bottom,
layer_surface->client_pending.margin.left); layer_surface->pending.margin.left);
if (!layer_surface->output) { if (!layer_surface->output) {
// Assign last active output // Assign last active output
@ -659,13 +659,13 @@ void handle_layer_shell_surface(struct wl_listener *listener, void *data) {
sway_layer->output_destroy.notify = handle_output_destroy; sway_layer->output_destroy.notify = handle_output_destroy;
wl_signal_add(&output->events.destroy, &sway_layer->output_destroy); wl_signal_add(&output->events.destroy, &sway_layer->output_destroy);
wl_list_insert(&output->layers[layer_surface->client_pending.layer], wl_list_insert(&output->layers[layer_surface->pending.layer],
&sway_layer->link); &sway_layer->link);
// Temporarily set the layer's current state to client_pending // Temporarily set the layer's current state to pending
// So that we can easily arrange it // So that we can easily arrange it
struct wlr_layer_surface_v1_state old_state = layer_surface->current; struct wlr_layer_surface_v1_state old_state = layer_surface->current;
layer_surface->current = layer_surface->client_pending; layer_surface->current = layer_surface->pending;
arrange_layers(output); arrange_layers(output);
layer_surface->current = old_state; layer_surface->current = old_state;
} }