aboutsummaryrefslogtreecommitdiff
path: root/sway/tree
diff options
context:
space:
mode:
Diffstat (limited to 'sway/tree')
-rw-r--r--sway/tree/container.c221
-rw-r--r--sway/tree/layout.c133
-rw-r--r--sway/tree/view.c7
-rw-r--r--sway/tree/workspace.c92
4 files changed, 216 insertions, 237 deletions
diff --git a/sway/tree/container.c b/sway/tree/container.c
index 40047dcf..bbafe9ec 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -7,14 +7,14 @@
#include <wlr/types/wlr_output_layout.h>
#include <wlr/types/wlr_wl_shell.h>
#include "sway/config.h"
-#include "sway/tree/container.h"
+#include "sway/container.h"
#include "sway/input/input-manager.h"
#include "sway/input/seat.h"
-#include "sway/tree/layout.h"
+#include "sway/layout.h"
#include "sway/output.h"
#include "sway/server.h"
-#include "sway/tree/view.h"
-#include "sway/tree/workspace.h"
+#include "sway/view.h"
+#include "sway/workspace.h"
#include "sway/ipc-server.h"
#include "log.h"
@@ -33,15 +33,48 @@ static list_t *get_bfs_queue() {
return bfs_queue;
}
-static void notify_new_container(struct sway_container *container) {
+static void notify_new_container(swayc_t *container) {
wl_signal_emit(&root_container.sway_root->events.new_container, container);
ipc_event_window(container, "new");
}
-static struct sway_container *container_create(enum sway_container_type type) {
+swayc_t *swayc_by_test(swayc_t *container,
+ bool (*test)(swayc_t *view, void *data), void *data) {
+ if (!container->children) {
+ return NULL;
+ }
+ // TODO: floating windows
+ for (int i = 0; i < container->children->length; ++i) {
+ swayc_t *child = container->children->items[i];
+ if (test(child, data)) {
+ return child;
+ } else {
+ swayc_t *res = swayc_by_test(child, test, data);
+ if (res) {
+ return res;
+ }
+ }
+ }
+ return NULL;
+}
+
+void swayc_descendants_of_type(swayc_t *root, enum swayc_types type,
+ void (*func)(swayc_t *item, void *data), void *data) {
+ for (int i = 0; i < root->children->length; ++i) {
+ swayc_t *item = root->children->items[i];
+ if (item->type == type) {
+ func(item, data);
+ }
+ if (item->children && item->children->length) {
+ swayc_descendants_of_type(item, type, func, data);
+ }
+ }
+}
+
+static swayc_t *new_swayc(enum swayc_types type) {
// next id starts at 1 because 0 is assigned to root_container in layout.c
static size_t next_id = 1;
- struct sway_container *c = calloc(1, sizeof(struct sway_container));
+ swayc_t *c = calloc(1, sizeof(swayc_t));
if (!c) {
return NULL;
}
@@ -49,6 +82,8 @@ static struct sway_container *container_create(enum sway_container_type type) {
c->layout = L_NONE;
c->workspace_layout = L_NONE;
c->type = type;
+ c->nb_master = 1;
+ c->nb_slave_groups = 1;
if (type != C_VIEW) {
c->children = create_list();
}
@@ -58,18 +93,18 @@ static struct sway_container *container_create(enum sway_container_type type) {
return c;
}
-static void container_destroy(struct sway_container *cont) {
- if (cont == NULL) {
+static void free_swayc(swayc_t *cont) {
+ if (!sway_assert(cont, "free_swayc passed NULL")) {
return;
}
wl_signal_emit(&cont->events.destroy, cont);
if (cont->children) {
- // remove children until there are no more, container_destroy calls
- // container_remove_child, which removes child from this container
+ // remove children until there are no more, free_swayc calls
+ // remove_child, which removes child from this container
while (cont->children->length) {
- container_destroy(cont->children->items[0]);
+ free_swayc(cont->children->items[0]);
}
list_free(cont->children);
}
@@ -78,7 +113,7 @@ static void container_destroy(struct sway_container *cont) {
list_free(cont->marks);
}
if (cont->parent) {
- container_remove_child(cont);
+ remove_child(cont);
}
if (cont->name) {
free(cont->name);
@@ -86,8 +121,7 @@ static void container_destroy(struct sway_container *cont) {
free(cont);
}
-struct sway_container *container_output_create(
- struct sway_output *sway_output) {
+swayc_t *new_output(struct sway_output *sway_output) {
struct wlr_box size;
wlr_output_effective_resolution(sway_output->wlr_output, &size.width,
&size.height);
@@ -122,22 +156,22 @@ struct sway_container *container_output_create(
return NULL;
}
- struct sway_container *output = container_create(C_OUTPUT);
+ swayc_t *output = new_swayc(C_OUTPUT);
output->sway_output = sway_output;
output->name = strdup(name);
if (output->name == NULL) {
- container_destroy(output);
+ free_swayc(output);
return NULL;
}
apply_output_config(oc, output);
- container_add_child(&root_container, output);
+ add_child(&root_container, output);
// Create workspace
char *ws_name = workspace_next_name(output->name);
wlr_log(L_DEBUG, "Creating default workspace %s", ws_name);
- struct sway_container *ws = container_workspace_create(output, ws_name);
+ swayc_t *ws = new_workspace(output, ws_name);
// Set each seat's focus if not already set
struct sway_seat *seat = NULL;
wl_list_for_each(seat, &input_manager->seats, link) {
@@ -151,14 +185,12 @@ struct sway_container *container_output_create(
return output;
}
-struct sway_container *container_workspace_create(
- struct sway_container *output, const char *name) {
- if (!sway_assert(output,
- "container_workspace_create called with null output")) {
+swayc_t *new_workspace(swayc_t *output, const char *name) {
+ if (!sway_assert(output, "new_workspace called with null output")) {
return NULL;
}
wlr_log(L_DEBUG, "Added workspace %s for output %s", name, output->name);
- struct sway_container *workspace = container_create(C_WORKSPACE);
+ swayc_t *workspace = new_swayc(C_WORKSPACE);
workspace->x = output->x;
workspace->y = output->y;
@@ -166,23 +198,21 @@ struct sway_container *container_workspace_create(
workspace->height = output->height;
workspace->name = !name ? NULL : strdup(name);
workspace->prev_layout = L_NONE;
- workspace->layout = container_get_default_layout(output);
- workspace->workspace_layout = container_get_default_layout(output);
+ workspace->layout = default_layout(output);
+ workspace->workspace_layout = default_layout(output);
- container_add_child(output, workspace);
- container_sort_workspaces(output);
+ add_child(output, workspace);
+ sort_workspaces(output);
notify_new_container(workspace);
return workspace;
}
-struct sway_container *container_view_create(struct sway_container *sibling,
- struct sway_view *sway_view) {
- if (!sway_assert(sibling,
- "container_view_create called with NULL sibling/parent")) {
+swayc_t *new_view(swayc_t *sibling, struct sway_view *sway_view) {
+ if (!sway_assert(sibling, "new_view called with NULL sibling/parent")) {
return NULL;
}
const char *title = view_get_title(sway_view);
- struct sway_container *swayc = container_create(C_VIEW);
+ swayc_t *swayc = new_swayc(C_VIEW);
wlr_log(L_DEBUG, "Adding new view %p:%s to container %p %d %s",
swayc, title, sibling, sibling ? sibling->type : 0, sibling->name);
// Setup values
@@ -193,18 +223,17 @@ struct sway_container *container_view_create(struct sway_container *sibling,
if (sibling->type == C_WORKSPACE) {
// Case of focused workspace, just create as child of it
- container_add_child(sibling, swayc);
+ add_child(sibling, swayc);
} else {
// Regular case, create as sibling of current container
- container_add_sibling(sibling, swayc);
+ add_sibling(sibling, swayc);
}
notify_new_container(swayc);
return swayc;
}
-struct sway_container *container_output_destroy(struct sway_container *output) {
- if (!sway_assert(output,
- "null output passed to container_output_destroy")) {
+swayc_t *destroy_output(swayc_t *output) {
+ if (!sway_assert(output, "null output passed to destroy_output")) {
return NULL;
}
@@ -216,13 +245,12 @@ struct sway_container *container_output_destroy(struct sway_container *output) {
int p = root_container.children->items[0] == output;
// Move workspace from this output to another output
while (output->children->length) {
- struct sway_container *child = output->children->items[0];
- container_remove_child(child);
- container_add_child(root_container.children->items[p], child);
+ swayc_t *child = output->children->items[0];
+ remove_child(child);
+ add_child(root_container.children->items[p], child);
}
- container_sort_workspaces(root_container.children->items[p]);
- arrange_windows(root_container.children->items[p],
- -1, -1);
+ sort_workspaces(root_container.children->items[p]);
+ arrange_windows(root_container.children->items[p], -1, -1);
}
}
@@ -231,18 +259,18 @@ struct sway_container *container_output_destroy(struct sway_container *output) {
wl_list_remove(&output->sway_output->mode.link);
wlr_log(L_DEBUG, "OUTPUT: Destroying output '%s'", output->name);
- container_destroy(output);
+ free_swayc(output);
return &root_container;
}
-struct sway_container *container_view_destroy(struct sway_container *view) {
+swayc_t *destroy_view(swayc_t *view) {
if (!view) {
return NULL;
}
wlr_log(L_DEBUG, "Destroying view '%s'", view->name);
- struct sway_container *parent = view->parent;
- container_destroy(view);
+ swayc_t *parent = view->parent;
+ free_swayc(view);
// TODO WLR: Destroy empty containers
/*
@@ -253,55 +281,7 @@ struct sway_container *container_view_destroy(struct sway_container *view) {
return parent;
}
-struct sway_container *container_set_layout(struct sway_container *container,
- enum sway_container_layout layout) {
- if (container->type == C_WORKSPACE) {
- container->workspace_layout = layout;
- if (layout == L_HORIZ || layout == L_VERT) {
- container->layout = layout;
- }
- } else {
- container->layout = layout;
- }
- return container;
-}
-
-void container_descendents(struct sway_container *root,
- enum sway_container_type type,
- void (*func)(struct sway_container *item, void *data), void *data) {
- for (int i = 0; i < root->children->length; ++i) {
- struct sway_container *item = root->children->items[i];
- if (item->type == type) {
- func(item, data);
- }
- if (item->children && item->children->length) {
- container_descendents(item, type, func, data);
- }
- }
-}
-
-struct sway_container *container_find(struct sway_container *container,
- bool (*test)(struct sway_container *view, void *data), void *data) {
- if (!container->children) {
- return NULL;
- }
- // TODO: floating windows
- for (int i = 0; i < container->children->length; ++i) {
- 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;
- }
- }
- }
- return NULL;
-}
-
-struct sway_container *container_parent(struct sway_container *container,
- enum sway_container_type type) {
+swayc_t *swayc_parent_by_type(swayc_t *container, enum swayc_types type) {
if (!sway_assert(container, "container is NULL")) {
return NULL;
}
@@ -314,8 +294,7 @@ struct sway_container *container_parent(struct sway_container *container,
return container;
}
-struct sway_container *container_at(struct sway_container *parent,
- double lx, double ly,
+swayc_t *swayc_at(swayc_t *parent, double lx, double ly,
struct wlr_surface **surface, double *sx, double *sy) {
list_t *queue = get_bfs_queue();
if (!queue) {
@@ -324,13 +303,13 @@ struct sway_container *container_at(struct sway_container *parent,
list_add(queue, parent);
- struct sway_container *swayc = NULL;
+ swayc_t *swayc = NULL;
while (queue->length) {
swayc = queue->items[0];
list_del(queue, 0);
if (swayc->type == C_VIEW) {
struct sway_view *sview = swayc->sway_view;
- struct sway_container *soutput = container_parent(swayc, C_OUTPUT);
+ swayc_t *soutput = swayc_parent_by_type(swayc, C_OUTPUT);
struct wlr_box *output_box =
wlr_output_layout_get_box(
root_container.sway_root->output_layout,
@@ -400,8 +379,30 @@ struct sway_container *container_at(struct sway_container *parent,
return NULL;
}
-void container_for_each_descendent(struct sway_container *con,
- void (*f)(struct sway_container *con, void *data), void *data) {
+void container_map(swayc_t *container, void (*f)(swayc_t *view, void *data), void *data) {
+ if (container) {
+ int i;
+ if (container->children) {
+ for (i = 0; i < container->children->length; ++i) {
+ swayc_t *child = container->children->items[i];
+ container_map(child, f, data);
+ }
+ }
+ // TODO
+ /*
+ if (container->floating) {
+ for (i = 0; i < container->floating->length; ++i) {
+ swayc_t *child = container->floating->items[i];
+ container_map(child, f, data);
+ }
+ }
+ */
+ f(container, data);
+ }
+}
+
+void container_for_each_bfs(swayc_t *con, void (*f)(swayc_t *con, void *data),
+ void *data) {
list_t *queue = get_bfs_queue();
if (!queue) {
return;
@@ -414,7 +415,7 @@ void container_for_each_descendent(struct sway_container *con,
list_add(queue, con);
- struct sway_container *current = NULL;
+ swayc_t *current = NULL;
while (queue->length) {
current = queue->items[0];
list_del(queue, 0);
@@ -423,3 +424,15 @@ void container_for_each_descendent(struct sway_container *con,
list_cat(queue, current->children);
}
}
+
+swayc_t *swayc_change_layout(swayc_t *container, enum swayc_layouts layout) {
+ if (container->type == C_WORKSPACE) {
+ container->workspace_layout = layout;
+ if (layout == L_HORIZ || layout == L_VERT) {
+ container->layout = layout;
+ }
+ } else {
+ container->layout = layout;
+ }
+ return container;
+}
diff --git a/sway/tree/layout.c b/sway/tree/layout.c
index dc0ee5b4..de9e7b58 100644
--- a/sway/tree/layout.c
+++ b/sway/tree/layout.c
@@ -6,26 +6,24 @@
#include <string.h>
#include <wlr/types/wlr_output.h>
#include <wlr/types/wlr_output_layout.h>
-#include "sway/tree/container.h"
-#include "sway/tree/layout.h"
+#include "sway/container.h"
+#include "sway/layout.h"
#include "sway/output.h"
-#include "sway/tree/view.h"
+#include "sway/view.h"
#include "sway/input/seat.h"
#include "list.h"
#include "log.h"
-struct sway_container root_container;
+swayc_t root_container;
-static void output_layout_change_notify(struct wl_listener *listener,
- void *data) {
+static void output_layout_change_notify(struct wl_listener *listener, void *data) {
struct wlr_box *layout_box = wlr_output_layout_get_box(
root_container.sway_root->output_layout, NULL);
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_container =
- root_container.children->items[i];
+ swayc_t *output_container = root_container.children->items[i];
if (output_container->type != C_OUTPUT) {
continue;
}
@@ -45,7 +43,7 @@ static void output_layout_change_notify(struct wl_listener *listener,
arrange_windows(&root_container, -1, -1);
}
-void layout_init(void) {
+void init_layout(void) {
root_container.id = 0; // normally assigned in new_swayc()
root_container.type = C_ROOT;
root_container.layout = L_NONE;
@@ -64,9 +62,9 @@ void layout_init(void) {
&root_container.sway_root->output_layout_change);
}
-static int index_child(const struct sway_container *child) {
+static int index_child(const swayc_t *child) {
// TODO handle floating
- struct sway_container *parent = child->parent;
+ swayc_t *parent = child->parent;
int i, len;
len = parent->children->length;
for (i = 0; i < len; ++i) {
@@ -81,18 +79,16 @@ static int index_child(const struct sway_container *child) {
return i;
}
-struct sway_container *container_add_sibling(struct sway_container *fixed,
- struct sway_container *active) {
+swayc_t *add_sibling(swayc_t *fixed, swayc_t *active) {
// TODO handle floating
- struct sway_container *parent = fixed->parent;
+ swayc_t *parent = fixed->parent;
int i = index_child(fixed);
list_insert(parent->children, i + 1, active);
active->parent = parent;
return active->parent;
}
-void container_add_child(struct sway_container *parent,
- struct sway_container *child) {
+void add_child(swayc_t *parent, swayc_t *child) {
wlr_log(L_DEBUG, "Adding %p (%d, %fx%f) to %p (%d, %fx%f)",
child, child->type, child->width, child->height,
parent, parent->type, parent->width, parent->height);
@@ -100,17 +96,15 @@ void container_add_child(struct sway_container *parent,
child->parent = parent;
// set focus for this container
/* TODO WLR
- if (parent->type == C_WORKSPACE && child->type == C_VIEW &&
- (parent->workspace_layout == L_TABBED || parent->workspace_layout ==
- L_STACKED)) {
+ if (parent->type == C_WORKSPACE && child->type == C_VIEW && (parent->workspace_layout == L_TABBED || parent->workspace_layout == L_STACKED)) {
child = new_container(child, parent->workspace_layout);
}
*/
}
-struct sway_container *container_remove_child(struct sway_container *child) {
+swayc_t *remove_child(swayc_t *child) {
int i;
- struct sway_container *parent = child->parent;
+ swayc_t *parent = child->parent;
for (i = 0; i < parent->children->length; ++i) {
if (parent->children->items[i] == child) {
list_del(parent->children, i);
@@ -121,8 +115,7 @@ struct sway_container *container_remove_child(struct sway_container *child) {
return parent;
}
-enum sway_container_layout container_get_default_layout(
- struct sway_container *output) {
+enum swayc_layouts default_layout(swayc_t *output) {
/* TODO WLR
if (config->default_layout != L_NONE) {
//return config->default_layout;
@@ -136,8 +129,8 @@ 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;
+ swayc_t *a = *(void **)_a;
+ swayc_t *b = *(void **)_b;
int retval = 0;
if (isdigit(a->name[0]) && isdigit(b->name[0])) {
@@ -153,22 +146,21 @@ static int sort_workspace_cmp_qsort(const void *_a, const void *_b) {
return retval;
}
-void container_sort_workspaces(struct sway_container *output) {
+void sort_workspaces(swayc_t *output) {
list_stable_sort(output->children, sort_workspace_cmp_qsort);
}
-static void apply_horiz_layout(struct sway_container *container, const double x,
+static void apply_horiz_layout(swayc_t *container, const double x,
const double y, const double width,
const double height, const int start,
const int end);
-static void apply_vert_layout(struct sway_container *container, const double x,
+static void apply_vert_layout(swayc_t *container, const double x,
const double y, const double width,
const double height, const int start,
const int end);
-void arrange_windows(struct sway_container *container,
- double width, double height) {
+void arrange_windows(swayc_t *container, double width, double height) {
int i;
if (width == -1 || height == -1) {
width = container->width;
@@ -189,7 +181,7 @@ void arrange_windows(struct sway_container *container,
case C_ROOT:
// TODO: wlr_output_layout probably
for (i = 0; i < container->children->length; ++i) {
- struct sway_container *output = container->children->items[i];
+ swayc_t *output = container->children->items[i];
wlr_log(L_DEBUG, "Arranging output '%s' at %f,%f",
output->name, output->x, output->y);
arrange_windows(output, -1, -1);
@@ -205,14 +197,13 @@ void arrange_windows(struct sway_container *container,
}
// arrange all workspaces:
for (i = 0; i < container->children->length; ++i) {
- struct sway_container *child = container->children->items[i];
+ swayc_t *child = container->children->items[i];
arrange_windows(child, -1, -1);
}
return;
case C_WORKSPACE:
{
- struct sway_container *output =
- container_parent(container, C_OUTPUT);
+ swayc_t *output = swayc_parent_by_type(container, C_OUTPUT);
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);
@@ -261,15 +252,14 @@ void arrange_windows(struct sway_container *container,
}
}
-static void apply_horiz_layout(struct sway_container *container,
+static void apply_horiz_layout(swayc_t *container,
const double x, const double y,
const double width, const double height,
const int start, const int end) {
double scale = 0;
// Calculate total width
for (int i = start; i < end; ++i) {
- double *old_width =
- &((struct sway_container *)container->children->items[i])->width;
+ double *old_width = &((swayc_t *)container->children->items[i])->width;
if (*old_width <= 0) {
if (end - start > 1) {
*old_width = width / (end - start - 1);
@@ -286,7 +276,7 @@ static void apply_horiz_layout(struct sway_container *container,
if (scale > 0.1) {
wlr_log(L_DEBUG, "Arranging %p horizontally", container);
for (int i = start; i < end; ++i) {
- struct sway_container *child = container->children->items[i];
+ swayc_t *child = container->children->items[i];
wlr_log(L_DEBUG,
"Calculating arrangement for %p:%d (will scale %f by %f)",
child, child->type, width, scale);
@@ -311,7 +301,7 @@ static void apply_horiz_layout(struct sway_container *container,
}
}
-void apply_vert_layout(struct sway_container *container,
+void apply_vert_layout(swayc_t *container,
const double x, const double y,
const double width, const double height, const int start,
const int end) {
@@ -319,8 +309,7 @@ void apply_vert_layout(struct sway_container *container,
double scale = 0;
// Calculate total height
for (i = start; i < end; ++i) {
- double *old_height =
- &((struct sway_container *)container->children->items[i])->height;
+ double *old_height = &((swayc_t *)container->children->items[i])->height;
if (*old_height <= 0) {
if (end - start > 1) {
*old_height = height / (end - start - 1);
@@ -337,7 +326,7 @@ void apply_vert_layout(struct sway_container *container,
if (scale > 0.1) {
wlr_log(L_DEBUG, "Arranging %p vertically", container);
for (i = start; i < end; ++i) {
- struct sway_container *child = container->children->items[i];
+ swayc_t *child = container->children->items[i];
wlr_log(L_DEBUG,
"Calculating arrangement for %p:%d (will scale %f by %f)",
child, child->type, height, scale);
@@ -365,16 +354,15 @@ void apply_vert_layout(struct sway_container *container,
/**
* Get swayc in the direction of newly entered output.
*/
-static struct sway_container *get_swayc_in_output_direction(
- struct sway_container *output, enum movement_direction dir,
- struct sway_seat *seat) {
+static swayc_t *get_swayc_in_output_direction(swayc_t *output,
+ enum movement_direction dir, struct sway_seat *seat) {
if (!output) {
return NULL;
}
- struct sway_container *ws = sway_seat_get_focus_inactive(seat, output);
+ swayc_t *ws = sway_seat_get_focus_inactive(seat, output);
if (ws->type != C_WORKSPACE) {
- ws = container_parent(ws, C_WORKSPACE);
+ ws = swayc_parent_by_type(ws, C_WORKSPACE);
}
if (ws == NULL) {
@@ -392,15 +380,13 @@ static struct sway_container *get_swayc_in_output_direction(
return ws->children->items[0];
case MOVE_UP:
case MOVE_DOWN: {
- struct sway_container *focused =
- sway_seat_get_focus_inactive(seat, ws);
+ swayc_t *focused = sway_seat_get_focus_inactive(seat, ws);
if (focused && focused->parent) {
- struct sway_container *parent = focused->parent;
+ swayc_t *parent = focused->parent;
if (parent->layout == L_VERT) {
if (dir == MOVE_UP) {
// get child furthest down on new output
- int idx = parent->children->length - 1;
- return parent->children->items[idx];
+ return parent->children->items[parent->children->length-1];
} else if (dir == MOVE_DOWN) {
// get child furthest up on new output
return parent->children->items[0];
@@ -418,14 +404,13 @@ static struct sway_container *get_swayc_in_output_direction(
return ws;
}
-static void get_layout_center_position(struct sway_container *container,
- int *x, int *y) {
+static void get_layout_center_position(swayc_t *container, int *x, int *y) {
// FIXME view coords are inconsistently referred to in layout/output systems
if (container->type == C_OUTPUT) {
*x = container->x + container->width/2;
*y = container->y + container->height/2;
} else {
- struct sway_container *output = container_parent(container, C_OUTPUT);
+ swayc_t *output = swayc_parent_by_type(container, C_OUTPUT);
if (container->type == C_WORKSPACE) {
// Workspace coordinates are actually wrong/arbitrary, but should
// be same as output.
@@ -438,8 +423,7 @@ static void get_layout_center_position(struct sway_container *container,
}
}
-static bool sway_dir_to_wlr(enum movement_direction dir,
- enum wlr_direction *out) {
+static bool sway_dir_to_wlr(enum movement_direction dir, enum wlr_direction *out) {
switch (dir) {
case MOVE_UP:
*out = WLR_DIRECTION_UP;
@@ -460,12 +444,12 @@ static bool sway_dir_to_wlr(enum movement_direction dir,
return true;
}
-static struct sway_container *sway_output_from_wlr(struct wlr_output *output) {
+static swayc_t *sway_output_from_wlr(struct wlr_output *output) {
if (output == NULL) {
return NULL;
}
for (int i = 0; i < root_container.children->length; ++i) {
- struct sway_container *o = root_container.children->items[i];
+ swayc_t *o = root_container.children->items[i];
if (o->type == C_OUTPUT && o->sway_output->wlr_output == output) {
return o;
}
@@ -473,14 +457,13 @@ static struct sway_container *sway_output_from_wlr(struct wlr_output *output) {
return NULL;
}
-static struct sway_container *get_swayc_in_direction_under(
- struct sway_container *container, enum movement_direction dir,
- struct sway_seat *seat, struct sway_container *limit) {
+static swayc_t *get_swayc_in_direction_under(swayc_t *container,
+ enum movement_direction dir, struct sway_seat *seat, swayc_t *limit) {
if (dir == MOVE_CHILD) {
return sway_seat_get_focus_inactive(seat, container);
}
- struct sway_container *parent = container->parent;
+ swayc_t *parent = container->parent;
if (dir == MOVE_PARENT) {
if (parent->type == C_OUTPUT) {
return NULL;
@@ -513,10 +496,9 @@ static struct sway_container *get_swayc_in_direction_under(
/*
if (container->type == C_VIEW && swayc_is_fullscreen(container)) {
wlr_log(L_DEBUG, "Moving from fullscreen view, skipping to output");
- container = container_parent(container, C_OUTPUT);
+ container = swayc_parent_by_type(container, C_OUTPUT);
get_layout_center_position(container, &abs_pos);
- struct sway_container *output =
- swayc_adjacent_output(container, dir, &abs_pos, true);
+ swayc_t *output = swayc_adjacent_output(container, dir, &abs_pos, true);
return get_swayc_in_output_direction(output, dir);
}
if (container->type == C_WORKSPACE && container->fullscreen) {
@@ -525,7 +507,7 @@ static struct sway_container *get_swayc_in_direction_under(
}
*/
- struct sway_container *wrap_candidate = NULL;
+ swayc_t *wrap_candidate = NULL;
while (true) {
// Test if we can even make a difference here
bool can_move = false;
@@ -539,19 +521,16 @@ static struct sway_container *get_swayc_in_direction_under(
}
int lx, ly;
get_layout_center_position(container, &lx, &ly);
- struct wlr_output_layout *layout =
- root_container.sway_root->output_layout;
+ struct wlr_output_layout *layout = root_container.sway_root->output_layout;
struct wlr_output *wlr_adjacent =
wlr_output_layout_adjacent_output(layout, wlr_dir,
container->sway_output->wlr_output, lx, ly);
- struct sway_container *adjacent =
- sway_output_from_wlr(wlr_adjacent);
+ swayc_t *adjacent = sway_output_from_wlr(wlr_adjacent);
if (!adjacent || adjacent == container) {
return wrap_candidate;
}
- struct sway_container *next =
- get_swayc_in_output_direction(adjacent, dir, seat);
+ swayc_t *next = get_swayc_in_output_direction(adjacent, dir, seat);
if (next == NULL) {
return NULL;
}
@@ -591,9 +570,8 @@ static struct sway_container *get_swayc_in_direction_under(
}
}
} else {
- wlr_log(L_DEBUG,
- "cont %d-%p dir %i sibling %d: %p", idx,
- container, dir, desired, parent->children->items[desired]);
+ wlr_log(L_DEBUG, "%s cont %d-%p dir %i sibling %d: %p", __func__,
+ idx, container, dir, desired, parent->children->items[desired]);
return parent->children->items[desired];
}
}
@@ -609,8 +587,7 @@ static struct sway_container *get_swayc_in_direction_under(
}
}
-struct sway_container *container_get_in_direction(
- struct sway_container *container, struct sway_seat *seat,
+swayc_t *get_swayc_in_direction(swayc_t *container, struct sway_seat *seat,
enum movement_direction dir) {
return get_swayc_in_direction_under(container, dir, seat, NULL);
}
diff --git a/sway/tree/view.c b/sway/tree/view.c
index d5325c31..9499adca 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -1,8 +1,8 @@
#include <wayland-server.h>
#include <wlr/types/wlr_output_layout.h>
-#include "sway/tree/container.h"
-#include "sway/tree/layout.h"
-#include "sway/tree/view.h"
+#include "sway/container.h"
+#include "sway/layout.h"
+#include "sway/view.h"
const char *view_get_title(struct sway_view *view) {
if (view->iface.get_prop) {
@@ -45,7 +45,6 @@ void view_set_size(struct sway_view *view, int width, int height) {
}
}
-// TODO make view coordinates in layout coordinates
void view_set_position(struct sway_view *view, double ox, double oy) {
if (view->iface.set_position) {
struct wlr_box box = {
diff --git a/sway/tree/workspace.c b/sway/tree/workspace.c
index ba04c55c..861fda4d 100644
--- a/sway/tree/workspace.c
+++ b/sway/tree/workspace.c
@@ -3,10 +3,10 @@
#include <stdlib.h>
#include <stdio.h>
#include <strings.h>
-#include "sway/tree/container.h"
+#include "sway/container.h"
#include "sway/input/input-manager.h"
#include "sway/input/seat.h"
-#include "sway/tree/workspace.h"
+#include "sway/workspace.h"
#include "log.h"
#include "util.h"
@@ -17,7 +17,7 @@ struct workspace_by_number_data {
const char *name;
};
-void next_name_map(struct sway_container *ws, void *data) {
+void next_name_map(swayc_t *ws, void *data) {
int *count = data;
++count;
}
@@ -37,7 +37,7 @@ char *workspace_next_name(const char *output_name) {
return name;
}
-static bool _workspace_by_number(struct sway_container *view, void *data) {
+static bool _workspace_by_number(swayc_t *view, void *data) {
if (view->type != C_WORKSPACE) {
return false;
}
@@ -46,28 +46,27 @@ static bool _workspace_by_number(struct sway_container *view, void *data) {
return a == wbnd->len && strncmp(view->name, wbnd->name, a) == 0;
}
-struct sway_container *workspace_by_number(const char* name) {
+swayc_t *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 swayc_by_test(&root_container, _workspace_by_number, (void *) &wbnd);
}
-static bool _workspace_by_name(struct sway_container *view, void *data) {
+static bool _workspace_by_name(swayc_t *view, void *data) {
return (view->type == C_WORKSPACE) &&
(strcasecmp(view->name, (char *) data) == 0);
}
-struct sway_container *workspace_by_name(const char *name) {
+swayc_t *workspace_by_name(const char *name) {
struct sway_seat *seat = input_manager_current_seat(input_manager);
- struct sway_container *current_workspace = NULL, *current_output = NULL;
- struct sway_container *focus = sway_seat_get_focus(seat);
+ swayc_t *current_workspace = NULL, *current_output = NULL;
+ swayc_t *focus = sway_seat_get_focus(seat);
if (focus) {
- current_workspace = container_parent(focus, C_WORKSPACE);
- current_output = container_parent(focus, C_OUTPUT);
+ current_workspace = swayc_parent_by_type(focus, C_WORKSPACE);
+ current_output = swayc_parent_by_type(focus, C_OUTPUT);
}
if (strcmp(name, "prev") == 0) {
return workspace_prev(current_workspace);
@@ -80,13 +79,12 @@ struct sway_container *workspace_by_name(const char *name) {
} else if (strcmp(name, "current") == 0) {
return current_workspace;
} else {
- return container_find(&root_container, _workspace_by_name,
- (void *)name);
+ return swayc_by_test(&root_container, _workspace_by_name, (void *) name);
}
}
-struct sway_container *workspace_create(const char *name) {
- struct sway_container *parent;
+swayc_t *workspace_create(const char *name) {
+ swayc_t *parent;
// Search for workspace<->output pair
int i, e = config->workspace_outputs->length;
for (i = 0; i < e; ++i) {
@@ -97,7 +95,7 @@ struct sway_container *workspace_create(const char *name) {
for (i = 0; i < e; ++i) {
parent = root_container.children->items[i];
if (strcmp(parent->name, wso->output) == 0) {
- return container_workspace_create(parent, name);
+ return new_workspace(parent, name);
}
}
break;
@@ -105,11 +103,10 @@ struct sway_container *workspace_create(const char *name) {
}
// Otherwise create a new one
struct sway_seat *seat = input_manager_current_seat(input_manager);
- struct sway_container *focus =
- sway_seat_get_focus_inactive(seat, &root_container);
+ swayc_t *focus = sway_seat_get_focus_inactive(seat, &root_container);
parent = focus;
- parent = container_parent(parent, C_OUTPUT);
- return container_workspace_create(parent, name);
+ parent = swayc_parent_by_type(parent, C_OUTPUT);
+ return new_workspace(parent, name);
}
/**
@@ -117,18 +114,17 @@ struct sway_container *workspace_create(const char *name) {
* the end and beginning. If next is false, the previous workspace is returned,
* otherwise the next one is returned.
*/
-struct sway_container *workspace_output_prev_next_impl(
- struct sway_container *output, bool next) {
+swayc_t *workspace_output_prev_next_impl(swayc_t *output, bool next) {
if (!sway_assert(output->type == C_OUTPUT,
"Argument must be an output, is %d", output->type)) {
return NULL;
}
struct sway_seat *seat = input_manager_current_seat(input_manager);
- struct sway_container *focus = sway_seat_get_focus_inactive(seat, output);
- struct sway_container *workspace = (focus->type == C_WORKSPACE ?
+ swayc_t *focus = sway_seat_get_focus_inactive(seat, output);
+ swayc_t *workspace = (focus->type == C_WORKSPACE ?
focus :
- container_parent(focus, C_WORKSPACE));
+ swayc_parent_by_type(focus, C_WORKSPACE));
int i;
for (i = 0; i < output->children->length; i++) {
@@ -138,8 +134,7 @@ struct sway_container *workspace_output_prev_next_impl(
}
}
- // Doesn't happen, at worst the for loop returns the previously active
- // workspace
+ // Doesn't happen, at worst the for loop returns the previously active workspace
return NULL;
}
@@ -149,14 +144,13 @@ struct sway_container *workspace_output_prev_next_impl(
* next is false, the previous workspace is returned, otherwise the next one is
* returned.
*/
-struct sway_container *workspace_prev_next_impl(
- struct sway_container *workspace, bool next) {
+swayc_t *workspace_prev_next_impl(swayc_t *workspace, bool next) {
if (!sway_assert(workspace->type == C_WORKSPACE,
"Argument must be a workspace, is %d", workspace->type)) {
return NULL;
}
- struct sway_container *current_output = workspace->parent;
+ swayc_t *current_output = workspace->parent;
int offset = next ? 1 : -1;
int start = next ? 0 : 1;
int end;
@@ -172,57 +166,54 @@ struct sway_container *workspace_prev_next_impl(
}
}
- // Given workspace is the first/last on the output, jump to the
- // previous/next output
+ // Given workspace is the first/last on the output, jump to the previous/next output
int num_outputs = root_container.children->length;
for (i = 0; i < num_outputs; i++) {
if (root_container.children->items[i] == current_output) {
- struct sway_container *next_output = root_container.children->items[
+ swayc_t *next_output = root_container.children->items[
wrap(i + offset, num_outputs)];
return workspace_output_prev_next_impl(next_output, next);
}
}
- // Doesn't happen, at worst the for loop returns the previously active
- // workspace on the active output
+ // Doesn't happen, at worst the for loop returns the previously active workspace on the active output
return NULL;
}
-struct sway_container *workspace_output_next(struct sway_container *current) {
+swayc_t *workspace_output_next(swayc_t *current) {
return workspace_output_prev_next_impl(current, true);
}
-struct sway_container *workspace_next(struct sway_container *current) {
+swayc_t *workspace_next(swayc_t *current) {
return workspace_prev_next_impl(current, true);
}
-struct sway_container *workspace_output_prev(struct sway_container *current) {
+swayc_t *workspace_output_prev(swayc_t *current) {
return workspace_output_prev_next_impl(current, false);
}
-struct sway_container *workspace_prev(struct sway_container *current) {
+swayc_t *workspace_prev(swayc_t *current) {
return workspace_prev_next_impl(current, false);
}
-bool workspace_switch(struct sway_container *workspace) {
+bool workspace_switch(swayc_t *workspace) {
if (!workspace) {
return false;
}
struct sway_seat *seat = input_manager_current_seat(input_manager);
- struct sway_container *focus =
- sway_seat_get_focus_inactive(seat, &root_container);
+ swayc_t *focus = sway_seat_get_focus_inactive(seat, &root_container);
if (!seat || !focus) {
return false;
}
- struct sway_container *active_ws = focus;
+ swayc_t *active_ws = focus;
if (active_ws->type != C_WORKSPACE) {
- container_parent(focus, C_WORKSPACE);
+ swayc_parent_by_type(focus, C_WORKSPACE);
}
if (config->auto_back_and_forth
&& active_ws == workspace
&& prev_workspace_name) {
- struct sway_container *new_ws = workspace_by_name(prev_workspace_name);
+ swayc_t *new_ws = workspace_by_name(prev_workspace_name);
workspace = new_ws ? new_ws : workspace_create(prev_workspace_name);
}
@@ -239,14 +230,13 @@ bool workspace_switch(struct sway_container *workspace) {
// TODO: Deal with sticky containers
- wlr_log(L_DEBUG, "Switching to workspace %p:%s",
- workspace, workspace->name);
- struct sway_container *next = sway_seat_get_focus_inactive(seat, workspace);
+ wlr_log(L_DEBUG, "Switching to workspace %p:%s", workspace, workspace->name);
+ swayc_t *next = sway_seat_get_focus_inactive(seat, workspace);
if (next == NULL) {
next = workspace;
}
sway_seat_set_focus(seat, next);
- struct sway_container *output = container_parent(workspace, C_OUTPUT);
+ swayc_t *output = swayc_parent_by_type(workspace, C_OUTPUT);
arrange_windows(output, -1, -1);
return true;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-15 07:20:33 +0000