summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/sway/output.h2
-rw-r--r--include/sway/tree/container.h3
-rw-r--r--include/util.h20
3 files changed, 1 insertions, 24 deletions
diff --git a/include/sway/output.h b/include/sway/output.h
index 22cb352a..5efe1660 100644
--- a/include/sway/output.h
+++ b/include/sway/output.h
@@ -62,7 +62,7 @@ void output_begin_destroy(struct sway_output *output);
62struct sway_output *output_from_wlr_output(struct wlr_output *output); 62struct sway_output *output_from_wlr_output(struct wlr_output *output);
63 63
64struct sway_output *output_get_in_direction(struct sway_output *reference, 64struct sway_output *output_get_in_direction(struct sway_output *reference,
65 enum movement_direction direction); 65 enum wlr_direction direction);
66 66
67void output_add_workspace(struct sway_output *output, 67void output_add_workspace(struct sway_output *output,
68 struct sway_workspace *workspace); 68 struct sway_workspace *workspace);
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index 920ef038..1dd23341 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -36,7 +36,6 @@ struct sway_output;
36struct sway_workspace; 36struct sway_workspace;
37struct sway_view; 37struct sway_view;
38 38
39enum movement_direction;
40enum wlr_direction; 39enum wlr_direction;
41 40
42struct sway_container_state { 41struct sway_container_state {
@@ -287,8 +286,6 @@ void container_detach(struct sway_container *child);
287void container_replace(struct sway_container *container, 286void container_replace(struct sway_container *container,
288 struct sway_container *replacement); 287 struct sway_container *replacement);
289 288
290bool sway_dir_to_wlr(enum movement_direction dir, enum wlr_direction *out);
291
292struct sway_container *container_split(struct sway_container *child, 289struct sway_container *container_split(struct sway_container *child,
293 enum sway_container_layout layout); 290 enum sway_container_layout layout);
294 291
diff --git a/include/util.h b/include/util.h
index 19d2e7cf..56ca2eb8 100644
--- a/include/util.h
+++ b/include/util.h
@@ -7,15 +7,6 @@
7#include <wlr/types/wlr_output_layout.h> 7#include <wlr/types/wlr_output_layout.h>
8#include <xkbcommon/xkbcommon.h> 8#include <xkbcommon/xkbcommon.h>
9 9
10enum movement_direction {
11 MOVE_LEFT,
12 MOVE_RIGHT,
13 MOVE_UP,
14 MOVE_DOWN,
15 MOVE_PARENT,
16 MOVE_CHILD,
17};
18
19/** 10/**
20 * Wrap i into the range [0, max[ 11 * Wrap i into the range [0, max[
21 */ 12 */
@@ -68,15 +59,4 @@ uint32_t parse_color(const char *color);
68 */ 59 */
69bool parse_boolean(const char *boolean, bool current); 60bool parse_boolean(const char *boolean, bool current);
70 61
71/**
72 * Given a path string, recurseively resolves any symlinks to their targets
73 * (which may be a file, directory) and returns the result.
74 * argument is returned. Caller must free the returned buffer.
75 * If an error occures, if the path does not exist or if the path corresponds
76 * to a dangling symlink, NULL is returned.
77 */
78char* resolve_path(const char* path);
79
80bool sway_dir_to_wlr(enum movement_direction dir, enum wlr_direction *out);
81
82#endif 62#endif