Merge branch 'master' into master

2 files changed, 3 insertions, 1 deletions

diff --git a/include/sway/config.h b/include/sway/config.h
index 4a14cd36..febde63d 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -178,7 +178,8 @@ enum edge_border_types {
         E_NONE,         /**< Don't hide edge borders */
         E_VERTICAL,     /**< hide vertical edge borders */
         E_HORIZONTAL,   /**< hide horizontal edge borders */
-        E_BOTH          /**< hide vertical and horizontal edge borders */
+        E_BOTH,         /**< hide vertical and horizontal edge borders */
+        E_SMART         /**< hide both if precisely one window is present in workspace */
 };
 
 enum command_context {
diff --git a/include/sway/output.h b/include/sway/output.h
index e8afd5ed..e1bdd3f0 100644
--- a/include/sway/output.h
+++ b/include/sway/output.h
@@ -7,6 +7,7 @@
 // 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_opposite_output(enum movement_direction dir, 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.