diff options
author | Drew DeVault <sir@cmpwn.com> | 2015-11-16 15:57:02 -0500 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2015-11-16 15:57:02 -0500 |
commit | 6850174049b9b8ffc00aac7051d82b3489bcc948 (patch) | |
tree | bdac5630c32099785a6eade4dfa8ceb04a3c11dd /include | |
parent | Merge pull request #232 from sce/replace_output_config (diff) | |
parent | output: Support multiple adjacent outputs. (diff) | |
download | sway-6850174049b9b8ffc00aac7051d82b3489bcc948.tar.gz sway-6850174049b9b8ffc00aac7051d82b3489bcc948.tar.zst sway-6850174049b9b8ffc00aac7051d82b3489bcc948.zip |
Merge pull request #233 from sce/multiple_adjacent_outputs
output: Support multiple adjacent outputs.
Diffstat (limited to 'include')
-rw-r--r-- | include/container.h | 2 | ||||
-rw-r--r-- | include/output.h | 13 |
2 files changed, 12 insertions, 3 deletions
diff --git a/include/container.h b/include/container.h index 8c54ee24..cb18de49 100644 --- a/include/container.h +++ b/include/container.h | |||
@@ -63,7 +63,7 @@ struct sway_container { | |||
63 | 63 | ||
64 | /** | 64 | /** |
65 | * The coordinates that this view appear at, relative to the output they | 65 | * The coordinates that this view appear at, relative to the output they |
66 | * are located on. | 66 | * are located on (output containers have absolute coordinates). |
67 | */ | 67 | */ |
68 | double x, y; | 68 | double x, y; |
69 | 69 | ||
diff --git a/include/output.h b/include/output.h index 10ff0596..1307ead8 100644 --- a/include/output.h +++ b/include/output.h | |||
@@ -4,7 +4,16 @@ | |||
4 | #include "container.h" | 4 | #include "container.h" |
5 | #include "focus.h" | 5 | #include "focus.h" |
6 | 6 | ||
7 | swayc_t *output_by_name(const char* name); | 7 | // Position is absolute coordinates on the edge where the adjacent output |
8 | swayc_t *swayc_adjacent_output(swayc_t *output, enum movement_direction dir); | 8 | // should be searched for. |
9 | swayc_t *output_by_name(const char* name, const struct wlc_point *abs_pos); | ||
10 | swayc_t *swayc_adjacent_output(swayc_t *output, enum movement_direction dir, const struct wlc_point *abs_pos, bool pick_closest); | ||
11 | |||
12 | // Place absolute coordinates for given container into given wlc_point. | ||
13 | void get_absolute_position(swayc_t *container, struct wlc_point *point); | ||
14 | |||
15 | // Place absolute coordinates for the center point of given container into | ||
16 | // given wlc_point. | ||
17 | void get_absolute_center_position(swayc_t *container, struct wlc_point *point); | ||
9 | 18 | ||
10 | #endif | 19 | #endif |