From f5b9815128b6c000bb5d47c339480fa481a5e99d Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sun, 26 Aug 2018 10:16:49 +1000 Subject: Prepare arrange code for type safe arguments This commit changes the arrange code in a way that will support type safe arguments. The arrange_output et al functions are now public, however I opted not to use them directly yet. I've kept the generic arrange_windows there for convenience until type safety is fully implemented. This means this patch has much less risk of breaking things as it would otherwise. To be type safe, arrange_children_of cannot exist in its previous form because the thing passed to it could be either a workspace or a container. So it's now renamed to arrange_children and accepts a list_t, as well as the parent layout and parent's box. There was some code which checked the grandparent's layout to see if it was tabbed or stacked and adjusted the Y offset of the grandchild accordingly. Accessing the grandparent layout isn't easy when using type safe arguments, and it seemed odd to even need to do this. I determined that this was needed because a child of a tabbed container would have a swayc Y matching the top of the tab bar. I've changed this so a child of a tabbed container will have a swayc Y matching the bottom of the tab bar, which means we don't need to access the grandparent layout. Some tweaks to the rendering and autoconfigure code have been made to implement this, and the container_at code appears to work without needing any changes. arrange_children_of (now arrange_children) would check if the parent had gaps and would copy them to the child, effectively making the workspace's gaps recurse into all children. We can't do this any more without passing has_gaps, gaps_inner and gaps_outer as arguments to arrange_children, so I've changed the add_gaps function to retrieve it from the workspace directly. apply_tabbed_or_stacked_layout has been split into two functions, as it had different logic depending on the layout. Lastly, arrange.h had an unnecessary include of transaction.h. I've removed it, which means I've had to add it to several other files. --- sway/tree/container.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'sway/tree/container.c') diff --git a/sway/tree/container.c b/sway/tree/container.c index 04454ab6..1b193944 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c @@ -1163,7 +1163,9 @@ void container_add_gaps(struct sway_container *c) { return; } - c->current_gaps = c->has_gaps ? c->gaps_inner : config->gaps_inner; + struct sway_container *ws = container_parent(c, C_WORKSPACE); + + c->current_gaps = ws->has_gaps ? ws->gaps_inner : config->gaps_inner; c->x += c->current_gaps; c->y += c->current_gaps; c->width -= 2 * c->current_gaps; -- cgit v1.2.3 From 126a82f14ff47925c7f88523ed9abe0ae9aeb7e8 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Tue, 28 Aug 2018 23:53:51 +1000 Subject: Fix gaps issues * In layout command, arrange parent of parent - not sure why this is needed but it is * Remove gap adjustment when rendering * Workspace should use outer gaps, not inner * Add exceptions for tabbed and stacked containers * Don't mess with gap state when splitting a container --- sway/commands/layout.c | 2 +- sway/desktop/render.c | 7 ++----- sway/tree/container.c | 18 ++++++++++++------ sway/tree/workspace.c | 10 +++++++++- 4 files changed, 24 insertions(+), 13 deletions(-) (limited to 'sway/tree/container.c') diff --git a/sway/commands/layout.c b/sway/commands/layout.c index f4e4dda9..a06832de 100644 --- a/sway/commands/layout.c +++ b/sway/commands/layout.c @@ -103,7 +103,7 @@ struct cmd_results *cmd_layout(int argc, char **argv) { parent->prev_split_layout = prev; } container_notify_subtree_changed(parent); - arrange_windows(parent); + arrange_windows(parent->parent); } return cmd_results_new(CMD_SUCCESS, NULL, NULL); diff --git a/sway/desktop/render.c b/sway/desktop/render.c index b52dd196..5556e5b3 100644 --- a/sway/desktop/render.c +++ b/sway/desktop/render.c @@ -619,9 +619,7 @@ static void render_container_tabbed(struct sway_output *output, struct sway_container *current = pstate->focused_inactive_child; struct border_colors *current_colors = &config->border_colors.unfocused; - double width_gap_adjustment = 2 * pstate->current_gaps; - int tab_width = - (pstate->swayc_width - width_gap_adjustment) / pstate->children->length; + int tab_width = (pstate->swayc_width) / pstate->children->length; // Render tabs for (int i = 0; i < pstate->children->length; ++i) { @@ -656,8 +654,7 @@ static void render_container_tabbed(struct sway_output *output, // Make last tab use the remaining width of the parent if (i == pstate->children->length - 1) { - tab_width = - pstate->swayc_width - width_gap_adjustment - tab_width * i; + tab_width = pstate->swayc_width - tab_width * i; } render_titlebar(output, damage, child, x, pstate->swayc_y, tab_width, diff --git a/sway/tree/container.c b/sway/tree/container.c index 1b193944..ee019098 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c @@ -1159,7 +1159,17 @@ void container_add_gaps(struct sway_container *c) { "Expected a container or view")) { return; } - if (c->current_gaps > 0 || c->type != C_VIEW) { + if (c->current_gaps > 0) { + return; + } + // Linear containers don't have gaps because it'd create double gaps + if (c->type == C_CONTAINER && + c->layout != L_TABBED && c->layout != L_STACKED) { + return; + } + // Children of tabbed/stacked containers re-use the gaps of the container + enum sway_container_layout layout = c->parent->layout; + if (layout == L_TABBED || layout == L_STACKED) { return; } @@ -1355,20 +1365,16 @@ struct sway_container *container_split(struct sway_container *child, wlr_log(WLR_DEBUG, "creating container %p around %p", cont, child); - child->type == C_WORKSPACE ? workspace_remove_gaps(child) - : container_remove_gaps(child); - cont->prev_split_layout = L_NONE; cont->width = child->width; cont->height = child->height; cont->x = child->x; cont->y = child->y; + cont->current_gaps = child->current_gaps; struct sway_seat *seat = input_manager_get_default_seat(input_manager); bool set_focus = (seat_get_focus(seat) == child); - container_add_gaps(cont); - if (child->type == C_WORKSPACE) { struct sway_container *workspace = child; while (workspace->children->length) { diff --git a/sway/tree/workspace.c b/sway/tree/workspace.c index d930826e..60256336 100644 --- a/sway/tree/workspace.c +++ b/sway/tree/workspace.c @@ -694,7 +694,15 @@ void workspace_add_gaps(struct sway_container *ws) { return; } - ws->current_gaps = ws->has_gaps ? ws->gaps_inner : config->gaps_inner; + ws->current_gaps = ws->has_gaps ? ws->gaps_outer : config->gaps_outer; + + if (ws->layout == L_TABBED || ws->layout == L_STACKED) { + // We have to add inner gaps for this, because children of tabbed and + // stacked containers don't apply their own gaps - they assume the + // tabbed/stacked container is using gaps. + ws->current_gaps += ws->has_gaps ? ws->gaps_inner : config->gaps_inner; + } + ws->x += ws->current_gaps; ws->y += ws->current_gaps; ws->width -= 2 * ws->current_gaps; -- cgit v1.2.3