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

output: evacuate sticky containers only if new output has a workspace

Browse source 
Sticky floating containers on an otherwise empty workspace can only be
evacuated if the new output has an active workspace. The noop output may
not have one and in that case we have to move the whole workspace to the
new output.
This commit is contained in:
mwenzkowski 2020-10-28 00:02:08 +01:00 committed by Tudor Brindus
parent 0cb9282aee
commit 32788a93f2
3 changed files with 41 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/sway/tree/workspace.h
View file

@ -132,4 +132,6 @@ void workspace_get_box(struct sway_workspace *workspace, struct wlr_box *box);
size_t workspace_num_tiling_views(struct sway_workspace *ws); size_t workspace_num_tiling_views(struct sway_workspace *ws);
size_t workspace_num_sticky_containers(struct sway_workspace *ws);
#endif #endif

39
sway/tree/output.c
View file

@ -152,21 +152,18 @@ void output_enable(struct sway_output *output) {
arrange_root(); arrange_root();
} }
static void evacuate_sticky(struct sway_workspace *old_ws, static void evacuate_sticky(struct sway_container *con, void *data) {
struct sway_output *new_output) { if (container_is_floating(con) && con->is_sticky) {
struct sway_workspace *new_ws = output_get_active_workspace(new_output); struct sway_workspace *new_ws = data;
if (!sway_assert(new_ws, "New output does not have a workspace")) { if (!sway_assert(new_ws, "Expected workspace to not be null")) {
return; return;
} }
while (old_ws->floating->length) { container_detach(con);
struct sway_container *sticky = old_ws->floating->items[0]; workspace_add_floating(new_ws, con);
container_detach(sticky); container_handle_fullscreen_reparent(con);
workspace_add_floating(new_ws, sticky); container_floating_move_to_center(con);
container_handle_fullscreen_reparent(sticky); ipc_event_window(con, "move");
container_floating_move_to_center(sticky);
ipc_event_window(sticky, "move");
} }
workspace_detect_urgent(new_ws);
} }
static void output_evacuate(struct sway_output *output) { static void output_evacuate(struct sway_output *output) {
@ -195,17 +192,23 @@ static void output_evacuate(struct sway_output *output) {
new_output = root->noop_output; new_output = root->noop_output;
} }
struct sway_workspace *new_output_ws =
output_get_active_workspace(new_output);
if (workspace_is_empty(workspace)) { if (workspace_is_empty(workspace)) {
// If floating is not empty, there are sticky containers to move // If the new output has an active workspace (the noop output may
if (workspace->floating->length) { // not have one), move all sticky containers to it
evacuate_sticky(workspace, new_output); if (new_output_ws) {
workspace_for_each_container(workspace, evacuate_sticky,
new_output_ws);
workspace_detect_urgent(new_output_ws);
} }
if (workspace_num_sticky_containers(workspace) == 0) {
workspace_begin_destroy(workspace); workspace_begin_destroy(workspace);
continue; continue;
} }
}
struct sway_workspace *new_output_ws =
output_get_active_workspace(new_output);
workspace_output_add_priority(workspace, new_output); workspace_output_add_priority(workspace, new_output);
output_add_workspace(new_output, workspace); output_add_workspace(new_output, workspace);

13
sway/tree/workspace.c
View file

@ -817,3 +817,16 @@ size_t workspace_num_tiling_views(struct sway_workspace *ws) {
workspace_for_each_container(ws, count_tiling_views, &count); workspace_for_each_container(ws, count_tiling_views, &count);
return count; return count;
} }
static void count_sticky_containers(struct sway_container *con, void *data) {
if (container_is_floating(con) && con->is_sticky) {
size_t *count = data;
*count += 1;
}
}
size_t workspace_num_sticky_containers(struct sway_workspace *ws) {
size_t count = 0;
workspace_for_each_container(ws, count_sticky_containers, &count);
return count;
}