From db4fb1c85c132e001fb1ae18f03f7585def1ae19 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Sun, 19 Nov 2017 17:04:28 -0500 Subject: [PATCH] Add outputs to the tree --- include/sway/container.h | 130 +++++++++++++++++++++++++++++++++++++++ include/sway/layout.h | 9 +++ include/sway/output.h | 2 + sway/CMakeLists.txt | 3 + sway/desktop/output.c | 4 +- sway/main.c | 5 +- sway/tree/container.c | 45 ++++++++++++++ sway/tree/layout.c | 35 +++++++++++ 8 files changed, 229 insertions(+), 4 deletions(-) create mode 100644 include/sway/container.h create mode 100644 include/sway/layout.h create mode 100644 sway/tree/container.c create mode 100644 sway/tree/layout.c diff --git a/include/sway/container.h b/include/sway/container.h new file mode 100644 index 000000000..35d1c146e --- /dev/null +++ b/include/sway/container.h @@ -0,0 +1,130 @@ +#ifndef _SWAY_CONTAINER_H +#define _SWAY_CONTAINER_H +#include +#include +#include +#include "list.h" + +typedef struct sway_container swayc_t; + +extern swayc_t root_container; + +struct sway_view; + +/** + * Different kinds of containers. + * + * This enum is in order. A container will never be inside of a container below + * it on this list. + */ +enum swayc_types { + C_ROOT, /**< The root container. Only one of these ever exists. */ + C_OUTPUT, /**< An output (aka monitor, head, etc). */ + C_WORKSPACE, /**< A workspace. */ + C_CONTAINER, /**< A manually created container. */ + C_VIEW, /**< A view (aka window). */ + + C_TYPES, +}; + +/** + * Different ways to arrange a container. + */ +enum swayc_layouts { + L_NONE, /**< Used for containers that have no layout (views, root) */ + L_HORIZ, + L_VERT, + L_STACKED, + L_TABBED, + L_FLOATING, /**< A psuedo-container, removed from the tree, to hold floating windows */ + + /* Awesome/Monad style auto layouts */ + L_AUTO_LEFT, + L_AUTO_RIGHT, + L_AUTO_TOP, + L_AUTO_BOTTOM, + + L_AUTO_FIRST = L_AUTO_LEFT, + L_AUTO_LAST = L_AUTO_BOTTOM, + + // Keep last + L_LAYOUTS, +}; + +enum swayc_border_types { + B_NONE, /**< No border */ + B_PIXEL, /**< 1px border */ + B_NORMAL, /**< Normal border with title bar */ +}; + +struct sway_output; +struct sway_view; +struct wlr_output_layout; + +/** + * Stores information about a container. + * + * The tree is made of these. Views are containers that cannot have children. + */ +struct sway_container { + union { + // TODO: Encapsulate state for other node types as well like C_CONTAINER + struct wlr_output_layout *output_layout; // C_ROOT + struct sway_output *sway_output; // C_OUTPUT + struct sway_view *sway_view; // C_VIEW + }; + + /** + * A unique ID to identify this container. Primarily used in the + * get_tree JSON output. + */ + size_t id; + + char *name; + + enum swayc_types type; + enum swayc_layouts layout; + enum swayc_layouts prev_layout; + enum swayc_layouts workspace_layout; + + /** + * The coordinates that this view appear at, relative to the output they + * are located on (output containers have absolute coordinates). + */ + double x, y; + + /** + * Width and height of this container, without borders or gaps. + */ + double width, height; + + list_t *children; + + /** + * The parent of this container. NULL for the root container. + */ + struct sway_container *parent; + /** + * Which of this container's children has focus. + */ + struct sway_container *focused; + + /** + * Number of master views in auto layouts. + */ + size_t nb_master; + + /** + * Number of slave groups (e.g. columns) in auto layouts. + */ + size_t nb_slave_groups; + + /** + * Marks applied to the container, list_t of char*. + */ + list_t *marks; +}; + +swayc_t *new_output(struct sway_output *sway_output); + +#endif diff --git a/include/sway/layout.h b/include/sway/layout.h new file mode 100644 index 000000000..7e7a9c354 --- /dev/null +++ b/include/sway/layout.h @@ -0,0 +1,9 @@ +#ifndef _SWAY_LAYOUT_H +#define _SWAY_LAYOUT_H + +struct sway_container; + +void init_layout(void); +void add_child(struct sway_container *parent, struct sway_container *child); + +#endif diff --git a/include/sway/output.h b/include/sway/output.h index ffc6708dc..e2f81bcbc 100644 --- a/include/sway/output.h +++ b/include/sway/output.h @@ -5,9 +5,11 @@ #include struct sway_server; +struct sway_container; struct sway_output { struct wlr_output *wlr_output; + struct sway_container *swayc; struct sway_server *server; struct timespec last_frame; struct wl_listener frame; diff --git a/sway/CMakeLists.txt b/sway/CMakeLists.txt index 73531a847..9a92466cd 100644 --- a/sway/CMakeLists.txt +++ b/sway/CMakeLists.txt @@ -14,6 +14,9 @@ add_executable(sway desktop/output.c desktop/xdg_shell_v6.c + tree/layout.c + tree/container.c + base64.c main.c server.c diff --git a/sway/desktop/output.c b/sway/desktop/output.c index 6ddcac3ba..27579c1b6 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c @@ -5,6 +5,7 @@ #include #include #include "log.h" +#include "sway/container.h" #include "sway/output.h" #include "sway/server.h" @@ -34,11 +35,10 @@ void output_add_notify(struct wl_listener *listener, void *data) { struct sway_output *output = calloc(1, sizeof(struct sway_output)); output->wlr_output = wlr_output; output->server = server; + output->swayc = new_output(output); output->frame.notify = output_frame_notify; wl_signal_add(&wlr_output->events.frame, &output->frame); - - // TODO: Add to tree } void output_remove_notify(struct wl_listener *listener, void *data) { diff --git a/sway/main.c b/sway/main.c index 5710a099a..42262b055 100644 --- a/sway/main.c +++ b/sway/main.c @@ -16,10 +16,11 @@ #include #endif #include "sway/server.h" +#include "sway/layout.h" #include "ipc-client.h" +#include "log.h" #include "readline.h" #include "stringop.h" -#include "log.h" #include "util.h" static bool terminate_request = false; @@ -436,7 +437,7 @@ int main(int argc, char **argv) { return 1; } - //init_layout(); + init_layout(); //ipc_init(); //if (validate) { diff --git a/sway/tree/container.c b/sway/tree/container.c new file mode 100644 index 000000000..54bcf4780 --- /dev/null +++ b/sway/tree/container.c @@ -0,0 +1,45 @@ +#define _POSIX_C_SOURCE 200809L +#include +#include +#include +#include "sway/container.h" +#include "sway/layout.h" +#include "sway/output.h" + +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; + swayc_t *c = calloc(1, sizeof(swayc_t)); + if (!c) { + return NULL; + } + c->id = next_id++; + 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(); + } + return c; +} + +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); + const char *name = sway_output->wlr_output->name; + + swayc_t *output = new_swayc(C_OUTPUT); + output->sway_output = sway_output; + output->name = name ? strdup(name) : NULL; + output->width = size.width; + output->height = size.width; + + add_child(&root_container, output); + + // TODO: Create workspace + + return output; +} diff --git a/sway/tree/layout.c b/sway/tree/layout.c new file mode 100644 index 000000000..06200bbf1 --- /dev/null +++ b/sway/tree/layout.c @@ -0,0 +1,35 @@ +#define _POSIX_C_SOURCE 200809L +#include +#include +#include +#include "sway/container.h" +#include "list.h" +#include "log.h" + +swayc_t root_container; + +void init_layout(void) { + root_container.id = 0; // normally assigned in new_swayc() + root_container.type = C_ROOT; + root_container.layout = L_NONE; + root_container.name = strdup("root"); + root_container.children = create_list(); + root_container.output_layout = wlr_output_layout_create(); +} + +void add_child(swayc_t *parent, swayc_t *child) { + sway_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); + list_add(parent->children, child); + child->parent = parent; + // set focus for this container + if (!parent->focused) { + parent->focused = child; + } + /* TODO WLR + 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); + } + */ +}