From 9055b5773e8093792b8ff1f53fdaac5f0c25681b Mon Sep 17 00:00:00 2001 From: "D.B" Date: Mon, 10 Oct 2016 20:44:09 +0200 Subject: [PATCH 1/3] add workspace_layout to container Add swayc_change_layout function, which changes either layout or workspace_layout, depending on the container type. --- include/sway/container.h | 7 +++++++ sway/commands/layout.c | 16 ++++++++-------- sway/commands/move.c | 4 ++-- sway/commands/split.c | 4 ++-- sway/container.c | 15 +++++++++++++-- sway/handlers.c | 11 ----------- sway/layout.c | 1 + 7 files changed, 33 insertions(+), 25 deletions(-) diff --git a/include/sway/container.h b/include/sway/container.h index 5e251885a..90825a490 100644 --- a/include/sway/container.h +++ b/include/sway/container.h @@ -68,6 +68,7 @@ struct sway_container { enum swayc_types type; enum swayc_layouts layout; enum swayc_layouts prev_layout; + enum swayc_layouts workspace_layout; /** * Width and height of this container, without borders or gaps. @@ -321,4 +322,10 @@ void update_visibility(swayc_t *container); */ void close_views(swayc_t *container); +/** + * Assign layout to a container. Needed due to workspace container specifics. + * Workspace always needs L_HORIZ layout. + */ +swayc_t *swayc_change_layout(swayc_t *container, enum swayc_layouts layout); + #endif diff --git a/sway/commands/layout.c b/sway/commands/layout.c index 05ab0a18e..bef06cb2e 100644 --- a/sway/commands/layout.c +++ b/sway/commands/layout.c @@ -22,10 +22,10 @@ struct cmd_results *cmd_layout(int argc, char **argv) { enum swayc_layouts old_layout = parent->layout; if (strcasecmp(argv[0], "default") == 0) { - parent->layout = parent->prev_layout; + swayc_change_layout(parent, parent->prev_layout); if (parent->layout == L_NONE) { swayc_t *output = swayc_parent_by_type(parent, C_OUTPUT); - parent->layout = default_layout(output); + swayc_change_layout(parent, default_layout(output)); } } else { if (parent->layout != L_TABBED && parent->layout != L_STACKED) { @@ -37,22 +37,22 @@ struct cmd_results *cmd_layout(int argc, char **argv) { parent = new_container(parent, L_TABBED); } - parent->layout = L_TABBED; + swayc_change_layout(parent, L_TABBED); } else if (strcasecmp(argv[0], "stacking") == 0) { if (parent->type != C_CONTAINER && !swayc_is_empty_workspace(parent)) { parent = new_container(parent, L_STACKED); } - parent->layout = L_STACKED; + swayc_change_layout(parent, L_STACKED); } else if (strcasecmp(argv[0], "splith") == 0) { - parent->layout = L_HORIZ; + swayc_change_layout(parent, L_HORIZ); } else if (strcasecmp(argv[0], "splitv") == 0) { - parent->layout = L_VERT; + swayc_change_layout(parent, L_VERT); } else if (strcasecmp(argv[0], "toggle") == 0 && argc == 2 && strcasecmp(argv[1], "split") == 0) { if (parent->layout == L_HORIZ) { - parent->layout = L_VERT; + swayc_change_layout(parent, L_VERT); } else { - parent->layout = L_HORIZ; + swayc_change_layout(parent, L_HORIZ); } } } diff --git a/sway/commands/move.c b/sway/commands/move.c index 48e9d562d..4819d9efe 100644 --- a/sway/commands/move.c +++ b/sway/commands/move.c @@ -37,7 +37,7 @@ struct cmd_results *cmd_move(int argc, char **argv) { if (!view->children || view->children->length == 0) { return cmd_results_new(CMD_FAILURE, "move", "Cannot move an empty workspace"); } - view = new_container(view, view->layout); + view = new_container(view, view->workspace_layout); } if (view->type != C_CONTAINER && view->type != C_VIEW) { return cmd_results_new(CMD_FAILURE, "move", "Can only move containers and views."); } @@ -65,7 +65,7 @@ struct cmd_results *cmd_move(int argc, char **argv) { if (!view->children || view->children->length == 0) { return cmd_results_new(CMD_FAILURE, "move", "Cannot move an empty workspace"); } - view = new_container(view, view->layout); + view = new_container(view, view->workspace_layout); } else if (view->type != C_CONTAINER && view->type != C_VIEW) { return cmd_results_new(CMD_FAILURE, "move", "Can only move containers and views."); } else if (!(output = output_by_name(argv[3], &abs_pos))) { diff --git a/sway/commands/split.c b/sway/commands/split.c index 9ff1d6387..f3e58fbfa 100644 --- a/sway/commands/split.c +++ b/sway/commands/split.c @@ -25,11 +25,11 @@ static struct cmd_results *_do_split(int argc, char **argv, int layout) { /* Case that focus is on an workspace with 0/1 children.change its layout */ if (focused->type == C_WORKSPACE && focused->children->length <= 1) { sway_log(L_DEBUG, "changing workspace layout"); - focused->layout = layout; + swayc_change_layout(focused, layout); } else if (focused->type != C_WORKSPACE && focused->parent->children->length == 1) { /* Case of no siblings. change parent layout */ sway_log(L_DEBUG, "changing container layout"); - focused->parent->layout = layout; + swayc_change_layout(focused->parent, layout); } else { /* regular case where new split container is build around focused container * or in case of workspace, container inherits its children */ diff --git a/sway/container.c b/sway/container.c index 4f22eb0db..c588f3dbf 100644 --- a/sway/container.c +++ b/sway/container.c @@ -27,6 +27,7 @@ static swayc_t *new_swayc(enum swayc_types type) { c->handle = -1; c->gaps = -1; c->layout = L_NONE; + c->workspace_layout = L_NONE; c->type = type; if (type != C_VIEW) { c->children = create_list(); @@ -209,7 +210,8 @@ swayc_t *new_workspace(swayc_t *output, const char *name) { swayc_t *workspace = new_swayc(C_WORKSPACE); workspace->prev_layout = L_NONE; - workspace->layout = default_layout(output); + workspace->layout = L_HORIZ; + workspace->workspace_layout = default_layout(output); workspace->x = output->x; workspace->y = output->y; @@ -262,7 +264,7 @@ swayc_t *new_container(swayc_t *child, enum swayc_layouts layout) { // add container to workspace chidren add_child(workspace, cont); // give them proper layouts - cont->layout = workspace->layout; + cont->layout = workspace->workspace_layout; cont->prev_layout = workspace->prev_layout; /* TODO: might break shit in move_container!!! workspace->layout = layout; */ set_focused_container_for(workspace, get_focused_view(workspace)); @@ -944,3 +946,12 @@ swayc_t *swayc_tabbed_stacked_parent(swayc_t *con) { } return NULL; } + +swayc_t *swayc_change_layout(swayc_t *container, enum swayc_layouts layout) { + if (container->type == C_WORKSPACE) { + container->workspace_layout = layout; + } else { + container->layout = layout; + } + return container; +} diff --git a/sway/handlers.c b/sway/handlers.c index 2235bc8b7..9a84182ad 100644 --- a/sway/handlers.c +++ b/sway/handlers.c @@ -398,17 +398,6 @@ static bool handle_view_created(wlc_handle handle) { if (workspace && workspace->fullscreen) { set_focused_container(workspace->fullscreen); } - - // if parent container is a workspace, newview its only child and - // layout is tabbed/stacked, add a container around newview - swayc_t *parent_container = newview->parent; - if (parent_container && parent_container->type == C_WORKSPACE && - parent_container->children && parent_container->children->length == 1 && - (parent_container->layout == L_TABBED || parent_container->layout == L_STACKED)) { - swayc_t *container = new_container(newview, parent_container->layout); - set_focused_container(newview); - arrange_windows(container, -1, -1); - } } else { swayc_t *output = swayc_parent_by_type(focused, C_OUTPUT); wlc_handle *h = malloc(sizeof(wlc_handle)); diff --git a/sway/layout.c b/sway/layout.c index 4f2ea09ad..b37b82da6 100644 --- a/sway/layout.c +++ b/sway/layout.c @@ -302,6 +302,7 @@ void move_container(swayc_t *container, enum movement_direction dir) { } // Change parent layout if we need to if (parent->children->length == 1 && parent->layout != layout) { + /* swayc_change_layout(parent, layout); */ parent->layout = layout; continue; } From 01e413976dd02a275b42d047437ee755c1e04929 Mon Sep 17 00:00:00 2001 From: "D.B" Date: Sun, 23 Oct 2016 13:19:02 +0200 Subject: [PATCH 2/3] wrap some views under workspaces If workspace layout is set to tabbed or stacked, its C_VIEW children should get wrapped in a container. Alongside that, move_container was modified to retain previous functionality. --- sway/layout.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/sway/layout.c b/sway/layout.c index b37b82da6..ea4a680d7 100644 --- a/sway/layout.c +++ b/sway/layout.c @@ -66,6 +66,9 @@ void add_child(swayc_t *parent, swayc_t *child) { if (!parent->focused) { parent->focused = child; } + if (parent->type == C_WORKSPACE && child->type == C_VIEW && (parent->workspace_layout == L_TABBED || parent->workspace_layout == L_STACKED)) { + child = new_container(child, parent->workspace_layout); + } } void insert_child(swayc_t *parent, swayc_t *child, int index) { @@ -80,6 +83,10 @@ void insert_child(swayc_t *parent, swayc_t *child, int index) { if (!parent->focused) { parent->focused = child; } + if (parent->type == C_WORKSPACE && child->type == C_VIEW && (parent->workspace_layout == L_TABBED || parent->workspace_layout == L_STACKED)) { + child = new_container(child, parent->workspace_layout); + } + } void add_floating(swayc_t *ws, swayc_t *child) { @@ -255,6 +262,19 @@ void move_container(swayc_t *container, enum movement_direction dir) { swayc_t *parent = container->parent; swayc_t *child = container; bool ascended = false; + + // View is wrapped in intermediate container which is needed for displaying + // the titlebar. Moving only the view outside of its parent container would just + // wrap it again under worspace. There would effectively be no movement, + // just a change of wrapping container. + if (child->type == C_VIEW && + parent->type == C_CONTAINER && + parent->children->length == 1 && + parent->parent->type == C_WORKSPACE) { + child = parent; + parent = parent->parent; + } + while (true) { sway_log(L_DEBUG, "container:%p, parent:%p, child %p,", container,parent,child); @@ -348,6 +368,9 @@ void move_container(swayc_t *container, enum movement_direction dir) { } // Create container around workspace to insert child into parent = new_container(parent, layout); + // Previous line set the resulting container's layout to + // workspace_layout. It should have been just layout. + parent->layout = parent->parent->layout; } ascended = true; child = parent; From ef08ec6ca8e5346c5dafde8ba9af62a11570cbc6 Mon Sep 17 00:00:00 2001 From: "D.B" Date: Thu, 17 Nov 2016 06:49:12 +0100 Subject: [PATCH 3/3] fix layout switching (was broken because of workspace_layout) For workspace containers, swayc_change_layout also changes ->layout alongside ->workspace_layout when it's a sensible thing to do. There is an additional test for 'layout toggle' command which ensures that containers will be tiled horizontally after toggling from tabbed or stacked. --- include/sway/container.h | 2 +- sway/commands/layout.c | 2 +- sway/container.c | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/include/sway/container.h b/include/sway/container.h index 90825a490..2bedd1369 100644 --- a/include/sway/container.h +++ b/include/sway/container.h @@ -324,7 +324,7 @@ void close_views(swayc_t *container); /** * Assign layout to a container. Needed due to workspace container specifics. - * Workspace always needs L_HORIZ layout. + * Workspace should always have either L_VERT or L_HORIZ layout. */ swayc_t *swayc_change_layout(swayc_t *container, enum swayc_layouts layout); diff --git a/sway/commands/layout.c b/sway/commands/layout.c index bef06cb2e..08336150b 100644 --- a/sway/commands/layout.c +++ b/sway/commands/layout.c @@ -49,7 +49,7 @@ struct cmd_results *cmd_layout(int argc, char **argv) { } else if (strcasecmp(argv[0], "splitv") == 0) { swayc_change_layout(parent, L_VERT); } else if (strcasecmp(argv[0], "toggle") == 0 && argc == 2 && strcasecmp(argv[1], "split") == 0) { - if (parent->layout == L_HORIZ) { + if (parent->layout == L_HORIZ && (parent->workspace_layout == L_NONE || parent->workspace_layout == L_HORIZ)) { swayc_change_layout(parent, L_VERT); } else { swayc_change_layout(parent, L_HORIZ); diff --git a/sway/container.c b/sway/container.c index c588f3dbf..e52842005 100644 --- a/sway/container.c +++ b/sway/container.c @@ -950,6 +950,9 @@ swayc_t *swayc_tabbed_stacked_parent(swayc_t *con) { swayc_t *swayc_change_layout(swayc_t *container, enum swayc_layouts layout) { if (container->type == C_WORKSPACE) { container->workspace_layout = layout; + if (layout == L_HORIZ || layout == L_VERT) { + container->layout = layout; + } } else { container->layout = layout; }