aboutsummaryrefslogtreecommitdiff
path: root/sway/tree
diff options
context:
space:
mode:
Diffstat (limited to 'sway/tree')
-rw-r--r--sway/tree/arrange.c326
-rw-r--r--sway/tree/container.c21
-rw-r--r--sway/tree/layout.c74
-rw-r--r--sway/tree/output.c5
-rw-r--r--sway/tree/view.c111
-rw-r--r--sway/tree/workspace.c2
6 files changed, 255 insertions, 284 deletions
diff --git a/sway/tree/arrange.c b/sway/tree/arrange.c
index 53c95820..ac99c5df 100644
--- a/sway/tree/arrange.c
+++ b/sway/tree/arrange.c
@@ -5,7 +5,6 @@
#include <string.h>
#include <wlr/types/wlr_output.h>
#include <wlr/types/wlr_output_layout.h>
-#include "sway/debug.h"
#include "sway/tree/arrange.h"
#include "sway/tree/container.h"
#include "sway/tree/layout.h"
@@ -17,116 +16,6 @@
struct sway_container root_container;
-void arrange_root() {
- if (config->reloading) {
- return;
- }
- struct wlr_output_layout *output_layout =
- root_container.sway_root->output_layout;
- const struct wlr_box *layout_box =
- wlr_output_layout_get_box(output_layout, NULL);
- root_container.x = layout_box->x;
- root_container.y = layout_box->y;
- root_container.width = layout_box->width;
- root_container.height = layout_box->height;
- for (int i = 0; i < root_container.children->length; ++i) {
- struct sway_container *output = root_container.children->items[i];
- arrange_output(output);
- }
-}
-
-void arrange_output(struct sway_container *output) {
- if (config->reloading) {
- return;
- }
- if (!sway_assert(output->type == C_OUTPUT,
- "called arrange_output() on non-output container")) {
- return;
- }
-
- const struct wlr_box *output_box = wlr_output_layout_get_box(
- root_container.sway_root->output_layout,
- output->sway_output->wlr_output);
- output->x = output_box->x;
- output->y = output_box->y;
- output->width = output_box->width;
- output->height = output_box->height;
- wlr_log(L_DEBUG, "Arranging output '%s' at %f,%f",
- output->name, output->x, output->y);
-
- for (int i = 0; i < output->children->length; ++i) {
- struct sway_container *workspace = output->children->items[i];
- arrange_workspace(workspace);
- }
- container_damage_whole(output);
-}
-
-void arrange_workspace(struct sway_container *workspace) {
- if (config->reloading) {
- return;
- }
- if (!sway_assert(workspace->type == C_WORKSPACE,
- "called arrange_workspace() on non-workspace container")) {
- return;
- }
-
- struct sway_container *output = workspace->parent;
- struct wlr_box *area = &output->sway_output->usable_area;
- wlr_log(L_DEBUG, "Usable area for ws: %dx%d@%d,%d",
- area->width, area->height, area->x, area->y);
-
- remove_gaps(workspace);
-
- workspace->width = area->width;
- workspace->height = area->height;
- workspace->x = output->x + area->x;
- workspace->y = output->y + area->y;
-
- add_gaps(workspace);
-
- wlr_log(L_DEBUG, "Arranging workspace '%s' at %f, %f",
- workspace->name, workspace->x, workspace->y);
- arrange_children_of(workspace);
-}
-
-void remove_gaps(struct sway_container *c) {
- if (c->current_gaps == 0) {
- wlr_log(L_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(L_DEBUG, "Removing gaps %p", c);
-}
-
-void add_gaps(struct sway_container *c) {
- if (c->current_gaps > 0 || c->type == C_CONTAINER) {
- wlr_log(L_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(L_DEBUG, "Adding gaps: %p", c);
-}
-
static void apply_horiz_layout(struct sway_container *parent) {
size_t num_children = parent->children->length;
if (!num_children) {
@@ -136,8 +25,8 @@ static void apply_horiz_layout(struct sway_container *parent) {
if (parent->parent->layout == L_TABBED) {
parent_offset = container_titlebar_height();
} else if (parent->parent->layout == L_STACKED) {
- parent_offset =
- container_titlebar_height() * parent->parent->children->length;
+ parent_offset = container_titlebar_height() *
+ parent->parent->children->length;
}
size_t parent_height = parent->height - parent_offset;
@@ -145,7 +34,6 @@ static void apply_horiz_layout(struct sway_container *parent) {
double total_width = 0;
for (size_t i = 0; i < num_children; ++i) {
struct sway_container *child = parent->children->items[i];
-
if (child->width <= 0) {
if (num_children > 1) {
child->width = parent->width / (num_children - 1);
@@ -161,25 +49,21 @@ static void apply_horiz_layout(struct sway_container *parent) {
// Resize windows
wlr_log(L_DEBUG, "Arranging %p horizontally", parent);
double child_x = parent->x;
- struct sway_container *child;
for (size_t i = 0; i < num_children; ++i) {
- child = parent->children->items[i];
+ struct sway_container *child = parent->children->items[i];
wlr_log(L_DEBUG,
"Calculating arrangement for %p:%d (will scale %f by %f)",
child, child->type, child->width, scale);
child->x = child_x;
child->y = parent->y + parent_offset;
+ child->width = floor(child->width * scale);
child->height = parent_height;
+ child_x += child->width;
+ // Make last child use remaining width of parent
if (i == num_children - 1) {
- // Make last child use remaining width of parent
child->width = parent->x + parent->width - child->x;
- } else {
- child->width = floor(child->width * scale);
}
-
- child_x += child->width;
-
add_gaps(child);
}
}
@@ -202,7 +86,6 @@ static void apply_vert_layout(struct sway_container *parent) {
double total_height = 0;
for (size_t i = 0; i < num_children; ++i) {
struct sway_container *child = parent->children->items[i];
-
if (child->height <= 0) {
if (num_children > 1) {
child->height = parent_height / (num_children - 1);
@@ -218,25 +101,22 @@ static void apply_vert_layout(struct sway_container *parent) {
// Resize
wlr_log(L_DEBUG, "Arranging %p vertically", parent);
double child_y = parent->y + parent_offset;
- struct sway_container *child;
for (size_t i = 0; i < num_children; ++i) {
- child = parent->children->items[i];
+ struct sway_container *child = parent->children->items[i];
wlr_log(L_DEBUG,
"Calculating arrangement for %p:%d (will scale %f by %f)",
child, child->type, child->height, scale);
child->x = parent->x;
child->y = child_y;
child->width = parent->width;
+ child->height = floor(child->height * scale);
+ child_y += child->height;
+ // Make last child use remaining height of parent
if (i == num_children - 1) {
- // Make last child use remaining height of parent
- child->height = parent->y + parent_offset + parent_height - child->y;
- } else {
- child->height = floor(child->height * scale);
+ child->height =
+ parent->y + parent_offset + parent_height - child->y;
}
-
- child_y += child->height;
-
add_gaps(child);
}
}
@@ -264,26 +144,27 @@ static void apply_tabbed_or_stacked_layout(struct sway_container *parent) {
}
}
-void arrange_children_of(struct sway_container *parent) {
- if (config->reloading) {
- return;
- }
- if (!sway_assert(parent->type == C_WORKSPACE || parent->type == C_CONTAINER,
- "container is a %s", container_type_to_str(parent->type))) {
- return;
- }
+static void arrange_children_of(struct sway_container *parent,
+ struct sway_transaction *transaction);
- struct sway_container *workspace = parent;
- if (workspace->type != C_WORKSPACE) {
- workspace = container_parent(workspace, C_WORKSPACE);
+static void arrange_floating(struct sway_container *floating,
+ struct sway_transaction *transaction) {
+ for (int i = 0; i < floating->children->length; ++i) {
+ struct sway_container *floater = floating->children->items[i];
+ if (floater->type == C_VIEW) {
+ view_autoconfigure(floater->sway_view);
+ } else {
+ arrange_children_of(floater, transaction);
+ }
+ transaction_add_container(transaction, floater);
}
+}
- if (workspace->sway_workspace->fullscreen) {
- // Just arrange the fullscreen view and jump out
- view_autoconfigure(workspace->sway_workspace->fullscreen);
+static void arrange_children_of(struct sway_container *parent,
+ struct sway_transaction *transaction) {
+ if (config->reloading) {
return;
}
-
wlr_log(L_DEBUG, "Arranging layout for %p %s %fx%f+%f,%f", parent,
parent->name, parent->width, parent->height, parent->x, parent->y);
@@ -299,13 +180,15 @@ void arrange_children_of(struct sway_container *parent) {
case L_STACKED:
apply_tabbed_or_stacked_layout(parent);
break;
- default:
- wlr_log(L_DEBUG, "TODO: arrange layout type %d", parent->layout);
+ case L_NONE:
apply_horiz_layout(parent);
break;
+ case L_FLOATING:
+ arrange_floating(parent, transaction);
+ break;
}
- // Apply x, y, width and height to children and recurse if needed
+ // Recurse into child containers
for (int i = 0; i < parent->children->length; ++i) {
struct sway_container *child = parent->children->items[i];
if (parent->has_gaps && !child->has_gaps) {
@@ -316,21 +199,140 @@ void arrange_children_of(struct sway_container *parent) {
if (child->type == C_VIEW) {
view_autoconfigure(child->sway_view);
} else {
- arrange_children_of(child);
+ arrange_children_of(child, transaction);
}
+ transaction_add_container(transaction, child);
}
+}
- // If container is a workspace, process floating containers too
- if (parent->type == C_WORKSPACE) {
- struct sway_workspace *ws = workspace->sway_workspace;
- for (int i = 0; i < ws->floating->children->length; ++i) {
- struct sway_container *child = ws->floating->children->items[i];
- if (child->type != C_VIEW) {
- arrange_children_of(child);
- }
- }
+static void arrange_workspace(struct sway_container *workspace,
+ struct sway_transaction *transaction) {
+ if (config->reloading) {
+ return;
}
+ struct sway_container *output = workspace->parent;
+ struct wlr_box *area = &output->sway_output->usable_area;
+ wlr_log(L_DEBUG, "Usable area for ws: %dx%d@%d,%d",
+ area->width, area->height, area->x, area->y);
+ remove_gaps(workspace);
+ workspace->width = area->width;
+ workspace->height = area->height;
+ workspace->x = output->x + area->x;
+ workspace->y = output->y + area->y;
+ add_gaps(workspace);
+ transaction_add_container(transaction, workspace);
+ wlr_log(L_DEBUG, "Arranging workspace '%s' at %f, %f", workspace->name,
+ workspace->x, workspace->y);
+ arrange_floating(workspace->sway_workspace->floating, transaction);
+ arrange_children_of(workspace, transaction);
+}
- container_damage_whole(parent);
- update_debug_tree();
+static void arrange_output(struct sway_container *output,
+ struct sway_transaction *transaction) {
+ if (config->reloading) {
+ return;
+ }
+ const struct wlr_box *output_box = wlr_output_layout_get_box(
+ root_container.sway_root->output_layout,
+ output->sway_output->wlr_output);
+ output->x = output_box->x;
+ output->y = output_box->y;
+ output->width = output_box->width;
+ output->height = output_box->height;
+ transaction_add_container(transaction, output);
+ wlr_log(L_DEBUG, "Arranging output '%s' at %f,%f",
+ output->name, output->x, output->y);
+ for (int i = 0; i < output->children->length; ++i) {
+ struct sway_container *workspace = output->children->items[i];
+ arrange_workspace(workspace, transaction);
+ }
+}
+
+static void arrange_root(struct sway_transaction *transaction) {
+ if (config->reloading) {
+ return;
+ }
+ struct wlr_output_layout *output_layout =
+ root_container.sway_root->output_layout;
+ const struct wlr_box *layout_box =
+ wlr_output_layout_get_box(output_layout, NULL);
+ root_container.x = layout_box->x;
+ root_container.y = layout_box->y;
+ root_container.width = layout_box->width;
+ root_container.height = layout_box->height;
+ transaction_add_container(transaction, &root_container);
+ for (int i = 0; i < root_container.children->length; ++i) {
+ struct sway_container *output = root_container.children->items[i];
+ arrange_output(output, transaction);
+ }
+}
+
+void arrange_windows(struct sway_container *container,
+ struct sway_transaction *transaction) {
+ switch (container->type) {
+ case C_ROOT:
+ arrange_root(transaction);
+ break;
+ case C_OUTPUT:
+ arrange_output(container, transaction);
+ break;
+ case C_WORKSPACE:
+ arrange_workspace(container, transaction);
+ break;
+ case C_CONTAINER:
+ arrange_children_of(container, transaction);
+ transaction_add_container(transaction, container);
+ break;
+ case C_VIEW:
+ view_autoconfigure(container->sway_view);
+ transaction_add_container(transaction, container);
+ break;
+ case C_TYPES:
+ break;
+ }
+ transaction_add_damage(transaction, container_get_box(container));
+}
+
+void arrange_and_commit(struct sway_container *container) {
+ struct sway_transaction *transaction = transaction_create();
+ arrange_windows(container, transaction);
+ transaction_commit(transaction);
+}
+
+void remove_gaps(struct sway_container *c) {
+ if (c->current_gaps == 0) {
+ wlr_log(L_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(L_DEBUG, "Removing gaps %p", c);
+}
+
+void add_gaps(struct sway_container *c) {
+ if (c->current_gaps > 0 || c->type == C_CONTAINER) {
+ wlr_log(L_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(L_DEBUG, "Adding gaps: %p", c);
}
diff --git a/sway/tree/container.c b/sway/tree/container.c
index af55a54e..f8620b72 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -116,6 +116,7 @@ struct sway_container *container_create(enum sway_container_type type) {
if (type != C_VIEW) {
c->children = create_list();
+ //c->pending.children = create_list();
}
wl_signal_init(&c->events.destroy);
@@ -167,6 +168,7 @@ static void _container_destroy(struct sway_container *cont) {
wlr_texture_destroy(cont->title_urgent);
list_free(cont->children);
+ //list_free(cont->pending.children);
cont->children = NULL;
free(cont);
}
@@ -207,6 +209,7 @@ static struct sway_container *container_workspace_destroy(
container_move_to(floating->children->items[i],
new_workspace->sway_workspace->floating);
}
+ arrange_and_commit(new_workspace);
}
struct sway_workspace *sway_workspace = workspace->sway_workspace;
@@ -267,10 +270,10 @@ static struct sway_container *container_output_destroy(
}
container_sort_workspaces(new_output);
- arrange_output(new_output);
}
}
}
+ arrange_and_commit(&root_container);
wl_list_remove(&output->sway_output->mode.link);
wl_list_remove(&output->sway_output->transform.link);
@@ -927,13 +930,12 @@ void container_set_floating(struct sway_container *container, bool enable) {
struct sway_container *workspace = container_parent(container, C_WORKSPACE);
struct sway_seat *seat = input_manager_current_seat(input_manager);
- container_damage_whole(container);
if (enable) {
container_remove_child(container);
container_add_child(workspace->sway_workspace->floating, container);
if (container->type == C_VIEW) {
- view_autoconfigure(container->sway_view);
+ view_init_floating(container->sway_view);
}
seat_set_focus(seat, seat_get_focus_inactive(seat, container));
container_reap_empty_recursive(workspace);
@@ -946,8 +948,8 @@ void container_set_floating(struct sway_container *container, bool enable) {
container->is_sticky = false;
container_reap_empty_recursive(workspace->sway_workspace->floating);
}
- arrange_workspace(workspace);
- container_damage_whole(container);
+
+ ipc_event_window(container, "floating");
}
void container_set_geometry_from_floating_view(struct sway_container *con) {
@@ -976,3 +978,12 @@ bool container_is_floating(struct sway_container *container) {
}
return container->parent == workspace->sway_workspace->floating;
}
+
+struct wlr_box *container_get_box(struct sway_container *container) {
+ struct wlr_box *box = calloc(1, sizeof(struct wlr_box));
+ box->x = container->x;
+ box->y = container->y;
+ box->width = container->width;
+ box->height = container->height;
+ return box;
+}
diff --git a/sway/tree/layout.c b/sway/tree/layout.c
index d1ad044d..3724361d 100644
--- a/sway/tree/layout.c
+++ b/sway/tree/layout.c
@@ -22,7 +22,7 @@ struct sway_container root_container;
static void output_layout_handle_change(struct wl_listener *listener,
void *data) {
- arrange_root();
+ arrange_and_commit(&root_container);
}
void layout_init(void) {
@@ -57,18 +57,17 @@ static int index_child(const struct sway_container *child) {
return -1;
}
-static void container_handle_fullscreen_reparent(struct sway_container *viewcon,
+static void container_handle_fullscreen_reparent(struct sway_container *con,
struct sway_container *old_parent) {
- if (viewcon->type != C_VIEW || !viewcon->sway_view->is_fullscreen) {
+ if (con->type != C_VIEW || !con->sway_view->is_fullscreen) {
return;
}
- struct sway_view *view = viewcon->sway_view;
+ struct sway_view *view = con->sway_view;
struct sway_container *old_workspace = old_parent;
if (old_workspace && old_workspace->type != C_WORKSPACE) {
old_workspace = container_parent(old_workspace, C_WORKSPACE);
}
- struct sway_container *new_workspace = container_parent(view->swayc,
- C_WORKSPACE);
+ struct sway_container *new_workspace = container_parent(con, C_WORKSPACE);
if (old_workspace == new_workspace) {
return;
}
@@ -79,15 +78,19 @@ static void container_handle_fullscreen_reparent(struct sway_container *viewcon,
// Mark the new workspace as fullscreen
if (new_workspace->sway_workspace->fullscreen) {
- view_set_fullscreen_raw(
- new_workspace->sway_workspace->fullscreen, false);
+ view_set_fullscreen(new_workspace->sway_workspace->fullscreen, false);
}
new_workspace->sway_workspace->fullscreen = view;
// Resize view to new output dimensions
struct sway_container *output = new_workspace->parent;
- view_configure(view, 0, 0, output->width, output->height);
- view->swayc->width = output->width;
- view->swayc->height = output->height;
+ view->x = output->x;
+ view->y = output->y;
+ view->width = output->width;
+ view->height = output->height;
+ con->x = output->x;
+ con->y = output->y;
+ con->width = output->width;
+ con->height = output->height;
}
void container_insert_child(struct sway_container *parent,
@@ -189,18 +192,7 @@ void container_move_to(struct sway_container *container,
}
container_notify_subtree_changed(old_parent);
container_notify_subtree_changed(new_parent);
- if (old_parent) {
- if (old_parent->type == C_OUTPUT) {
- arrange_output(old_parent);
- } else {
- arrange_children_of(old_parent);
- }
- }
- if (new_parent->type == C_OUTPUT) {
- arrange_output(new_parent);
- } else {
- arrange_children_of(new_parent);
- }
+
// If view was moved to a fullscreen workspace, refocus the fullscreen view
struct sway_container *new_workspace = container;
if (new_workspace->type != C_WORKSPACE) {
@@ -215,7 +207,8 @@ void container_move_to(struct sway_container *container,
if (focus_ws->type != C_WORKSPACE) {
focus_ws = container_parent(focus_ws, C_WORKSPACE);
}
- seat_set_focus(seat, new_workspace->sway_workspace->fullscreen->swayc);
+ seat_set_focus(seat,
+ new_workspace->sway_workspace->fullscreen->swayc);
if (focus_ws != new_workspace) {
seat_set_focus(seat, focus);
}
@@ -309,7 +302,6 @@ static void workspace_rejigger(struct sway_container *ws,
container_reap_empty_recursive(original_parent);
wl_signal_emit(&child->events.reparent, original_parent);
container_create_notify(new_parent);
- arrange_workspace(ws);
}
static void move_out_of_tabs_stacks(struct sway_container *container,
@@ -320,11 +312,6 @@ static void move_out_of_tabs_stacks(struct sway_container *container,
wlr_log(L_DEBUG, "Changing layout of %zd", current->parent->id);
current->parent->layout = move_dir ==
MOVE_LEFT || move_dir == MOVE_RIGHT ? L_HORIZ : L_VERT;
- if (current->parent->type == C_WORKSPACE) {
- arrange_workspace(current->parent);
- } else {
- arrange_children_of(current->parent);
- }
return;
}
@@ -340,11 +327,6 @@ static void move_out_of_tabs_stacks(struct sway_container *container,
container_flatten(new_parent->parent);
}
container_create_notify(new_parent);
- if (is_workspace) {
- arrange_workspace(new_parent->parent);
- } else {
- arrange_children_of(new_parent);
- }
container_notify_subtree_changed(new_parent);
}
@@ -368,10 +350,7 @@ void container_move(struct sway_container *container,
struct sway_container *new_parent = container_flatten(parent);
if (new_parent != parent) {
- // Special case: we were the last one in this container, so flatten it
- // and leave
- arrange_children_of(new_parent);
- update_debug_tree();
+ // Special case: we were the last one in this container, so leave
return;
}
@@ -453,12 +432,9 @@ void container_move(struct sway_container *container,
wlr_log(L_DEBUG, "Hit limit, "
"promoting descendant to sibling");
// Special case
- struct sway_container *old_parent = container->parent;
container_insert_child(current->parent, container,
index + (offs < 0 ? 0 : 1));
container->width = container->height = 0;
- arrange_children_of(current->parent);
- arrange_children_of(old_parent);
return;
}
} else {
@@ -492,14 +468,11 @@ void container_move(struct sway_container *container,
wlr_log(L_DEBUG, "Swapping siblings");
sibling->parent->children->items[index + offs] = container;
sibling->parent->children->items[index] = sibling;
- arrange_children_of(sibling->parent);
} else {
wlr_log(L_DEBUG, "Promoting to sibling of cousin");
container_insert_child(sibling->parent, container,
index_child(sibling) + (offs > 0 ? 0 : 1));
container->width = container->height = 0;
- arrange_children_of(sibling->parent);
- arrange_children_of(old_parent);
}
sibling = NULL;
break;
@@ -513,8 +486,6 @@ void container_move(struct sway_container *container,
"(move dir: %d)", limit, move_dir);
container_insert_child(sibling, container, limit);
container->width = container->height = 0;
- arrange_children_of(sibling);
- arrange_children_of(old_parent);
sibling = NULL;
} else {
wlr_log(L_DEBUG, "Reparenting container (perpendicular)");
@@ -538,8 +509,6 @@ void container_move(struct sway_container *container,
container_add_child(sibling, container);
}
container->width = container->height = 0;
- arrange_children_of(sibling);
- arrange_children_of(old_parent);
sibling = NULL;
}
break;
@@ -864,7 +833,6 @@ struct sway_container *container_split(struct sway_container *child,
// Special case: this just behaves like splitt
child->prev_layout = child->layout;
child->layout = layout;
- arrange_children_of(child);
return child;
}
@@ -882,7 +850,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);
if (child->type == C_WORKSPACE) {
@@ -912,7 +880,6 @@ struct sway_container *container_split(struct sway_container *child,
}
container_notify_subtree_changed(cont);
- arrange_children_of(cont);
return cont;
}
@@ -1050,9 +1017,6 @@ void container_swap(struct sway_container *con1, struct sway_container *con2) {
prev_workspace_name = stored_prev_name;
}
- arrange_children_of(con1->parent);
- arrange_children_of(con2->parent);
-
if (fs1 && con2->type == C_VIEW) {
view_set_fullscreen(con2->sway_view, true);
}
diff --git a/sway/tree/output.c b/sway/tree/output.c
index ed7e941e..8af319d5 100644
--- a/sway/tree/output.c
+++ b/sway/tree/output.c
@@ -26,12 +26,10 @@ static void restore_workspaces(struct sway_container *output) {
j--;
}
}
-
- arrange_output(other);
}
container_sort_workspaces(output);
- arrange_output(output);
+ arrange_and_commit(&root_container);
}
struct sway_container *output_create(
@@ -68,6 +66,7 @@ struct sway_container *output_create(
struct sway_container *output = container_create(C_OUTPUT);
output->sway_output = sway_output;
+ sway_output->swayc = output;
output->name = strdup(name);
if (output->name == NULL) {
container_destroy(output);
diff --git a/sway/tree/view.c b/sway/tree/view.c
index c9c82405..658a94e8 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -25,6 +25,7 @@ void view_init(struct sway_view *view, enum sway_view_type type,
view->impl = impl;
view->executed_criteria = create_list();
view->marks = create_list();
+ view->instructions = create_list();
wl_signal_init(&view->events.unmap);
}
@@ -37,6 +38,11 @@ void view_destroy(struct sway_view *view) {
view_unmap(view);
}
+ if (!sway_assert(view->instructions->length == 0,
+ "Tried to destroy view with pending instructions")) {
+ return;
+ }
+
list_free(view->executed_criteria);
for (int i = 0; i < view->marks->length; ++i) {
@@ -44,6 +50,8 @@ void view_destroy(struct sway_view *view) {
}
list_free(view->marks);
+ list_free(view->instructions);
+
wlr_texture_destroy(view->marks_focused);
wlr_texture_destroy(view->marks_focused_inactive);
wlr_texture_destroy(view->marks_unfocused);
@@ -119,29 +127,30 @@ const char *view_get_shell(struct sway_view *view) {
return "unknown";
}
-void view_configure(struct sway_view *view, double lx, double ly, int width,
+uint32_t view_configure(struct sway_view *view, double lx, double ly, int width,
int height) {
if (view->impl->configure) {
- view->impl->configure(view, lx, ly, width, height);
+ return view->impl->configure(view, lx, ly, width, height);
}
+ return 0;
}
-static void view_autoconfigure_floating(struct sway_view *view) {
+void view_init_floating(struct sway_view *view) {
struct sway_container *ws = container_parent(view->swayc, C_WORKSPACE);
int max_width = ws->width * 0.6666;
int max_height = ws->height * 0.6666;
- int width =
+ view->width =
view->natural_width > max_width ? max_width : view->natural_width;
- int height =
+ view->height =
view->natural_height > max_height ? max_height : view->natural_height;
- int lx = ws->x + (ws->width - width) / 2;
- int ly = ws->y + (ws->height - height) / 2;
+ view->x = ws->x + (ws->width - view->width) / 2;
+ view->y = ws->y + (ws->height - view->height) / 2;
// If the view's border is B_NONE then these properties are ignored.
view->border_top = view->border_bottom = true;
view->border_left = view->border_right = true;
- view_configure(view, lx, ly, width, height);
+ container_set_geometry_from_floating_view(view->swayc);
}
void view_autoconfigure(struct sway_view *view) {
@@ -153,12 +162,14 @@ void view_autoconfigure(struct sway_view *view) {
struct sway_container *output = container_parent(view->swayc, C_OUTPUT);
if (view->is_fullscreen) {
- view_configure(view, output->x, output->y, output->width, output->height);
+ view->x = output->x;
+ view->y = output->y;
+ view->width = output->width;
+ view->height = output->height;
return;
}
if (container_is_floating(view->swayc)) {
- view_autoconfigure_floating(view);
return;
}
@@ -178,20 +189,22 @@ void view_autoconfigure(struct sway_view *view) {
}
}
+ struct sway_container *con = view->swayc;
+
view->border_top = view->border_bottom = true;
view->border_left = view->border_right = true;
if (config->hide_edge_borders == E_BOTH
|| config->hide_edge_borders == E_VERTICAL
|| (config->hide_edge_borders == E_SMART && !other_views)) {
- view->border_left = view->swayc->x != ws->x;
- int right_x = view->swayc->x + view->swayc->width;
+ view->border_left = con->x != ws->x;
+ int right_x = con->x + con->width;
view->border_right = right_x != ws->x + ws->width;
}
if (config->hide_edge_borders == E_BOTH
|| config->hide_edge_borders == E_HORIZONTAL
|| (config->hide_edge_borders == E_SMART && !other_views)) {
- view->border_top = view->swayc->y != ws->y;
- int bottom_y = view->swayc->y + view->swayc->height;
+ view->border_top = con->y != ws->y;
+ int bottom_y = con->y + con->height;
view->border_bottom = bottom_y != ws->y + ws->height;
}
@@ -202,45 +215,44 @@ void view_autoconfigure(struct sway_view *view) {
// In a tabbed or stacked container, the swayc's y is the top of the title
// area. We have to offset the surface y by the height of the title bar, and
// disable any top border because we'll always have the title bar.
- if (view->swayc->parent->layout == L_TABBED) {
+ if (con->parent->layout == L_TABBED) {
y_offset = container_titlebar_height();
view->border_top = false;
- } else if (view->swayc->parent->layout == L_STACKED) {
- y_offset = container_titlebar_height()
- * view->swayc->parent->children->length;
+ } else if (con->parent->layout == L_STACKED) {
+ y_offset = container_titlebar_height() * con->parent->children->length;
view->border_top = false;
}
switch (view->border) {
case B_NONE:
- x = view->swayc->x;
- y = view->swayc->y + y_offset;
- width = view->swayc->width;
- height = view->swayc->height - y_offset;
+ x = con->x;
+ y = con->y + y_offset;
+ width = con->width;
+ height = con->height - y_offset;
break;
case B_PIXEL:
- x = view->swayc->x + view->border_thickness * view->border_left;
- y = view->swayc->y + view->border_thickness * view->border_top + y_offset;
- width = view->swayc->width
+ x = con->x + view->border_thickness * view->border_left;
+ y = con->y + view->border_thickness * view->border_top + y_offset;
+ width = con->width
- view->border_thickness * view->border_left
- view->border_thickness * view->border_right;
- height = view->swayc->height - y_offset
+ height = con->height - y_offset
- view->border_thickness * view->border_top
- view->border_thickness * view->border_bottom;
break;
case B_NORMAL:
// Height is: 1px border + 3px pad + title height + 3px pad + 1px border
- x = view->swayc->x + view->border_thickness * view->border_left;
- width = view->swayc->width
+ x = con->x + view->border_thickness * view->border_left;
+ width = con->width
- view->border_thickness * view->border_left
- view->border_thickness * view->border_right;
if (y_offset) {
- y = view->swayc->y + y_offset;
- height = view->swayc->height - y_offset
+ y = con->y + y_offset;
+ height = con->height - y_offset
- view->border_thickness * view->border_bottom;
} else {
- y = view->swayc->y + container_titlebar_height();
- height = view->swayc->height - container_titlebar_height()
+ y = con->y + container_titlebar_height();
+ height = con->height - container_titlebar_height()
- view->border_thickness * view->border_bottom;
}
break;
@@ -248,7 +260,8 @@ void view_autoconfigure(struct sway_view *view) {
view->x = x;
view->y = y;
- view_configure(view, x, y, width, height);
+ view->width = width;
+ view->height = height;
}
void view_set_activated(struct sway_view *view, bool activated) {
@@ -257,8 +270,7 @@ void view_set_activated(struct sway_view *view, bool activated) {
}
}
-// Set fullscreen, but without IPC events or arranging windows.
-void view_set_fullscreen_raw(struct sway_view *view, bool fullscreen) {
+void view_set_fullscreen(struct sway_view *view, bool fullscreen) {
if (view->is_fullscreen == fullscreen) {
return;
}
@@ -304,27 +316,17 @@ void view_set_fullscreen_raw(struct sway_view *view, bool fullscreen) {
} else {
workspace->sway_workspace->fullscreen = NULL;
if (container_is_floating(view->swayc)) {
- view_configure(view, view->saved_x, view->saved_y,
- view->saved_width, view->saved_height);
+ view->x = view->saved_x;
+ view->y = view->saved_y;
+ view->width = view->saved_width;
+ view->height = view->saved_height;
+ container_set_geometry_from_floating_view(view->swayc);
} else {
view->swayc->width = view->swayc->saved_width;
view->swayc->height = view->swayc->saved_height;
- view_autoconfigure(view);
}
}
-}
-void view_set_fullscreen(struct sway_view *view, bool fullscreen) {
- if (view->is_fullscreen == fullscreen) {
- return;
- }
-
- view_set_fullscreen_raw(view, fullscreen);
-
- struct sway_container *workspace =
- container_parent(view->swayc, C_WORKSPACE);
- arrange_workspace(workspace);
- output_damage_whole(workspace->parent->sway_output);
ipc_event_window(view->swayc, "fullscreen_mode");
}
@@ -507,8 +509,6 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface) {
if (view->impl->wants_floating && view->impl->wants_floating(view)) {
container_set_floating(view->swayc, true);
- } else {
- arrange_children_of(cont->parent);
}
input_manager_set_focus(input_manager, cont);
@@ -520,7 +520,6 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface) {
container_notify_subtree_changed(view->swayc->parent);
view_execute_criteria(view);
- container_damage_whole(cont);
view_handle_container_reparent(&view->container_reparent, NULL);
}
@@ -551,11 +550,7 @@ void view_unmap(struct sway_view *view) {
view->title_format = NULL;
}
- if (parent->type == C_OUTPUT) {
- arrange_output(parent);
- } else {
- arrange_children_of(parent);
- }
+ arrange_and_commit(parent);
}
void view_update_position(struct sway_view *view, double lx, double ly) {
diff --git a/sway/tree/workspace.c b/sway/tree/workspace.c
index 9ba210fd..ead752ad 100644
--- a/sway/tree/workspace.c
+++ b/sway/tree/workspace.c
@@ -425,7 +425,7 @@ bool workspace_switch(struct sway_container *workspace) {
}
seat_set_focus(seat, next);
struct sway_container *output = container_parent(workspace, C_OUTPUT);
- arrange_output(output);
+ arrange_and_commit(output);
return true;
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-31 13:21:40 +0000