diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-04-17 09:31:34 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-04-17 09:31:34 +1000 |
commit | c685ef081f090d1e15428f55426e02f2274312d0 (patch) | |
tree | e4997c84099e962a0c00a8fea22be30964cecda3 /include | |
parent | Feedback for fullscreen. (diff) | |
download | sway-c685ef081f090d1e15428f55426e02f2274312d0.tar.gz sway-c685ef081f090d1e15428f55426e02f2274312d0.tar.zst sway-c685ef081f090d1e15428f55426e02f2274312d0.zip |
Create sway_workspace struct.
Diffstat (limited to 'include')
-rw-r--r-- | include/sway/tree/container.h | 5 | ||||
-rw-r--r-- | include/sway/tree/workspace.h | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h index 0283584b..6efda72f 100644 --- a/include/sway/tree/container.h +++ b/include/sway/tree/container.h | |||
@@ -45,6 +45,7 @@ enum sway_container_border { | |||
45 | 45 | ||
46 | struct sway_root; | 46 | struct sway_root; |
47 | struct sway_output; | 47 | struct sway_output; |
48 | struct sway_workspace; | ||
48 | struct sway_view; | 49 | struct sway_view; |
49 | 50 | ||
50 | struct sway_container { | 51 | struct sway_container { |
@@ -52,6 +53,7 @@ struct sway_container { | |||
52 | // TODO: Encapsulate state for other node types as well like C_CONTAINER | 53 | // TODO: Encapsulate state for other node types as well like C_CONTAINER |
53 | struct sway_root *sway_root; | 54 | struct sway_root *sway_root; |
54 | struct sway_output *sway_output; | 55 | struct sway_output *sway_output; |
56 | struct sway_workspace *sway_workspace; | ||
55 | struct sway_view *sway_view; | 57 | struct sway_view *sway_view; |
56 | }; | 58 | }; |
57 | 59 | ||
@@ -75,9 +77,6 @@ struct sway_container { | |||
75 | // does not include borders or gaps. | 77 | // does not include borders or gaps. |
76 | double width, height; | 78 | double width, height; |
77 | 79 | ||
78 | // For C_WORKSPACE only | ||
79 | struct sway_view *fullscreen; | ||
80 | |||
81 | list_t *children; | 80 | list_t *children; |
82 | 81 | ||
83 | struct sway_container *parent; | 82 | struct sway_container *parent; |
diff --git a/include/sway/tree/workspace.h b/include/sway/tree/workspace.h index 8d49fefb..35e1df3b 100644 --- a/include/sway/tree/workspace.h +++ b/include/sway/tree/workspace.h | |||
@@ -3,6 +3,13 @@ | |||
3 | 3 | ||
4 | #include "sway/tree/container.h" | 4 | #include "sway/tree/container.h" |
5 | 5 | ||
6 | struct sway_view; | ||
7 | |||
8 | struct sway_workspace { | ||
9 | struct sway_container *swayc; | ||
10 | struct sway_view *fullscreen; | ||
11 | }; | ||
12 | |||
6 | extern char *prev_workspace_name; | 13 | extern char *prev_workspace_name; |
7 | 14 | ||
8 | char *workspace_next_name(const char *output_name); | 15 | char *workspace_next_name(const char *output_name); |