diff options
author | Tony Crisci <tony@dubstepdish.com> | 2018-03-29 17:06:29 -0400 |
---|---|---|
committer | Tony Crisci <tony@dubstepdish.com> | 2018-03-29 17:06:29 -0400 |
commit | eca029f218fbb54ddf7316845be5d296e834358e (patch) | |
tree | 76bf346c980ad94c68797cefbd2ec4a9302dd53f /include | |
parent | rename container functions (diff) | |
download | sway-eca029f218fbb54ddf7316845be5d296e834358e.tar.gz sway-eca029f218fbb54ddf7316845be5d296e834358e.tar.zst sway-eca029f218fbb54ddf7316845be5d296e834358e.zip |
more renaming things
Diffstat (limited to 'include')
-rw-r--r-- | include/sway/tree/container.h | 21 | ||||
-rw-r--r-- | include/sway/tree/layout.h | 16 |
2 files changed, 17 insertions, 20 deletions
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h index 0dfed455..572dd8e3 100644 --- a/include/sway/tree/container.h +++ b/include/sway/tree/container.h | |||
@@ -88,41 +88,38 @@ struct sway_container { | |||
88 | }; | 88 | }; |
89 | 89 | ||
90 | // TODO only one container create function and pass the type? | 90 | // TODO only one container create function and pass the type? |
91 | struct sway_container *sway_container_output_create( | 91 | struct sway_container *container_output_create( |
92 | struct sway_output *sway_output); | 92 | struct sway_output *sway_output); |
93 | 93 | ||
94 | struct sway_container *sway_container_workspace_create( | 94 | struct sway_container *container_workspace_create( |
95 | struct sway_container *output, const char *name); | 95 | struct sway_container *output, const char *name); |
96 | 96 | ||
97 | struct sway_container *sway_container_view_create( | 97 | struct sway_container *container_view_create( |
98 | struct sway_container *sibling, struct sway_view *sway_view); | 98 | struct sway_container *sibling, struct sway_view *sway_view); |
99 | 99 | ||
100 | struct sway_container *sway_container_output_destroy( | 100 | struct sway_container *container_output_destroy( |
101 | struct sway_container *output); | 101 | struct sway_container *output); |
102 | 102 | ||
103 | struct sway_container *sway_container_view_destroy(struct sway_container *view); | 103 | struct sway_container *container_view_destroy(struct sway_container *view); |
104 | 104 | ||
105 | struct sway_container *sway_container_set_layout( | 105 | struct sway_container *container_set_layout( |
106 | struct sway_container *container, enum sway_container_layout layout); | 106 | struct sway_container *container, enum sway_container_layout layout); |
107 | 107 | ||
108 | void sway_container_descendents(struct sway_container *root, | 108 | void container_descendents(struct sway_container *root, |
109 | enum sway_container_type type, | 109 | enum sway_container_type type, |
110 | void (*func)(struct sway_container *item, void *data), void *data); | 110 | void (*func)(struct sway_container *item, void *data), void *data); |
111 | 111 | ||
112 | // XXX: what is this? | ||
113 | struct sway_container *next_view_sibling(struct sway_seat *seat); | ||
114 | |||
115 | /** | 112 | /** |
116 | * Finds a container based on test criteria. Returns the first container that | 113 | * Finds a container based on test criteria. Returns the first container that |
117 | * passes the test. | 114 | * passes the test. |
118 | */ | 115 | */ |
119 | struct sway_container *sway_container_find(struct sway_container *container, | 116 | struct sway_container *container_find(struct sway_container *container, |
120 | bool (*test)(struct sway_container *view, void *data), void *data); | 117 | bool (*test)(struct sway_container *view, void *data), void *data); |
121 | 118 | ||
122 | /** | 119 | /** |
123 | * Finds a parent container with the given struct sway_containerype. | 120 | * Finds a parent container with the given struct sway_containerype. |
124 | */ | 121 | */ |
125 | struct sway_container *sway_container_parent(struct sway_container *container, | 122 | struct sway_container *container_parent(struct sway_container *container, |
126 | enum sway_container_type type); | 123 | enum sway_container_type type); |
127 | 124 | ||
128 | /** | 125 | /** |
diff --git a/include/sway/tree/layout.h b/include/sway/tree/layout.h index f73b3880..6980ec9e 100644 --- a/include/sway/tree/layout.h +++ b/include/sway/tree/layout.h | |||
@@ -30,23 +30,23 @@ struct sway_root { | |||
30 | } events; | 30 | } events; |
31 | }; | 31 | }; |
32 | 32 | ||
33 | void init_layout(void); | 33 | void layout_init(void); |
34 | 34 | ||
35 | void add_child(struct sway_container *parent, struct sway_container *child); | 35 | void container_add_child(struct sway_container *parent, struct sway_container *child); |
36 | 36 | ||
37 | struct sway_container *add_sibling(struct sway_container *parent, | 37 | struct sway_container *container_add_sibling(struct sway_container *parent, |
38 | struct sway_container *child); | 38 | struct sway_container *child); |
39 | 39 | ||
40 | struct sway_container *remove_child(struct sway_container *child); | 40 | struct sway_container *container_remove_child(struct sway_container *child); |
41 | 41 | ||
42 | enum sway_container_layout default_layout(struct sway_container *output); | 42 | enum sway_container_layout container_get_default_layout(struct sway_container *output); |
43 | 43 | ||
44 | void sort_workspaces(struct sway_container *output); | 44 | void container_sort_workspaces(struct sway_container *output); |
45 | 45 | ||
46 | void arrange_windows(struct sway_container *container, | 46 | void container_arrange_windows(struct sway_container *container, |
47 | double width, double height); | 47 | double width, double height); |
48 | 48 | ||
49 | struct sway_container *get_swayc_in_direction(struct sway_container | 49 | struct sway_container *container_get_in_direction(struct sway_container |
50 | *container, struct sway_seat *seat, enum movement_direction dir); | 50 | *container, struct sway_seat *seat, enum movement_direction dir); |
51 | 51 | ||
52 | #endif | 52 | #endif |