From 8bed4be1f387f9aa48910db1cf979cd847a9a2e3 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sun, 19 Aug 2018 17:00:51 +1000 Subject: [PATCH] Make separate gaps functions per container type In preparation for using type safety. --- include/sway/tree/arrange.h | 6 ---- include/sway/tree/container.h | 4 +++ include/sway/tree/workspace.h | 4 +++ sway/tree/arrange.c | 54 ++++++----------------------------- sway/tree/container.c | 33 ++++++++++++++++++++- sway/tree/layout.c | 5 ++-- sway/tree/workspace.c | 35 +++++++++++++++++++++++ 7 files changed, 86 insertions(+), 55 deletions(-) diff --git a/include/sway/tree/arrange.h b/include/sway/tree/arrange.h index d6abcc813..346103d39 100644 --- a/include/sway/tree/arrange.h +++ b/include/sway/tree/arrange.h @@ -4,12 +4,6 @@ struct sway_container; -// Remove gaps around container -void remove_gaps(struct sway_container *c); - -// Add gaps around container -void add_gaps(struct sway_container *c); - /** * Arrange layout for all the children of the given container. */ diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h index 2cedb6139..2b6e6e0c9 100644 --- a/include/sway/tree/container.h +++ b/include/sway/tree/container.h @@ -335,6 +335,10 @@ struct sway_output *container_get_effective_output(struct sway_container *con); void container_discover_outputs(struct sway_container *con); +void container_remove_gaps(struct sway_container *container); + +void container_add_gaps(struct sway_container *container); + int container_sibling_index(const struct sway_container *child); #endif diff --git a/include/sway/tree/workspace.h b/include/sway/tree/workspace.h index efcb7c699..043259191 100644 --- a/include/sway/tree/workspace.h +++ b/include/sway/tree/workspace.h @@ -75,4 +75,8 @@ struct sway_container *workspace_wrap_children(struct sway_container *ws); void workspace_add_floating(struct sway_container *workspace, struct sway_container *con); +void workspace_remove_gaps(struct sway_container *ws); + +void workspace_add_gaps(struct sway_container *ws); + #endif diff --git a/sway/tree/arrange.c b/sway/tree/arrange.c index a4b058f37..0da61a4c0 100644 --- a/sway/tree/arrange.c +++ b/sway/tree/arrange.c @@ -39,7 +39,7 @@ static void apply_horiz_layout(struct sway_container *parent) { child->width = parent->width; } } - remove_gaps(child); + container_remove_gaps(child); total_width += child->width; } double scale = parent->width / total_width; @@ -62,7 +62,7 @@ static void apply_horiz_layout(struct sway_container *parent) { if (i == num_children - 1) { child->width = parent->x + parent->width - child->x; } - add_gaps(child); + container_add_gaps(child); } } @@ -91,7 +91,7 @@ static void apply_vert_layout(struct sway_container *parent) { child->height = parent_height; } } - remove_gaps(child); + container_remove_gaps(child); total_height += child->height; } double scale = parent_height / total_height; @@ -115,7 +115,7 @@ static void apply_vert_layout(struct sway_container *parent) { child->height = parent->y + parent_offset + parent_height - child->y; } - add_gaps(child); + container_add_gaps(child); } } @@ -133,12 +133,12 @@ static void apply_tabbed_or_stacked_layout(struct sway_container *parent) { size_t parent_height = parent->height - parent_offset; for (int i = 0; i < parent->children->length; ++i) { struct sway_container *child = parent->children->items[i]; - remove_gaps(child); + container_remove_gaps(child); child->x = parent->x; child->y = parent->y + parent_offset; child->width = parent->width; child->height = parent_height; - add_gaps(child); + container_add_gaps(child); } } @@ -205,7 +205,7 @@ static void arrange_workspace(struct sway_container *workspace) { struct wlr_box *area = &output->sway_output->usable_area; wlr_log(WLR_DEBUG, "Usable area for ws: %dx%d@%d,%d", area->width, area->height, area->x, area->y); - remove_gaps(workspace); + workspace_remove_gaps(workspace); double prev_x = workspace->x; double prev_y = workspace->y; @@ -230,7 +230,7 @@ static void arrange_workspace(struct sway_container *workspace) { } } - add_gaps(workspace); + workspace_add_gaps(workspace); container_set_dirty(workspace); wlr_log(WLR_DEBUG, "Arranging workspace '%s' at %f, %f", workspace->name, workspace->x, workspace->y); @@ -314,41 +314,3 @@ void arrange_windows(struct sway_container *container) { break; } } - -void remove_gaps(struct sway_container *c) { - if (c->current_gaps == 0) { - wlr_log(WLR_DEBUG, "Removing gaps: not gapped: %p", c); - return; - } - - c->width += c->current_gaps * 2; - c->height += c->current_gaps * 2; - c->x -= c->current_gaps; - c->y -= c->current_gaps; - - c->current_gaps = 0; - - wlr_log(WLR_DEBUG, "Removing gaps %p", c); -} - -void add_gaps(struct sway_container *c) { - if (c->current_gaps > 0 || c->type == C_CONTAINER) { - wlr_log(WLR_DEBUG, "Not adding gaps: %p", c); - return; - } - - if (c->type == C_WORKSPACE && - !(config->edge_gaps || (config->smart_gaps && c->children->length > 1))) { - return; - } - - double gaps = c->has_gaps ? c->gaps_inner : config->gaps_inner; - - c->x += gaps; - c->y += gaps; - c->width -= 2 * gaps; - c->height -= 2 * gaps; - c->current_gaps = gaps; - - wlr_log(WLR_DEBUG, "Adding gaps: %p", c); -} diff --git a/sway/tree/container.c b/sway/tree/container.c index 5721c35c0..f96113428 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c @@ -1124,7 +1124,38 @@ void container_discover_outputs(struct sway_container *con) { } } +void container_remove_gaps(struct sway_container *c) { + if (!sway_assert(c->type == C_CONTAINER || c->type == C_VIEW, + "Expected a container or view")) { + return; + } + if (c->current_gaps == 0) { + return; + } + + c->width += c->current_gaps * 2; + c->height += c->current_gaps * 2; + c->x -= c->current_gaps; + c->y -= c->current_gaps; + c->current_gaps = 0; +} + +void container_add_gaps(struct sway_container *c) { + if (!sway_assert(c->type == C_CONTAINER || c->type == C_VIEW, + "Expected a container or view")) { + return; + } + if (c->current_gaps > 0 || c->type != C_VIEW) { + return; + } + + c->current_gaps = c->has_gaps ? c->gaps_inner : config->gaps_inner; + c->x += c->current_gaps; + c->y += c->current_gaps; + c->width -= 2 * c->current_gaps; + c->height -= 2 * c->current_gaps; +} + int container_sibling_index(const struct sway_container *child) { return list_find(child->parent->children, child); } - diff --git a/sway/tree/layout.c b/sway/tree/layout.c index 601d0e916..85fe7643e 100644 --- a/sway/tree/layout.c +++ b/sway/tree/layout.c @@ -218,7 +218,8 @@ struct sway_container *container_split(struct sway_container *child, wlr_log(WLR_DEBUG, "creating container %p around %p", cont, child); - remove_gaps(child); + child->type == C_WORKSPACE ? workspace_remove_gaps(child) + : container_remove_gaps(child); cont->prev_split_layout = L_NONE; cont->width = child->width; @@ -229,7 +230,7 @@ struct sway_container *container_split(struct sway_container *child, struct sway_seat *seat = input_manager_get_default_seat(input_manager); bool set_focus = (seat_get_focus(seat) == child); - add_gaps(cont); + container_add_gaps(cont); if (child->type == C_WORKSPACE) { struct sway_container *workspace = child; diff --git a/sway/tree/workspace.c b/sway/tree/workspace.c index 93c4b3d31..d930826e9 100644 --- a/sway/tree/workspace.c +++ b/sway/tree/workspace.c @@ -665,3 +665,38 @@ void workspace_add_floating(struct sway_container *workspace, container_set_dirty(workspace); container_set_dirty(con); } + +void workspace_remove_gaps(struct sway_container *ws) { + if (!sway_assert(ws->type == C_WORKSPACE, "Expected a workspace")) { + return; + } + if (ws->current_gaps == 0) { + return; + } + + ws->width += ws->current_gaps * 2; + ws->height += ws->current_gaps * 2; + ws->x -= ws->current_gaps; + ws->y -= ws->current_gaps; + ws->current_gaps = 0; +} + +void workspace_add_gaps(struct sway_container *ws) { + if (!sway_assert(ws->type == C_WORKSPACE, "Expected a workspace")) { + return; + } + if (ws->current_gaps > 0) { + return; + } + bool should_apply = + config->edge_gaps || (config->smart_gaps && ws->children->length > 1); + if (!should_apply) { + return; + } + + 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; + ws->height -= 2 * ws->current_gaps; +}