mirror of
https://github.com/swaywm/sway.git
synced 2024-12-30 17:06:40 +01:00
Updates per swaywm/wlroots#887
This commit is contained in:
parent
d41b0ef98f
commit
420a669f21
1 changed files with 22 additions and 0 deletions
|
@ -13,6 +13,7 @@
|
|||
#include "sway/output.h"
|
||||
#include "sway/server.h"
|
||||
#include "sway/tree/layout.h"
|
||||
#include "log.h"
|
||||
|
||||
static void apply_exclusive(struct wlr_box *usable_area,
|
||||
uint32_t anchor, int32_t exclusive,
|
||||
|
@ -316,6 +317,27 @@ void handle_layer_shell_surface(struct wl_listener *listener, void *data) {
|
|||
return;
|
||||
}
|
||||
|
||||
if (!layer_surface->output) {
|
||||
// Assign last active output
|
||||
struct sway_container *output = NULL;
|
||||
struct sway_seat *seat = input_manager_get_default_seat(input_manager);
|
||||
if (seat) {
|
||||
output = seat_get_focus_inactive(seat, &root_container);
|
||||
}
|
||||
if (!output) {
|
||||
if (!sway_assert(root_container.children->length,
|
||||
"cannot auto-assign output for layer")) {
|
||||
wlr_layer_surface_close(layer_surface);
|
||||
return;
|
||||
}
|
||||
output = root_container.children->items[0];
|
||||
}
|
||||
if (output->type != C_OUTPUT) {
|
||||
output = container_parent(output, C_OUTPUT);
|
||||
}
|
||||
layer_surface->output = output->sway_output->wlr_output;
|
||||
}
|
||||
|
||||
sway_layer->surface_commit.notify = handle_surface_commit;
|
||||
wl_signal_add(&layer_surface->surface->events.commit,
|
||||
&sway_layer->surface_commit);
|
||||
|
|
Loading…
Reference in a new issue