diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-10-30 23:27:49 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-10-30 23:27:49 +1000 |
commit | 7be309710dcd679e0b570bc2f076ac00ae9ad65d (patch) | |
tree | 66f53dddfcd94217beedf25272fe427a34ab665f /include | |
parent | Merge pull request #3020 from emersion/swaymsg-return-status (diff) | |
download | sway-7be309710dcd679e0b570bc2f076ac00ae9ad65d.tar.gz sway-7be309710dcd679e0b570bc2f076ac00ae9ad65d.tar.zst sway-7be309710dcd679e0b570bc2f076ac00ae9ad65d.zip |
Remove enum movement_direction
There's no point having both movement_direction and wlr_direction. This
replaces the former with the latter.
As movement_direction also contained MOVE_PARENT and MOVE_CHILD items,
these are now checked specifically in the focus command and handled in
separate functions, just like the other focus variants.
Diffstat (limited to 'include')
-rw-r--r-- | include/sway/output.h | 2 | ||||
-rw-r--r-- | include/sway/tree/container.h | 3 | ||||
-rw-r--r-- | include/util.h | 11 |
3 files changed, 1 insertions, 15 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); | |||
62 | struct sway_output *output_from_wlr_output(struct wlr_output *output); | 62 | struct sway_output *output_from_wlr_output(struct wlr_output *output); |
63 | 63 | ||
64 | struct sway_output *output_get_in_direction(struct sway_output *reference, | 64 | struct sway_output *output_get_in_direction(struct sway_output *reference, |
65 | enum movement_direction direction); | 65 | enum wlr_direction direction); |
66 | 66 | ||
67 | void output_add_workspace(struct sway_output *output, | 67 | void 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; | |||
36 | struct sway_workspace; | 36 | struct sway_workspace; |
37 | struct sway_view; | 37 | struct sway_view; |
38 | 38 | ||
39 | enum movement_direction; | ||
40 | enum wlr_direction; | 39 | enum wlr_direction; |
41 | 40 | ||
42 | struct sway_container_state { | 41 | struct sway_container_state { |
@@ -287,8 +286,6 @@ void container_detach(struct sway_container *child); | |||
287 | void container_replace(struct sway_container *container, | 286 | void container_replace(struct sway_container *container, |
288 | struct sway_container *replacement); | 287 | struct sway_container *replacement); |
289 | 288 | ||
290 | bool sway_dir_to_wlr(enum movement_direction dir, enum wlr_direction *out); | ||
291 | |||
292 | struct sway_container *container_split(struct sway_container *child, | 289 | struct 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..c39c92b1 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 | ||
10 | enum 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 | */ |
@@ -77,6 +68,4 @@ bool parse_boolean(const char *boolean, bool current); | |||
77 | */ | 68 | */ |
78 | char* resolve_path(const char* path); | 69 | char* resolve_path(const char* path); |
79 | 70 | ||
80 | bool sway_dir_to_wlr(enum movement_direction dir, enum wlr_direction *out); | ||
81 | |||
82 | #endif | 71 | #endif |