diff options
Diffstat (limited to 'sway')
| -rw-r--r-- | sway/container.c | 4 | ||||
| -rw-r--r-- | sway/handlers.c | 21 | ||||
| -rw-r--r-- | sway/layout.c | 6 | ||||
| -rw-r--r-- | sway/workspace.c | 3 |
4 files changed, 33 insertions, 1 deletions
diff --git a/sway/container.c b/sway/container.c index a40c483c..8165bbad 100644 --- a/sway/container.c +++ b/sway/container.c @@ -38,6 +38,9 @@ static void free_swayc(swayc_t *cont) { } list_free(cont->children); } + if (cont->unmanaged) { + list_free(cont->unmanaged); + } if (cont->floating) { while (cont->floating->length) { free_swayc(cont->floating->items[0]); @@ -104,6 +107,7 @@ swayc_t *new_output(wlc_handle handle) { output->name = name ? strdup(name) : NULL; output->width = size->w; output->height = size->h; + output->unmanaged = create_list(); apply_output_config(oc, output); add_child(&root_container, output); diff --git a/sway/handlers.c b/sway/handlers.c index dea15acc..136ef577 100644 --- a/sway/handlers.c +++ b/sway/handlers.c @@ -220,6 +220,12 @@ static bool handle_view_created(wlc_handle handle) { // refocus in-between command lists set_focused_container(newview); } + } else { + swayc_t *output = swayc_parent_by_type(focused, C_OUTPUT); + wlc_handle *h = malloc(sizeof(wlc_handle)); + *h = handle; + sway_log(L_DEBUG, "Adding unmanaged window %p to %p", h, output->unmanaged); + list_add(output->unmanaged, h); } return true; } @@ -249,6 +255,21 @@ static void handle_view_destroyed(wlc_handle handle) { swayc_t *parent = destroy_view(view); remove_view_from_scratchpad(view); arrange_windows(parent, -1, -1); + } else { + // Is it unmanaged? + int i; + for (i = 0; i < root_container.children->length; ++i) { + swayc_t *output = root_container.children->items[i]; + int j; + for (j = 0; j < output->unmanaged->length; ++j) { + wlc_handle *_handle = output->unmanaged->items[j]; + if (*_handle == handle) { + list_del(output->unmanaged, j); + free(_handle); + break; + } + } + } } set_focused_container(get_focused_view(&root_container)); } diff --git a/sway/layout.c b/sway/layout.c index 5c57d0a7..08d06d0b 100644 --- a/sway/layout.c +++ b/sway/layout.c @@ -465,6 +465,12 @@ static void arrange_windows_r(swayc_t *container, double width, double height) { sway_log(L_DEBUG, "Arranging workspace #%d at %f, %f", i, child->x, child->y); arrange_windows_r(child, -1, -1); } + + // Bring all unmanaged views to the front + for (i = 0; i < container->unmanaged->length; ++i) { + wlc_handle *handle = container->unmanaged->items[i]; + wlc_view_bring_to_front(*handle); + } } return; case C_VIEW: diff --git a/sway/workspace.c b/sway/workspace.c index f7134917..5e6ea799 100644 --- a/sway/workspace.c +++ b/sway/workspace.c @@ -247,6 +247,7 @@ bool workspace_switch(swayc_t *workspace) { if (!set_focused_container(get_focused_view(workspace))) { return false; } - arrange_windows(workspace, -1, -1); + swayc_t *output = swayc_parent_by_type(workspace, C_OUTPUT); + arrange_windows(output, -1, -1); return true; } |