diff options
author | Drew DeVault <sir@cmpwn.com> | 2017-11-19 17:04:28 -0500 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2017-11-19 17:04:28 -0500 |
commit | db4fb1c85c132e001fb1ae18f03f7585def1ae19 (patch) | |
tree | 91da84c9476e6ec34c65f3f8923961fd893fa721 /sway/tree | |
parent | Move everything to sway/old/ (diff) | |
download | sway-db4fb1c85c132e001fb1ae18f03f7585def1ae19.tar.gz sway-db4fb1c85c132e001fb1ae18f03f7585def1ae19.tar.zst sway-db4fb1c85c132e001fb1ae18f03f7585def1ae19.zip |
Add outputs to the tree
Diffstat (limited to 'sway/tree')
-rw-r--r-- | sway/tree/container.c | 45 | ||||
-rw-r--r-- | sway/tree/layout.c | 35 |
2 files changed, 80 insertions, 0 deletions
diff --git a/sway/tree/container.c b/sway/tree/container.c new file mode 100644 index 00000000..54bcf478 --- /dev/null +++ b/sway/tree/container.c | |||
@@ -0,0 +1,45 @@ | |||
1 | #define _POSIX_C_SOURCE 200809L | ||
2 | #include <stdint.h> | ||
3 | #include <stdlib.h> | ||
4 | #include <string.h> | ||
5 | #include "sway/container.h" | ||
6 | #include "sway/layout.h" | ||
7 | #include "sway/output.h" | ||
8 | |||
9 | static swayc_t *new_swayc(enum swayc_types type) { | ||
10 | // next id starts at 1 because 0 is assigned to root_container in layout.c | ||
11 | static size_t next_id = 1; | ||
12 | swayc_t *c = calloc(1, sizeof(swayc_t)); | ||
13 | if (!c) { | ||
14 | return NULL; | ||
15 | } | ||
16 | c->id = next_id++; | ||
17 | c->layout = L_NONE; | ||
18 | c->workspace_layout = L_NONE; | ||
19 | c->type = type; | ||
20 | c->nb_master = 1; | ||
21 | c->nb_slave_groups = 1; | ||
22 | if (type != C_VIEW) { | ||
23 | c->children = create_list(); | ||
24 | } | ||
25 | return c; | ||
26 | } | ||
27 | |||
28 | swayc_t *new_output(struct sway_output *sway_output) { | ||
29 | struct wlr_box size; | ||
30 | wlr_output_effective_resolution(sway_output->wlr_output, | ||
31 | &size.width, &size.height); | ||
32 | const char *name = sway_output->wlr_output->name; | ||
33 | |||
34 | swayc_t *output = new_swayc(C_OUTPUT); | ||
35 | output->sway_output = sway_output; | ||
36 | output->name = name ? strdup(name) : NULL; | ||
37 | output->width = size.width; | ||
38 | output->height = size.width; | ||
39 | |||
40 | add_child(&root_container, output); | ||
41 | |||
42 | // TODO: Create workspace | ||
43 | |||
44 | return output; | ||
45 | } | ||
diff --git a/sway/tree/layout.c b/sway/tree/layout.c new file mode 100644 index 00000000..06200bbf --- /dev/null +++ b/sway/tree/layout.c | |||
@@ -0,0 +1,35 @@ | |||
1 | #define _POSIX_C_SOURCE 200809L | ||
2 | #include <stdbool.h> | ||
3 | #include <string.h> | ||
4 | #include <wlr/types/wlr_output_layout.h> | ||
5 | #include "sway/container.h" | ||
6 | #include "list.h" | ||
7 | #include "log.h" | ||
8 | |||
9 | swayc_t root_container; | ||
10 | |||
11 | void init_layout(void) { | ||
12 | root_container.id = 0; // normally assigned in new_swayc() | ||
13 | root_container.type = C_ROOT; | ||
14 | root_container.layout = L_NONE; | ||
15 | root_container.name = strdup("root"); | ||
16 | root_container.children = create_list(); | ||
17 | root_container.output_layout = wlr_output_layout_create(); | ||
18 | } | ||
19 | |||
20 | void add_child(swayc_t *parent, swayc_t *child) { | ||
21 | sway_log(L_DEBUG, "Adding %p (%d, %fx%f) to %p (%d, %fx%f)", | ||
22 | child, child->type, child->width, child->height, | ||
23 | parent, parent->type, parent->width, parent->height); | ||
24 | list_add(parent->children, child); | ||
25 | child->parent = parent; | ||
26 | // set focus for this container | ||
27 | if (!parent->focused) { | ||
28 | parent->focused = child; | ||
29 | } | ||
30 | /* TODO WLR | ||
31 | if (parent->type == C_WORKSPACE && child->type == C_VIEW && (parent->workspace_layout == L_TABBED || parent->workspace_layout == L_STACKED)) { | ||
32 | child = new_container(child, parent->workspace_layout); | ||
33 | } | ||
34 | */ | ||
35 | } | ||