Merge pull request #233 from sce/multiple_adjacent_outputs

output: Support multiple adjacent outputs.

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 {
 
 	/**
 	 * The coordinates that this view appear at, relative to the output they
-	 * are located on.
+	 * are located on (output containers have absolute coordinates).
 	 */
 	double x, y;
 
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 @@
 #include "container.h"
 #include "focus.h"
 
-swayc_t *output_by_name(const char* name);
-swayc_t *swayc_adjacent_output(swayc_t *output, enum movement_direction dir);
+// Position is absolute coordinates on the edge where the adjacent output
+// should be searched for.
+swayc_t *output_by_name(const char* name, const struct wlc_point *abs_pos);
+swayc_t *swayc_adjacent_output(swayc_t *output, enum movement_direction dir, const struct wlc_point *abs_pos, bool pick_closest);
+
+// Place absolute coordinates for given container into given wlc_point.
+void get_absolute_position(swayc_t *container, struct wlc_point *point);
+
+// Place absolute coordinates for the center point of given container into
+// given wlc_point.
+void get_absolute_center_position(swayc_t *container, struct wlc_point *point);
 
 #endif