kitchen/kiwmi
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Allow layer-shell surfaces to change their layer

Browse source
This commit is contained in:
buffet 2020-01-28 17:13:53 +00:00
parent 6dcf139dbb
commit 2064b580fa
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/desktop/layer_shell.h
View file

@ -19,6 +19,7 @@
struct kiwmi_layer { struct kiwmi_layer {
struct wl_list link; struct wl_list link;
struct wlr_layer_surface_v1 *layer_surface; struct wlr_layer_surface_v1 *layer_surface;
uint32_t layer;
struct kiwmi_output *output; struct kiwmi_output *output;

15
kiwmi/desktop/layer_shell.c
View file

@ -35,8 +35,16 @@ kiwmi_layer_destroy_notify(struct wl_listener *listener, void *UNUSED(data))
static void static void
kiwmi_layer_commit_notify(struct wl_listener *listener, void *UNUSED(data)) kiwmi_layer_commit_notify(struct wl_listener *listener, void *UNUSED(data))
{ {
struct kiwmi_layer *surface = wl_container_of(listener, surface, commit); struct kiwmi_layer *layer = wl_container_of(listener, layer, commit);
struct kiwmi_output *output = surface->output; struct kiwmi_output *output = layer->output;
bool layer_changed = layer->layer != layer->layer_surface->current.layer;
if (layer_changed) {
wl_list_remove(&layer->link);
layer->layer = layer->layer_surface->current.layer;
wl_list_insert(&output->layers[layer->layer], &layer->link);
}
arrange_layers(output); arrange_layers(output);
} }
@ -371,6 +379,7 @@ layer_shell_new_surface_notify(struct wl_listener *listener, void *data)
layer->layer_surface = layer_surface; layer->layer_surface = layer_surface;
layer->output = output; layer->output = output;
layer->layer = layer_surface->current.layer;
layer->destroy.notify = kiwmi_layer_destroy_notify; layer->destroy.notify = kiwmi_layer_destroy_notify;
wl_signal_add(&layer_surface->events.destroy, &layer->destroy); wl_signal_add(&layer_surface->events.destroy, &layer->destroy);
@ -378,7 +387,7 @@ layer_shell_new_surface_notify(struct wl_listener *listener, void *data)
layer->commit.notify = kiwmi_layer_commit_notify; layer->commit.notify = kiwmi_layer_commit_notify;
wl_signal_add(&layer_surface->surface->events.commit, &layer->commit); wl_signal_add(&layer_surface->surface->events.commit, &layer->commit);
wl_list_insert(&output->layers[layer_surface->current.layer], &layer->link); wl_list_insert(&output->layers[layer->layer], &layer->link);
// Temporarily set the layer's current state to client_pending // Temporarily set the layer's current state to client_pending
// So that we can easily arrange it // So that we can easily arrange it