aboutsummaryrefslogtreecommitdiff
path: root/sway/tree
diff options
context:
space:
mode:
Diffstat (limited to 'sway/tree')
-rw-r--r--sway/tree/arrange.c30
-rw-r--r--sway/tree/container.c255
-rw-r--r--sway/tree/layout.c66
-rw-r--r--sway/tree/output.c73
-rw-r--r--sway/tree/root.c80
-rw-r--r--sway/tree/view.c120
-rw-r--r--sway/tree/workspace.c146
7 files changed, 466 insertions, 304 deletions
diff --git a/sway/tree/arrange.c b/sway/tree/arrange.c
index 494a8461..a4b058f3 100644
--- a/sway/tree/arrange.c
+++ b/sway/tree/arrange.c
@@ -144,9 +144,9 @@ static void apply_tabbed_or_stacked_layout(struct sway_container *parent) {
static void arrange_children_of(struct sway_container *parent);
-static void arrange_floating(struct sway_container *floating) {
- for (int i = 0; i < floating->children->length; ++i) {
- struct sway_container *floater = floating->children->items[i];
+static void arrange_floating(list_t *floating) {
+ for (int i = 0; i < floating->length; ++i) {
+ struct sway_container *floater = floating->items[i];
if (floater->type == C_VIEW) {
view_autoconfigure(floater->sway_view);
} else {
@@ -154,7 +154,6 @@ static void arrange_floating(struct sway_container *floating) {
}
container_set_dirty(floater);
}
- container_set_dirty(floating);
}
static void arrange_children_of(struct sway_container *parent) {
@@ -179,9 +178,6 @@ static void arrange_children_of(struct sway_container *parent) {
case L_NONE:
apply_horiz_layout(parent);
break;
- case L_FLOATING:
- arrange_floating(parent);
- break;
}
// Recurse into child containers
@@ -210,10 +206,30 @@ static void arrange_workspace(struct sway_container *workspace) {
wlr_log(WLR_DEBUG, "Usable area for ws: %dx%d@%d,%d",
area->width, area->height, area->x, area->y);
remove_gaps(workspace);
+
+ double prev_x = workspace->x;
+ double prev_y = workspace->y;
workspace->width = area->width;
workspace->height = area->height;
workspace->x = output->x + area->x;
workspace->y = output->y + area->y;
+
+ // Adjust any floating containers
+ double diff_x = workspace->x - prev_x;
+ double diff_y = workspace->y - prev_y;
+ for (int i = 0; i < workspace->sway_workspace->floating->length; ++i) {
+ struct sway_container *floater =
+ workspace->sway_workspace->floating->items[i];
+ container_floating_translate(floater, diff_x, diff_y);
+ double center_x = floater->x + floater->width / 2;
+ double center_y = floater->y + floater->height / 2;
+ struct wlr_box workspace_box;
+ container_get_box(workspace, &workspace_box);
+ if (!wlr_box_contains_point(&workspace_box, center_x, center_y)) {
+ container_floating_move_to_center(floater);
+ }
+ }
+
add_gaps(workspace);
container_set_dirty(workspace);
wlr_log(WLR_DEBUG, "Arranging workspace '%s' at %f, %f", workspace->name,
diff --git a/sway/tree/container.c b/sway/tree/container.c
index eb06edc2..a8c6e667 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -67,32 +67,11 @@ void container_update_textures_recursive(struct sway_container *con) {
}
if (con->type == C_WORKSPACE) {
- container_update_textures_recursive(con->sway_workspace->floating);
- }
- }
-}
-
-static void handle_reparent(struct wl_listener *listener,
- void *data) {
- struct sway_container *container =
- wl_container_of(listener, container, reparent);
- struct sway_container *old_parent = data;
-
- struct sway_container *old_output = old_parent;
- if (old_output != NULL && old_output->type != C_OUTPUT) {
- old_output = container_parent(old_output, C_OUTPUT);
- }
-
- struct sway_container *new_output = container->parent;
- if (new_output != NULL && new_output->type != C_OUTPUT) {
- new_output = container_parent(new_output, C_OUTPUT);
- }
-
- if (old_output && new_output) {
- float old_scale = old_output->sway_output->wlr_output->scale;
- float new_scale = new_output->sway_output->wlr_output->scale;
- if (old_scale != new_scale) {
- container_update_textures_recursive(container);
+ for (int i = 0; i < con->sway_workspace->floating->length; ++i) {
+ struct sway_container *floater =
+ con->sway_workspace->floating->items[i];
+ container_update_textures_recursive(floater);
+ }
}
}
}
@@ -113,12 +92,9 @@ struct sway_container *container_create(enum sway_container_type type) {
c->children = create_list();
c->current.children = create_list();
}
+ c->outputs = create_list();
wl_signal_init(&c->events.destroy);
- wl_signal_init(&c->events.reparent);
-
- wl_signal_add(&c->events.reparent, &c->reparent);
- c->reparent.notify = handle_reparent;
c->has_gaps = false;
c->gaps_inner = 0;
@@ -131,6 +107,7 @@ struct sway_container *container_create(enum sway_container_type type) {
static void container_workspace_free(struct sway_workspace *ws) {
list_foreach(ws->output_priority, free);
list_free(ws->output_priority);
+ list_free(ws->floating);
free(ws);
}
@@ -151,6 +128,7 @@ void container_free(struct sway_container *cont) {
wlr_texture_destroy(cont->title_urgent);
list_free(cont->children);
list_free(cont->current.children);
+ list_free(cont->outputs);
switch (cont->type) {
case C_ROOT:
@@ -222,18 +200,25 @@ static struct sway_container *container_workspace_destroy(
for (int i = 0; i < workspace->children->length; i++) {
container_move_to(workspace->children->items[i], new_workspace);
}
- struct sway_container *floating = workspace->sway_workspace->floating;
- for (int i = 0; i < floating->children->length; i++) {
- container_move_to(floating->children->items[i],
- new_workspace->sway_workspace->floating);
+ list_t *floating = workspace->sway_workspace->floating;
+ for (int i = 0; i < floating->length; i++) {
+ struct sway_container *floater = floating->items[i];
+ container_remove_child(floater);
+ workspace_add_floating(new_workspace, floater);
}
}
- container_destroy_noreaping(workspace->sway_workspace->floating);
-
return output;
}
+static void untrack_output(struct sway_container *con, void *data) {
+ struct sway_output *output = data;
+ int index = list_find(con->outputs, output);
+ if (index != -1) {
+ list_del(con->outputs, index);
+ }
+}
+
static struct sway_container *container_output_destroy(
struct sway_container *output) {
if (!sway_assert(output, "cannot destroy null output")) {
@@ -270,11 +255,13 @@ static struct sway_container *container_output_destroy(
container_destroy(workspace);
}
- container_sort_workspaces(new_output);
+ output_sort_workspaces(new_output);
}
}
}
+ root_for_each_container(untrack_output, output->sway_output);
+
wl_list_remove(&output->sway_output->mode.link);
wl_list_remove(&output->sway_output->transform.link);
wl_list_remove(&output->sway_output->scale.link);
@@ -339,10 +326,6 @@ static struct sway_container *container_destroy_noreaping(
}
bool container_reap_empty(struct sway_container *con) {
- if (con->layout == L_FLOATING) {
- // Don't reap the magical floating container that each workspace has
- return false;
- }
switch (con->type) {
case C_ROOT:
case C_OUTPUT:
@@ -432,8 +415,10 @@ struct sway_container *container_close(struct sway_container *con) {
if (con->type == C_VIEW) {
view_close(con->sway_view);
- } else {
- container_for_each_descendant(con, container_close_func, NULL);
+ } else if (con->type == C_CONTAINER) {
+ container_for_each_child(con, container_close_func, NULL);
+ } else if (con->type == C_WORKSPACE) {
+ workspace_for_each_container(con, container_close_func, NULL);
}
return parent;
@@ -465,23 +450,12 @@ struct sway_container *container_view_create(struct sway_container *sibling,
return swayc;
}
-void container_descendants(struct sway_container *root,
- enum sway_container_type type,
- void (*func)(struct sway_container *item, void *data), void *data) {
- if (!root->children || !root->children->length) {
- return;
- }
- for (int i = 0; i < root->children->length; ++i) {
- struct sway_container *item = root->children->items[i];
- if (item->type == type) {
- func(item, data);
- }
- container_descendants(item, type, func, data);
- }
-}
-
-struct sway_container *container_find(struct sway_container *container,
+struct sway_container *container_find_child(struct sway_container *container,
bool (*test)(struct sway_container *view, void *data), void *data) {
+ if (!sway_assert(container->type == C_CONTAINER ||
+ container->type == C_VIEW, "Expected a container or view")) {
+ return NULL;
+ }
if (!container->children) {
return NULL;
}
@@ -489,15 +463,11 @@ struct sway_container *container_find(struct sway_container *container,
struct sway_container *child = container->children->items[i];
if (test(child, data)) {
return child;
- } else {
- struct sway_container *res = container_find(child, test, data);
- if (res) {
- return res;
- }
}
- }
- if (container->type == C_WORKSPACE) {
- return container_find(container->sway_workspace->floating, test, data);
+ struct sway_container *res = container_find_child(child, test, data);
+ if (res) {
+ return res;
+ }
}
return NULL;
}
@@ -522,8 +492,8 @@ static void surface_at_view(struct sway_container *swayc, double lx, double ly,
return;
}
struct sway_view *sview = swayc->sway_view;
- double view_sx = lx - sview->x;
- double view_sy = ly - sview->y;
+ double view_sx = lx - sview->x + sview->geometry.x;
+ double view_sy = ly - sview->y + sview->geometry.y;
double _sx, _sy;
struct wlr_surface *_surface = NULL;
@@ -639,9 +609,8 @@ static struct sway_container *floating_container_at(double lx, double ly,
}
// Items at the end of the list are on top, so iterate the list in
// reverse.
- for (int k = ws->floating->children->length - 1; k >= 0; --k) {
- struct sway_container *floater =
- ws->floating->children->items[k];
+ for (int k = ws->floating->length - 1; k >= 0; --k) {
+ struct sway_container *floater = ws->floating->items[k];
struct wlr_box box = {
.x = floater->x,
.y = floater->y,
@@ -677,9 +646,6 @@ struct sway_container *tiling_container_at(
return container_at_tabbed(con, lx, ly, surface, sx, sy);
case L_STACKED:
return container_at_stacked(con, lx, ly, surface, sx, sy);
- case L_FLOATING:
- sway_assert(false, "Didn't expect to see floating here");
- return NULL;
case L_NONE:
return NULL;
}
@@ -743,26 +709,20 @@ struct sway_container *container_at(struct sway_container *workspace,
return NULL;
}
-void container_for_each_descendant(struct sway_container *container,
+void container_for_each_child(struct sway_container *container,
void (*f)(struct sway_container *container, void *data),
void *data) {
- if (!container) {
+ if (!sway_assert(container->type == C_CONTAINER ||
+ container->type == C_VIEW, "Expected a container or view")) {
return;
}
if (container->children) {
for (int i = 0; i < container->children->length; ++i) {
struct sway_container *child = container->children->items[i];
- container_for_each_descendant(child, f, data);
- }
- }
- if (container->type == C_WORKSPACE) {
- struct sway_container *floating = container->sway_workspace->floating;
- for (int i = 0; i < floating->children->length; ++i) {
- struct sway_container *child = floating->children->items[i];
- container_for_each_descendant(child, f, data);
+ f(child, data);
+ container_for_each_child(child, f, data);
}
}
- f(container, data);
}
bool container_has_ancestor(struct sway_container *descendant,
@@ -800,13 +760,24 @@ void container_damage_whole(struct sway_container *container) {
}
}
+/**
+ * Return the output which will be used for scale purposes.
+ * This is the most recently entered output.
+ */
+struct sway_output *container_get_effective_output(struct sway_container *con) {
+ if (con->outputs->length == 0) {
+ return NULL;
+ }
+ return con->outputs->items[con->outputs->length - 1];
+}
+
static void update_title_texture(struct sway_container *con,
struct wlr_texture **texture, struct border_colors *class) {
if (!sway_assert(con->type == C_CONTAINER || con->type == C_VIEW,
"Unexpected type %s", container_type_to_str(con->type))) {
return;
}
- struct sway_container *output = container_parent(con, C_OUTPUT);
+ struct sway_output *output = container_get_effective_output(con);
if (!output) {
return;
}
@@ -818,7 +789,7 @@ static void update_title_texture(struct sway_container *con,
return;
}
- double scale = output->sway_output->wlr_output->scale;
+ double scale = output->wlr_output->scale;
int width = 0;
int height = con->title_height * scale;
@@ -846,7 +817,7 @@ static void update_title_texture(struct sway_container *con,
unsigned char *data = cairo_image_surface_get_data(surface);
int stride = cairo_format_stride_for_width(CAIRO_FORMAT_ARGB32, width);
struct wlr_renderer *renderer = wlr_backend_get_renderer(
- output->sway_output->wlr_output->backend);
+ output->wlr_output->backend);
*texture = wlr_texture_from_pixels(
renderer, WL_SHM_FORMAT_ARGB8888, stride, width, height, data);
cairo_surface_destroy(surface);
@@ -899,9 +870,6 @@ static size_t get_tree_representation(struct sway_container *parent, char *buffe
case L_STACKED:
lenient_strcat(buffer, "S[");
break;
- case L_FLOATING:
- lenient_strcat(buffer, "F[");
- break;
case L_NONE:
lenient_strcat(buffer, "D[");
break;
@@ -1030,12 +998,13 @@ void container_set_floating(struct sway_container *container, bool enable) {
struct sway_container *workspace = container_parent(container, C_WORKSPACE);
if (enable) {
- container_remove_child(container);
- container_add_child(workspace->sway_workspace->floating, container);
+ struct sway_container *old_parent = container_remove_child(container);
+ workspace_add_floating(workspace, container);
container_init_floating(container);
if (container->type == C_VIEW) {
view_set_tiled(container->sway_view, false);
}
+ container_reap_empty(old_parent);
} else {
// Returning to tiled
if (container->scratchpad) {
@@ -1083,14 +1052,12 @@ void container_set_geometry_from_floating_view(struct sway_container *con) {
con->y = view->y - top;
con->width = view->width + border_width * 2;
con->height = top + view->height + border_width;
+ container_set_dirty(con);
}
bool container_is_floating(struct sway_container *container) {
- struct sway_container *workspace = container_parent(container, C_WORKSPACE);
- if (!workspace) {
- return false;
- }
- return container->parent == workspace->sway_workspace->floating;
+ return container->parent && container->parent->type == C_WORKSPACE &&
+ list_find(container->parent->sway_workspace->floating, container) != -1;
}
void container_get_box(struct sway_container *container, struct wlr_box *box) {
@@ -1170,7 +1137,7 @@ void container_floating_move_to(struct sway_container *con,
output_get_active_workspace(new_output->sway_output);
if (old_workspace != new_workspace) {
container_remove_child(con);
- container_add_child(new_workspace->sway_workspace->floating, con);
+ workspace_add_floating(new_workspace, con);
arrange_windows(old_workspace);
arrange_windows(new_workspace);
workspace_detect_urgent(old_workspace);
@@ -1197,13 +1164,12 @@ void container_set_dirty(struct sway_container *container) {
list_add(server.dirty_containers, container);
}
-static bool find_urgent_iterator(struct sway_container *con,
- void *data) {
+static bool find_urgent_iterator(struct sway_container *con, void *data) {
return con->type == C_VIEW && view_is_urgent(con->sway_view);
}
bool container_has_urgent_child(struct sway_container *container) {
- return container_find(container, find_urgent_iterator, NULL);
+ return container_find_child(container, find_urgent_iterator, NULL);
}
void container_end_mouse_operation(struct sway_container *container) {
@@ -1235,7 +1201,8 @@ void container_set_fullscreen(struct sway_container *container, bool enable) {
container_set_fullscreen(workspace->sway_workspace->fullscreen, false);
}
- container_for_each_descendant(container, set_fullscreen_iterator, &enable);
+ set_fullscreen_iterator(container, &enable);
+ container_for_each_child(container, set_fullscreen_iterator, &enable);
container->is_fullscreen = enable;
@@ -1284,14 +1251,10 @@ void container_set_fullscreen(struct sway_container *container, bool enable) {
}
bool container_is_floating_or_child(struct sway_container *container) {
- do {
- if (container->parent && container->parent->layout == L_FLOATING) {
- return true;
- }
+ while (container->parent && container->parent->type != C_WORKSPACE) {
container = container->parent;
- } while (container && container->type != C_WORKSPACE);
-
- return false;
+ }
+ return container_is_floating(container);
}
bool container_is_fullscreen_or_child(struct sway_container *container) {
@@ -1305,14 +1268,66 @@ bool container_is_fullscreen_or_child(struct sway_container *container) {
return false;
}
-struct sway_container *container_wrap_children(struct sway_container *parent) {
- struct sway_container *middle = container_create(C_CONTAINER);
- middle->layout = parent->layout;
- while (parent->children->length) {
- struct sway_container *child = parent->children->items[0];
- container_remove_child(child);
- container_add_child(middle, child);
+static void surface_send_enter_iterator(struct wlr_surface *surface,
+ int x, int y, void *data) {
+ struct wlr_output *wlr_output = data;
+ wlr_surface_send_enter(surface, wlr_output);
+}
+
+static void surface_send_leave_iterator(struct wlr_surface *surface,
+ int x, int y, void *data) {
+ struct wlr_output *wlr_output = data;
+ wlr_surface_send_leave(surface, wlr_output);
+}
+
+void container_discover_outputs(struct sway_container *con) {
+ if (!sway_assert(con->type == C_CONTAINER || con->type == C_VIEW,
+ "Expected a container or view")) {
+ return;
+ }
+ struct wlr_box con_box = {
+ .x = con->current.swayc_x,
+ .y = con->current.swayc_y,
+ .width = con->current.swayc_width,
+ .height = con->current.swayc_height,
+ };
+ struct sway_output *old_output = container_get_effective_output(con);
+
+ for (int i = 0; i < root_container.children->length; ++i) {
+ struct sway_container *output = root_container.children->items[i];
+ struct sway_output *sway_output = output->sway_output;
+ struct wlr_box output_box;
+ container_get_box(output, &output_box);
+ struct wlr_box intersection;
+ bool intersects =
+ wlr_box_intersection(&con_box, &output_box, &intersection);
+ int index = list_find(con->outputs, sway_output);
+
+ if (intersects && index == -1) {
+ // Send enter
+ wlr_log(WLR_DEBUG, "Con %p entered output %p", con, sway_output);
+ if (con->type == C_VIEW) {
+ view_for_each_surface(con->sway_view,
+ surface_send_enter_iterator, sway_output->wlr_output);
+ }
+ list_add(con->outputs, sway_output);
+ } else if (!intersects && index != -1) {
+ // Send leave
+ wlr_log(WLR_DEBUG, "Con %p left output %p", con, sway_output);
+ if (con->type == C_VIEW) {
+ view_for_each_surface(con->sway_view,
+ surface_send_leave_iterator, sway_output->wlr_output);
+ }
+ list_del(con->outputs, index);
+ }
+ }
+ struct sway_output *new_output = container_get_effective_output(con);
+ double old_scale = old_output ? old_output->wlr_output->scale : -1;
+ double new_scale = new_output ? new_output->wlr_output->scale : -1;
+ if (old_scale != new_scale) {
+ container_update_title_textures(con);
+ if (con->type == C_VIEW) {
+ view_update_marks_textures(con->sway_view);
+ }
}
- container_add_child(parent, middle);
- return middle;
}
diff --git a/sway/tree/layout.c b/sway/tree/layout.c
index 2b710403..a3de44ce 100644
--- a/sway/tree/layout.c
+++ b/sway/tree/layout.c
@@ -1,5 +1,4 @@
#define _POSIX_C_SOURCE 200809L
-#include <ctype.h>
#include <math.h>
#include <stdbool.h>
#include <stdlib.h>
@@ -76,7 +75,6 @@ void container_insert_child(struct sway_container *parent,
list_insert(parent->children, i, child);
child->parent = parent;
container_handle_fullscreen_reparent(child, old_parent);
- wl_signal_emit(&child->events.reparent, old_parent);
}
struct sway_container *container_add_sibling(struct sway_container *fixed,
@@ -92,7 +90,6 @@ struct sway_container *container_add_sibling(struct sway_container *fixed,
list_insert(parent->children, i + 1, active);
active->parent = parent;
container_handle_fullscreen_reparent(active, old_parent);
- wl_signal_emit(&active->events.reparent, old_parent);
return active->parent;
}
@@ -118,9 +115,11 @@ struct sway_container *container_remove_child(struct sway_container *child) {
}
struct sway_container *parent = child->parent;
- int index = index_child(child);
+ list_t *list = container_is_floating(child) ?
+ parent->sway_workspace->floating : parent->children;
+ int index = list_find(list, child);
if (index != -1) {
- list_del(parent->children, index);
+ list_del(list, index);
}
child->parent = NULL;
container_notify_subtree_changed(parent);
@@ -161,7 +160,8 @@ void container_move_to(struct sway_container *container,
struct sway_container *old_output =
container_parent(container, C_OUTPUT);
old_parent = container_remove_child(container);
- container_add_child(new_ws->sway_workspace->floating, container);
+ workspace_add_floating(new_ws, container);
+ container_handle_fullscreen_reparent(container, old_parent);
// If changing output, center it within the workspace
if (old_output != new_ws->parent && !container->is_fullscreen) {
container_floating_move_to_center(container);
@@ -179,8 +179,6 @@ void container_move_to(struct sway_container *container,
}
}
- wl_signal_emit(&container->events.reparent, old_parent);
-
if (container->type == C_VIEW) {
ipc_event_window(container, "move");
}
@@ -305,7 +303,6 @@ static void workspace_rejigger(struct sway_container *ws,
container_flatten(ws);
container_reap_empty_recursive(original_parent);
- wl_signal_emit(&child->events.reparent, original_parent);
container_create_notify(new_parent);
}
@@ -432,9 +429,6 @@ void container_move(struct sway_container *container,
if ((index == parent->children->length - 1 && offs > 0)
|| (index == 0 && offs < 0)) {
if (current->parent == container->parent) {
- if (parent->parent->layout == L_FLOATING) {
- return;
- }
if (!parent->is_fullscreen &&
(parent->layout == L_TABBED ||
parent->layout == L_STACKED)) {
@@ -458,14 +452,10 @@ void container_move(struct sway_container *container,
sibling = parent->children->items[index + offs];
wlr_log(WLR_DEBUG, "Selecting sibling id:%zd", sibling->id);
}
- } else if (!parent->is_fullscreen &&
- parent->parent->layout != L_FLOATING &&
- (parent->layout == L_TABBED ||
+ } else if (!parent->is_fullscreen && (parent->layout == L_TABBED ||
parent->layout == L_STACKED)) {
move_out_of_tabs_stacks(container, current, move_dir, offs);
return;
- } else if (parent->parent->layout == L_FLOATING) {
- return;
} else {
wlr_log(WLR_DEBUG, "Moving up to find a parallel container");
current = current->parent;
@@ -591,28 +581,6 @@ enum sway_container_layout container_get_default_layout(
}
}
-static int sort_workspace_cmp_qsort(const void *_a, const void *_b) {
- struct sway_container *a = *(void **)_a;
- struct sway_container *b = *(void **)_b;
- int retval = 0;
-
- if (isdigit(a->name[0]) && isdigit(b->name[0])) {
- int a_num = strtol(a->name, NULL, 10);
- int b_num = strtol(b->name, NULL, 10);
- retval = (a_num < b_num) ? -1 : (a_num > b_num);
- } else if (isdigit(a->name[0])) {
- retval = -1;
- } else if (isdigit(b->name[0])) {
- retval = 1;
- }
-
- return retval;
-}
-
-void container_sort_workspaces(struct sway_container *output) {
- list_stable_sort(output->children, sort_workspace_cmp_qsort);
-}
-
/**
* Get swayc in the direction of newly entered output.
*/
@@ -825,13 +793,15 @@ struct sway_container *container_replace_child(struct sway_container *child,
if (parent == NULL) {
return NULL;
}
- int i = index_child(child);
- // TODO floating
+ list_t *list = container_is_floating(child) ?
+ parent->sway_workspace->floating : parent->children;
+ int i = list_find(list, child);
+
if (new_child->parent) {
container_remove_child(new_child);
}
- parent->children->items[i] = new_child;
+ list->items[i] = new_child;
new_child->parent = parent;
child->parent = NULL;
@@ -884,7 +854,6 @@ struct sway_container *container_split(struct sway_container *child,
struct sway_container *ws_child = workspace->children->items[0];
container_remove_child(ws_child);
container_add_child(cont, ws_child);
- wl_signal_emit(&ws_child->events.reparent, workspace);
}
container_add_child(workspace, cont);
@@ -892,11 +861,9 @@ struct sway_container *container_split(struct sway_container *child,
workspace->layout = layout;
cont->layout = old_layout;
} else {
- struct sway_container *old_parent = child->parent;
cont->layout = layout;
container_replace_child(child, cont);
container_add_child(cont, child);
- wl_signal_emit(&child->events.reparent, old_parent);
}
if (set_focus) {
@@ -909,13 +876,13 @@ struct sway_container *container_split(struct sway_container *child,
}
void container_recursive_resize(struct sway_container *container,
- double amount, enum resize_edge edge) {
+ double amount, enum wlr_edges edge) {
bool layout_match = true;
wlr_log(WLR_DEBUG, "Resizing %p with amount: %f", container, amount);
- if (edge == RESIZE_EDGE_LEFT || edge == RESIZE_EDGE_RIGHT) {
+ if (edge == WLR_EDGE_LEFT || edge == WLR_EDGE_RIGHT) {
container->width += amount;
layout_match = container->layout == L_HORIZ;
- } else if (edge == RESIZE_EDGE_TOP || edge == RESIZE_EDGE_BOTTOM) {
+ } else if (edge == WLR_EDGE_TOP || edge == WLR_EDGE_BOTTOM) {
container->height += amount;
layout_match = container->layout == L_VERT;
}
@@ -996,7 +963,8 @@ void container_swap(struct sway_container *con1, struct sway_container *con2) {
"Cannot swap ancestor and descendant")) {
return;
}
- if (!sway_assert(con1->layout != L_FLOATING && con2->layout != L_FLOATING,
+ if (!sway_assert(!container_is_floating(con1)
+ && !container_is_floating(con2),
"Swapping with floating containers is not supported")) {
return;
}
diff --git a/sway/tree/output.c b/sway/tree/output.c
index 31e3bf9b..6da63064 100644
--- a/sway/tree/output.c
+++ b/sway/tree/output.c
@@ -1,4 +1,5 @@
#define _POSIX_C_SOURCE 200809L
+#include <ctype.h>
#include <string.h>
#include <strings.h>
#include "sway/ipc-server.h"
@@ -28,7 +29,7 @@ static void restore_workspaces(struct sway_container *output) {
}
}
- container_sort_workspaces(output);
+ output_sort_workspaces(output);
}
struct sway_container *output_create(
@@ -102,3 +103,73 @@ struct sway_container *output_create(
return output;
}
+void output_for_each_workspace(struct sway_container *output,
+ void (*f)(struct sway_container *con, void *data), void *data) {
+ if (!sway_assert(output->type == C_OUTPUT, "Expected an output")) {
+ return;
+ }
+ for (int i = 0; i < output->children->length; ++i) {
+ struct sway_container *workspace = output->children->items[i];
+ f(workspace, data);
+ }
+}
+
+void output_for_each_container(struct sway_container *output,
+ void (*f)(struct sway_container *con, void *data), void *data) {
+ if (!sway_assert(output->type == C_OUTPUT, "Expected an output")) {
+ return;
+ }
+ for (int i = 0; i < output->children->length; ++i) {
+ struct sway_container *workspace = output->children->items[i];
+ workspace_for_each_container(workspace, f, data);
+ }
+}
+
+struct sway_container *output_find_workspace(struct sway_container *output,
+ bool (*test)(struct sway_container *con, void *data), void *data) {
+ if (!sway_assert(output->type == C_OUTPUT, "Expected an output")) {
+ return NULL;
+ }
+ for (int i = 0; i < output->children->length; ++i) {
+ struct sway_container *workspace = output->children->items[i];
+ if (test(workspace, data)) {
+ return workspace;
+ }
+ }
+ return NULL;
+}
+
+struct sway_container *output_find_container(struct sway_container *output,
+ bool (*test)(struct sway_container *con, void *data), void *data) {
+ if (!sway_assert(output->type == C_OUTPUT, "Expected an output")) {
+ return NULL;
+ }
+ struct sway_container *result = NULL;
+ for (int i = 0; i < output->children->length; ++i) {
+ struct sway_container *workspace = output->children->items[i];
+ if ((result = workspace_find_container(workspace, test, data))) {
+ return result;
+ }
+ }
+ return NULL;
+}
+
+static int sort_workspace_cmp_qsort(const void *_a, const void *_b) {
+ struct sway_container *a = *(void **)_a;
+ struct sway_container *b = *(void **)_b;
+
+ if (isdigit(a->name[0]) && isdigit(b->name[0])) {
+ int a_num = strtol(a->name, NULL, 10);
+ int b_num = strtol(b->name, NULL, 10);
+ return (a_num < b_num) ? -1 : (a_num > b_num);
+ } else if (isdigit(a->name[0])) {
+ return -1;
+ } else if (isdigit(b->name[0])) {
+ return 1;
+ }
+ return 0;
+}
+
+void output_sort_workspaces(struct sway_container *output) {
+ list_stable_sort(output->children, sort_workspace_cmp_qsort);
+}
diff --git a/sway/tree/root.c b/sway/tree/root.c
index fc908cc1..c27ff2c3 100644
--- a/sway/tree/root.c
+++ b/sway/tree/root.c
@@ -105,7 +105,7 @@ void root_scratchpad_show(struct sway_container *con) {
if (con->parent) {
container_remove_child(con);
}
- container_add_child(ws->sway_workspace->floating, con);
+ workspace_add_floating(ws, con);
// Make sure the container's center point overlaps this workspace
double center_lx = con->x + con->width / 2;
@@ -256,3 +256,81 @@ void root_record_workspace_pid(pid_t pid) {
&pw->output_destroy);
wl_list_insert(&pid_workspaces, &pw->link);
}
+
+void root_for_each_workspace(void (*f)(struct sway_container *con, void *data),
+ void *data) {
+ for (int i = 0; i < root_container.children->length; ++i) {
+ struct sway_container *output = root_container.children->items[i];
+ output_for_each_workspace(output, f, data);
+ }
+}
+
+void root_for_each_container(void (*f)(struct sway_container *con, void *data),
+ void *data) {
+ for (int i = 0; i < root_container.children->length; ++i) {
+ struct sway_container *output = root_container.children->items[i];
+ output_for_each_container(output, f, data);
+ }
+
+ // Scratchpad
+ for (int i = 0; i < root_container.sway_root->scratchpad->length; ++i) {
+ struct sway_container *container =
+ root_container.sway_root->scratchpad->items[i];
+ // If the container has a parent then it's visible on a workspace
+ // and will have been iterated in the previous for loop. So we only
+ // iterate the hidden scratchpad containers here.
+ if (!container->parent) {
+ f(container, data);
+ container_for_each_child(container, f, data);
+ }
+ }
+}
+
+struct sway_container *root_find_output(
+ bool (*test)(struct sway_container *con, void *data), void *data) {
+ for (int i = 0; i < root_container.children->length; ++i) {
+ struct sway_container *output = root_container.children->items[i];
+ if (test(output, data)) {
+ return output;
+ }
+ }
+ return NULL;
+}
+
+struct sway_container *root_find_workspace(
+ bool (*test)(struct sway_container *con, void *data), void *data) {
+ struct sway_container *result = NULL;
+ for (int i = 0; i < root_container.children->length; ++i) {
+ struct sway_container *output = root_container.children->items[i];
+ if ((result = output_find_workspace(output, test, data))) {
+ return result;
+ }
+ }
+ return NULL;
+}
+
+struct sway_container *root_find_container(
+ bool (*test)(struct sway_container *con, void *data), void *data) {
+ struct sway_container *result = NULL;
+ for (int i = 0; i < root_container.children->length; ++i) {
+ struct sway_container *output = root_container.children->items[i];
+ if ((result = output_find_container(output, test, data))) {
+ return result;
+ }
+ }
+
+ // Scratchpad
+ for (int i = 0; i < root_container.sway_root->scratchpad->length; ++i) {
+ struct sway_container *container =
+ root_container.sway_root->scratchpad->items[i];
+ if (!container->parent) {
+ if (test(container, data)) {
+ return container;
+ }
+ if ((result = container_find_child(container, test, data))) {
+ return result;
+ }
+ }
+ }
+ return NULL;
+}
diff --git a/sway/tree/view.c b/sway/tree/view.c
index 950494d8..7bf7325a 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -236,7 +236,12 @@ void view_autoconfigure(struct sway_view *view) {
view->border_top = false;
}
- switch (view->border) {
+ enum sway_container_border border = view->border;
+ if (view->using_csd) {
+ border = B_NONE;
+ }
+
+ switch (border) {
case B_NONE:
x = con->x;
y = con->y + y_offset;
@@ -364,48 +369,6 @@ static void view_handle_surface_new_subsurface(struct wl_listener *listener,
view_subsurface_create(view, subsurface);
}
-static void surface_send_enter_iterator(struct wlr_surface *surface,
- int x, int y, void *data) {
- struct wlr_output *wlr_output = data;
- wlr_surface_send_enter(surface, wlr_output);
-}
-
-static void surface_send_leave_iterator(struct wlr_surface *surface,
- int x, int y, void *data) {
- struct wlr_output *wlr_output = data;
- wlr_surface_send_leave(surface, wlr_output);
-}
-
-static void view_handle_container_reparent(struct wl_listener *listener,
- void *data) {
- struct sway_view *view =
- wl_container_of(listener, view, container_reparent);
- struct sway_container *old_parent = data;
-
- struct sway_container *old_output = old_parent;
- if (old_output != NULL && old_output->type != C_OUTPUT) {
- old_output = container_parent(old_output, C_OUTPUT);
- }
-
- struct sway_container *new_output = view->swayc->parent;
- if (new_output != NULL && new_output->type != C_OUTPUT) {
- new_output = container_parent(new_output, C_OUTPUT);
- }
-
- if (old_output == new_output) {
- return;
- }
-
- if (old_output != NULL) {
- view_for_each_surface(view, surface_send_leave_iterator,
- old_output->sway_output->wlr_output);
- }
- if (new_output != NULL) {
- view_for_each_surface(view, surface_send_enter_iterator,
- new_output->sway_output->wlr_output);
- }
-}
-
static bool view_has_executed_criteria(struct sway_view *view,
struct criteria *criteria) {
for (int i = 0; i < view->executed_criteria->length; ++i) {
@@ -450,12 +413,22 @@ static struct sway_container *select_workspace(struct sway_view *view) {
// Check if there's any `assign` criteria for the view
list_t *criterias = criteria_for_view(view,
- CT_ASSIGN_WORKSPACE | CT_ASSIGN_OUTPUT);
+ CT_ASSIGN_WORKSPACE | CT_ASSIGN_WORKSPACE_NUMBER | CT_ASSIGN_OUTPUT);
struct sway_container *ws = NULL;
for (int i = 0; i < criterias->length; ++i) {
struct criteria *criteria = criterias->items[i];
- if (criteria->type == CT_ASSIGN_WORKSPACE) {
- ws = workspace_by_name(criteria->target);
+ if (criteria->type == CT_ASSIGN_OUTPUT) {
+ struct sway_container *output = output_by_name(criteria->target);
+ if (output) {
+ ws = seat_get_active_child(seat, output);
+ break;
+ }
+ } else {
+ // CT_ASSIGN_WORKSPACE(_NUMBER)
+ ws = criteria->type == CT_ASSIGN_WORKSPACE_NUMBER ?
+ workspace_by_number(criteria->target) :
+ workspace_by_name(criteria->target);
+
if (!ws) {
if (strcasecmp(criteria->target, "back_and_forth") == 0) {
if (prev_workspace_name) {
@@ -466,13 +439,6 @@ static struct sway_container *select_workspace(struct sway_view *view) {
}
}
break;
- } else {
- // CT_ASSIGN_OUTPUT
- struct sway_container *output = output_by_name(criteria->target);
- if (output) {
- ws = seat_get_active_child(seat, output);
- break;
- }
}
}
list_free(criterias);
@@ -528,7 +494,7 @@ static bool should_focus(struct sway_view *view) {
struct sway_container *parent = view->swayc->parent;
if (parent->type == C_WORKSPACE && prev_focus == parent) {
size_t num_children = parent->children->length +
- parent->sway_workspace->floating->children->length;
+ parent->sway_workspace->floating->length;
if (num_children == 1) {
return true;
}
@@ -554,7 +520,7 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface) {
// If we're about to launch the view into the floating container, then
// launch it as a tiled view in the root of the workspace instead.
if (container_is_floating(target_sibling)) {
- target_sibling = target_sibling->parent->parent;
+ target_sibling = target_sibling->parent;
}
view->swayc = container_view_create(target_sibling, view);
@@ -564,9 +530,6 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface) {
&view->surface_new_subsurface);
view->surface_new_subsurface.notify = view_handle_surface_new_subsurface;
- wl_signal_add(&view->swayc->events.reparent, &view->container_reparent);
- view->container_reparent.notify = view_handle_container_reparent;
-
if (view->impl->wants_floating && view->impl->wants_floating(view)) {
view->border = config->floating_border;
view->border_thickness = config->floating_border_thickness;
@@ -584,15 +547,12 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface) {
view_update_title(view, false);
container_notify_subtree_changed(view->swayc->parent);
view_execute_criteria(view);
-
- view_handle_container_reparent(&view->container_reparent, NULL);
}
void view_unmap(struct sway_view *view) {
wl_signal_emit(&view->events.unmap, view);
wl_list_remove(&view->surface_new_subsurface.link);
- wl_list_remove(&view->container_reparent.link);
if (view->urgent_timer) {
wl_event_source_remove(view->urgent_timer);
@@ -615,34 +575,16 @@ void view_unmap(struct sway_view *view) {
view->surface = NULL;
}
-void view_update_position(struct sway_view *view, double lx, double ly) {
- if (view->x == lx && view->y == ly) {
- return;
- }
- container_damage_whole(view->swayc);
- view->x = lx;
- view->y = ly;
- view->swayc->current.view_x = lx;
- view->swayc->current.view_y = ly;
- if (container_is_floating(view->swayc)) {
- container_set_geometry_from_floating_view(view->swayc);
- }
- container_damage_whole(view->swayc);
-}
-
void view_update_size(struct sway_view *view, int width, int height) {
- if (view->width == width && view->height == height) {
+ if (!sway_assert(container_is_floating(view->swayc),
+ "Expected a floating container")) {
return;
}
- container_damage_whole(view->swayc);
view->width = width;
view->height = height;
view->swayc->current.view_width = width;
view->swayc->current.view_height = height;
- if (container_is_floating(view->swayc)) {
- container_set_geometry_from_floating_view(view->swayc);
- }
- container_damage_whole(view->swayc);
+ container_set_geometry_from_floating_view(view->swayc);
}
static void view_subsurface_create(struct sway_view *view,
@@ -899,8 +841,8 @@ static bool find_by_mark_iterator(struct sway_container *con,
}
struct sway_view *view_find_mark(char *mark) {
- struct sway_container *container = container_find(&root_container,
- find_by_mark_iterator, mark);
+ struct sway_container *container = root_find_container(
+ find_by_mark_iterator, mark);
if (!container) {
return NULL;
}
@@ -908,7 +850,7 @@ struct sway_view *view_find_mark(char *mark) {
}
bool view_find_and_unmark(char *mark) {
- struct sway_container *container = container_find(&root_container,
+ struct sway_container *container = root_find_container(
find_by_mark_iterator, mark);
if (!container) {
return false;
@@ -952,7 +894,7 @@ void view_add_mark(struct sway_view *view, char *mark) {
static void update_marks_texture(struct sway_view *view,
struct wlr_texture **texture, struct border_colors *class) {
- struct sway_container *output = container_parent(view->swayc, C_OUTPUT);
+ struct sway_output *output = container_get_effective_output(view->swayc);
if (!output) {
return;
}
@@ -988,7 +930,7 @@ static void update_marks_texture(struct sway_view *view,
}
free(part);
- double scale = output->sway_output->wlr_output->scale;
+ double scale = output->wlr_output->scale;
int width = 0;
int height = view->swayc->title_height * scale;
@@ -1014,7 +956,7 @@ static void update_marks_texture(struct sway_view *view,
unsigned char *data = cairo_image_surface_get_data(surface);
int stride = cairo_format_stride_for_width(CAIRO_FORMAT_ARGB32, width);
struct wlr_renderer *renderer = wlr_backend_get_renderer(
- output->sway_output->wlr_output->backend);
+ output->wlr_output->backend);
*texture = wlr_texture_from_pixels(
renderer, WL_SHM_FORMAT_ARGB8888, stride, width, height, data);
cairo_surface_destroy(surface);
@@ -1061,7 +1003,7 @@ bool view_is_visible(struct sway_view *view) {
// Check view isn't in a tabbed or stacked container on an inactive tab
struct sway_seat *seat = input_manager_current_seat(input_manager);
struct sway_container *container = view->swayc;
- while (container->type != C_WORKSPACE && container->layout != L_FLOATING) {
+ while (container->type != C_WORKSPACE) {
if (container->parent->layout == L_TABBED ||
container->parent->layout == L_STACKED) {
if (seat_get_active_child(seat, container->parent) != container) {
diff --git a/sway/tree/workspace.c b/sway/tree/workspace.c
index cd2a7a04..cf50ee09 100644
--- a/sway/tree/workspace.c
+++ b/sway/tree/workspace.c
@@ -67,26 +67,19 @@ struct sway_container *workspace_create(struct sway_container *output,
return NULL;
}
swayws->swayc = workspace;
- swayws->floating = container_create(C_CONTAINER);
- swayws->floating->parent = swayws->swayc;
- swayws->floating->layout = L_FLOATING;
+ swayws->floating = create_list();
swayws->output_priority = create_list();
workspace->sway_workspace = swayws;
workspace_output_add_priority(workspace, output);
container_add_child(output, workspace);
- container_sort_workspaces(output);
+ output_sort_workspaces(output);
container_create_notify(workspace);
return workspace;
}
char *prev_workspace_name = NULL;
-struct workspace_by_number_data {
- int len;
- const char *cset;
- const char *name;
-};
void next_name_map(struct sway_container *ws, void *data) {
int *count = data;
@@ -154,7 +147,7 @@ static void workspace_name_from_binding(const struct sway_binding * binding,
wlr_log(WLR_DEBUG, "Isolated name from workspace number: '%s'", _target);
// Make sure the workspace number doesn't already exist
- if (workspace_by_number(_target)) {
+ if (isdigit(_target[0]) && workspace_by_number(_target)) {
free(_target);
free(dup);
return;
@@ -212,6 +205,7 @@ char *workspace_next_name(const char *output_name) {
&& workspace_by_name(wso->workspace) == NULL) {
free(target);
target = strdup(wso->workspace);
+ break;
}
}
if (target != NULL) {
@@ -233,19 +227,18 @@ static bool _workspace_by_number(struct sway_container *view, void *data) {
if (view->type != C_WORKSPACE) {
return false;
}
- struct workspace_by_number_data *wbnd = data;
- int a = strspn(view->name, wbnd->cset);
- return a == wbnd->len && strncmp(view->name, wbnd->name, a) == 0;
+ char *name = data;
+ char *view_name = view->name;
+ while (isdigit(*name)) {
+ if (*name++ != *view_name++) {
+ return false;
+ }
+ }
+ return !isdigit(*view_name);
}
struct sway_container *workspace_by_number(const char* name) {
- struct workspace_by_number_data wbnd = {0, "1234567890", name};
- wbnd.len = strspn(name, wbnd.cset);
- if (wbnd.len <= 0) {
- return NULL;
- }
- return container_find(&root_container,
- _workspace_by_number, (void *) &wbnd);
+ return root_find_workspace(_workspace_by_number, (void *) name);
}
static bool _workspace_by_name(struct sway_container *view, void *data) {
@@ -258,7 +251,8 @@ struct sway_container *workspace_by_name(const char *name) {
struct sway_container *current_workspace = NULL, *current_output = NULL;
struct sway_container *focus = seat_get_focus(seat);
if (focus) {
- current_workspace = container_parent(focus, C_WORKSPACE);
+ current_workspace = focus->type == C_WORKSPACE ?
+ focus : container_parent(focus, C_WORKSPACE);
current_output = container_parent(focus, C_OUTPUT);
}
@@ -273,11 +267,11 @@ struct sway_container *workspace_by_name(const char *name) {
} else if (strcmp(name, "current") == 0) {
return current_workspace;
} else if (strcasecmp(name, "back_and_forth") == 0) {
- return prev_workspace_name ? container_find(&root_container,
- _workspace_by_name, (void *)prev_workspace_name) : NULL;
+ return prev_workspace_name ?
+ root_find_workspace(_workspace_by_name, (void*)prev_workspace_name)
+ : NULL;
} else {
- return container_find(&root_container, _workspace_by_name,
- (void *)name);
+ return root_find_workspace(_workspace_by_name, (void*)name);
}
}
@@ -397,17 +391,15 @@ bool workspace_switch(struct sway_container *workspace,
struct sway_container *next_output = workspace->parent;
struct sway_container *next_output_prev_ws =
seat_get_active_child(seat, next_output);
- struct sway_container *floating =
- next_output_prev_ws->sway_workspace->floating;
+ list_t *floating = next_output_prev_ws->sway_workspace->floating;
bool has_sticky = false;
if (workspace != next_output_prev_ws) {
- for (int i = 0; i < floating->children->length; ++i) {
- struct sway_container *floater = floating->children->items[i];
+ for (int i = 0; i < floating->length; ++i) {
+ struct sway_container *floater = floating->items[i];
if (floater->is_sticky) {
has_sticky = true;
container_remove_child(floater);
- container_add_child(workspace->sway_workspace->floating,
- floater);
+ workspace_add_floating(workspace, floater);
if (floater == focus) {
seat_set_focus(seat, NULL);
seat_set_focus(seat, floater);
@@ -460,9 +452,9 @@ bool workspace_is_empty(struct sway_container *ws) {
return false;
}
// Sticky views are not considered to be part of this workspace
- struct sway_container *floating = ws->sway_workspace->floating;
- for (int i = 0; i < floating->children->length; ++i) {
- struct sway_container *floater = floating->children->items[i];
+ list_t *floating = ws->sway_workspace->floating;
+ for (int i = 0; i < floating->length; ++i) {
+ struct sway_container *floater = floating->items[i];
if (!floater->is_sticky) {
return false;
}
@@ -517,8 +509,7 @@ struct sway_container *workspace_output_get_highest_available(
continue;
}
- struct sway_container *output = container_find(&root_container,
- _output_by_name, name);
+ struct sway_container *output = root_find_output(_output_by_name, name);
if (output) {
return output;
}
@@ -527,8 +518,13 @@ struct sway_container *workspace_output_get_highest_available(
return NULL;
}
+static bool find_urgent_iterator(struct sway_container *con, void *data) {
+ return con->type == C_VIEW && view_is_urgent(con->sway_view);
+}
+
void workspace_detect_urgent(struct sway_container *workspace) {
- bool new_urgent = container_has_urgent_child(workspace);
+ bool new_urgent = (bool)workspace_find_container(workspace,
+ find_urgent_iterator, NULL);
if (workspace->sway_workspace->urgent != new_urgent) {
workspace->sway_workspace->urgent = new_urgent;
@@ -536,3 +532,79 @@ void workspace_detect_urgent(struct sway_container *workspace) {
container_damage_whole(workspace);
}
}
+
+void workspace_for_each_container(struct sway_container *ws,
+ void (*f)(struct sway_container *con, void *data), void *data) {
+ if (!sway_assert(ws->type == C_WORKSPACE, "Expected a workspace")) {
+ return;
+ }
+ // Tiling
+ for (int i = 0; i < ws->children->length; ++i) {
+ struct sway_container *container = ws->children->items[i];
+ f(container, data);
+ container_for_each_child(container, f, data);
+ }
+ // Floating
+ for (int i = 0; i < ws->sway_workspace->floating->length; ++i) {
+ struct sway_container *container =
+ ws->sway_workspace->floating->items[i];
+ f(container, data);
+ container_for_each_child(container, f, data);
+ }
+}
+
+struct sway_container *workspace_find_container(struct sway_container *ws,
+ bool (*test)(struct sway_container *con, void *data), void *data) {
+ if (!sway_assert(ws->type == C_WORKSPACE, "Expected a workspace")) {
+ return NULL;
+ }
+ struct sway_container *result = NULL;
+ // Tiling
+ for (int i = 0; i < ws->children->length; ++i) {
+ struct sway_container *child = ws->children->items[i];
+ if (test(child, data)) {
+ return child;
+ }
+ if ((result = container_find_child(child, test, data))) {
+ return result;
+ }
+ }
+ // Floating
+ for (int i = 0; i < ws->sway_workspace->floating->length; ++i) {
+ struct sway_container *child = ws->sway_workspace->floating->items[i];
+ if (test(child, data)) {
+ return child;
+ }
+ if ((result = container_find_child(child, test, data))) {
+ return result;
+ }
+ }
+ return NULL;
+}
+
+struct sway_container *workspace_wrap_children(struct sway_container *ws) {
+ struct sway_container *middle = container_create(C_CONTAINER);
+ middle->layout = ws->layout;
+ while (ws->children->length) {
+ struct sway_container *child = ws->children->items[0];
+ container_remove_child(child);
+ container_add_child(middle, child);
+ }
+ container_add_child(ws, middle);
+ return middle;
+}
+
+void workspace_add_floating(struct sway_container *workspace,
+ struct sway_container *con) {
+ if (!sway_assert(workspace->type == C_WORKSPACE, "Expected a workspace")) {
+ return;
+ }
+ if (!sway_assert(con->parent == NULL, "Expected an orphan container")) {
+ return;
+ }
+
+ list_add(workspace->sway_workspace->floating, con);
+ con->parent = workspace;
+ container_set_dirty(workspace);
+ container_set_dirty(con);
+}